Diff of the two buildlogs: -- --- b1/build.log 2023-06-08 20:23:58.747598288 +0000 +++ b2/build.log 2023-06-08 20:44:34.753502121 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Thu Jun 8 08:06:20 -12 2023 -I: pbuilder-time-stamp: 1686254781 +I: Current time: Fri Jun 9 10:24:08 +14 2023 +I: pbuilder-time-stamp: 1686255848 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz] I: copying local configuration @@ -16,7 +16,7 @@ I: copying [./git-remote-hg_1.0.4~ds.orig.tar.xz] I: copying [./git-remote-hg_1.0.4~ds-1.debian.tar.xz] I: Extracting source -gpgv: Signature made Wed Dec 7 14:17:37 2022 -12 +gpgv: Signature made Thu Dec 8 16:17:37 2022 +14 gpgv: using RSA key 610B28B55CFCFE45EA1B563B3116BA5E9FFA69A3 gpgv: Can't check signature: No public key dpkg-source: warning: cannot verify inline signature for ./git-remote-hg_1.0.4~ds-1.dsc: no acceptable signature found @@ -27,135 +27,167 @@ 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/2856/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/21585/tmp/hooks/D01_modify_environment starting +debug: Running on virt64b. +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 Jun 9 10:24 /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/21585/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/21585/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 ' - DISTRIBUTION='bookworm' - HOME='/root' - HOST_ARCH='armhf' + 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]="15" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.15(1)-release' + BUILDDIR=/build + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 ' + DIRSTACK=() + DISTRIBUTION=bookworm + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='babfeea2a8e44650844b1bc1a7e3b358' - 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='2856' - PS1='# ' - PS2='> ' + INVOCATION_ID=802891cabf3d4cb38bf3c79676b65d17 + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + 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=21585 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.8sKNxJi4/pbuilderrc_zS8r --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.8sKNxJi4/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-1.dsc' - SUDO_GID='113' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:3142/' + 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.8sKNxJi4/pbuilderrc_F4Q6 --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.8sKNxJi4/b2 --logfile b2/build.log --extrapackages usrmerge git-remote-hg_1.0.4~ds-1.dsc' + SUDO_GID=113 + SUDO_UID=107 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux ff4a 5.10.0-23-armmp-lpae #1 SMP Debian 5.10.179-1 (2023-05-12) armv7l GNU/Linux + Linux i-capture-the-hostname 5.10.0-23-arm64 #1 SMP Debian 5.10.179-1 (2023-05-12) aarch64 GNU/Linux I: ls -l /bin total 5072 - -rwxr-xr-x 1 root root 838488 Apr 23 09:24 bash - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bunzip2 - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bzcat - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2225 Sep 18 2022 bzdiff - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4893 Nov 27 2021 bzexe - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3775 Sep 18 2022 bzgrep - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bzip2 - -rwxr-xr-x 1 root root 67112 Sep 18 2022 bzip2recover - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Sep 18 2022 bzmore - -rwxr-xr-x 1 root root 67632 Sep 20 2022 cat - -rwxr-xr-x 1 root root 67676 Sep 20 2022 chgrp - -rwxr-xr-x 1 root root 67644 Sep 20 2022 chmod - -rwxr-xr-x 1 root root 67684 Sep 20 2022 chown - -rwxr-xr-x 1 root root 133532 Sep 20 2022 cp - -rwxr-xr-x 1 root root 132868 Jan 5 01:20 dash - -rwxr-xr-x 1 root root 133220 Sep 20 2022 date - -rwxr-xr-x 1 root root 67732 Sep 20 2022 dd - -rwxr-xr-x 1 root root 68104 Sep 20 2022 df - -rwxr-xr-x 1 root root 133632 Sep 20 2022 dir - -rwxr-xr-x 1 root root 59128 Mar 22 21:02 dmesg - lrwxrwxrwx 1 root root 8 Dec 19 01:33 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Dec 19 01:33 domainname -> hostname - -rwxr-xr-x 1 root root 67560 Sep 20 2022 echo - -rwxr-xr-x 1 root root 41 Jan 24 02:43 egrep - -rwxr-xr-x 1 root root 67548 Sep 20 2022 false - -rwxr-xr-x 1 root root 41 Jan 24 02:43 fgrep - -rwxr-xr-x 1 root root 55748 Mar 22 21:02 findmnt - -rwsr-xr-x 1 root root 26208 Mar 22 20:15 fusermount - -rwxr-xr-x 1 root root 128608 Jan 24 02:43 grep - -rwxr-xr-x 2 root root 2346 Apr 9 2022 gunzip - -rwxr-xr-x 1 root root 6447 Apr 9 2022 gzexe - -rwxr-xr-x 1 root root 64220 Apr 9 2022 gzip - -rwxr-xr-x 1 root root 67032 Dec 19 01:33 hostname - -rwxr-xr-x 1 root root 67720 Sep 20 2022 ln - -rwxr-xr-x 1 root root 35132 Mar 22 21:51 login - -rwxr-xr-x 1 root root 133632 Sep 20 2022 ls - -rwxr-xr-x 1 root root 136808 Mar 22 21:02 lsblk - -rwxr-xr-x 1 root root 67800 Sep 20 2022 mkdir - -rwxr-xr-x 1 root root 67764 Sep 20 2022 mknod - -rwxr-xr-x 1 root root 67596 Sep 20 2022 mktemp - -rwxr-xr-x 1 root root 38504 Mar 22 21:02 more - -rwsr-xr-x 1 root root 38496 Mar 22 21:02 mount - -rwxr-xr-x 1 root root 9824 Mar 22 21:02 mountpoint - -rwxr-xr-x 1 root root 133532 Sep 20 2022 mv - lrwxrwxrwx 1 root root 8 Dec 19 01:33 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Apr 2 18:25 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 67608 Sep 20 2022 pwd - lrwxrwxrwx 1 root root 4 Apr 23 09:24 rbash -> bash - -rwxr-xr-x 1 root root 67600 Sep 20 2022 readlink - -rwxr-xr-x 1 root root 67672 Sep 20 2022 rm - -rwxr-xr-x 1 root root 67600 Sep 20 2022 rmdir - -rwxr-xr-x 1 root root 67400 Nov 2 2022 run-parts - -rwxr-xr-x 1 root root 133372 Jan 5 07:55 sed - lrwxrwxrwx 1 root root 4 Jan 5 01:20 sh -> dash - -rwxr-xr-x 1 root root 67584 Sep 20 2022 sleep - -rwxr-xr-x 1 root root 67644 Sep 20 2022 stty - -rwsr-xr-x 1 root root 50800 Mar 22 21:02 su - -rwxr-xr-x 1 root root 67584 Sep 20 2022 sync - -rwxr-xr-x 1 root root 336764 Apr 6 02:25 tar - -rwxr-xr-x 1 root root 67144 Nov 2 2022 tempfile - -rwxr-xr-x 1 root root 133224 Sep 20 2022 touch - -rwxr-xr-x 1 root root 67548 Sep 20 2022 true - -rwxr-xr-x 1 root root 9768 Mar 22 20:15 ulockmgr_server - -rwsr-xr-x 1 root root 22108 Mar 22 21:02 umount - -rwxr-xr-x 1 root root 67572 Sep 20 2022 uname - -rwxr-xr-x 2 root root 2346 Apr 9 2022 uncompress - -rwxr-xr-x 1 root root 133632 Sep 20 2022 vdir - -rwxr-xr-x 1 root root 42608 Mar 22 21:02 wdctl - lrwxrwxrwx 1 root root 8 Dec 19 01:33 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1984 Apr 9 2022 zcat - -rwxr-xr-x 1 root root 1678 Apr 9 2022 zcmp - -rwxr-xr-x 1 root root 6460 Apr 9 2022 zdiff - -rwxr-xr-x 1 root root 29 Apr 9 2022 zegrep - -rwxr-xr-x 1 root root 29 Apr 9 2022 zfgrep - -rwxr-xr-x 1 root root 2081 Apr 9 2022 zforce - -rwxr-xr-x 1 root root 8103 Apr 9 2022 zgrep - -rwxr-xr-x 1 root root 2206 Apr 9 2022 zless - -rwxr-xr-x 1 root root 1842 Apr 9 2022 zmore - -rwxr-xr-x 1 root root 4577 Apr 9 2022 znew -I: user script /srv/workspace/pbuilder/2856/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 838488 Apr 24 11:24 bash + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bunzip2 + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bzcat + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2225 Sep 19 2022 bzdiff + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4893 Nov 28 2021 bzexe + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3775 Sep 19 2022 bzgrep + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bzip2 + -rwxr-xr-x 1 root root 67112 Sep 19 2022 bzip2recover + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Sep 19 2022 bzmore + -rwxr-xr-x 1 root root 67632 Sep 21 2022 cat + -rwxr-xr-x 1 root root 67676 Sep 21 2022 chgrp + -rwxr-xr-x 1 root root 67644 Sep 21 2022 chmod + -rwxr-xr-x 1 root root 67684 Sep 21 2022 chown + -rwxr-xr-x 1 root root 133532 Sep 21 2022 cp + -rwxr-xr-x 1 root root 132868 Jan 6 03:20 dash + -rwxr-xr-x 1 root root 133220 Sep 21 2022 date + -rwxr-xr-x 1 root root 67732 Sep 21 2022 dd + -rwxr-xr-x 1 root root 68104 Sep 21 2022 df + -rwxr-xr-x 1 root root 133632 Sep 21 2022 dir + -rwxr-xr-x 1 root root 59128 Mar 23 23:02 dmesg + lrwxrwxrwx 1 root root 8 Dec 20 03:33 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Dec 20 03:33 domainname -> hostname + -rwxr-xr-x 1 root root 67560 Sep 21 2022 echo + -rwxr-xr-x 1 root root 41 Jan 25 04:43 egrep + -rwxr-xr-x 1 root root 67548 Sep 21 2022 false + -rwxr-xr-x 1 root root 41 Jan 25 04:43 fgrep + -rwxr-xr-x 1 root root 55748 Mar 23 23:02 findmnt + -rwsr-xr-x 1 root root 26208 Mar 23 22:15 fusermount + -rwxr-xr-x 1 root root 128608 Jan 25 04:43 grep + -rwxr-xr-x 2 root root 2346 Apr 10 2022 gunzip + -rwxr-xr-x 1 root root 6447 Apr 10 2022 gzexe + -rwxr-xr-x 1 root root 64220 Apr 10 2022 gzip + -rwxr-xr-x 1 root root 67032 Dec 20 03:33 hostname + -rwxr-xr-x 1 root root 67720 Sep 21 2022 ln + -rwxr-xr-x 1 root root 35132 Mar 23 23:51 login + -rwxr-xr-x 1 root root 133632 Sep 21 2022 ls + -rwxr-xr-x 1 root root 136808 Mar 23 23:02 lsblk + -rwxr-xr-x 1 root root 67800 Sep 21 2022 mkdir + -rwxr-xr-x 1 root root 67764 Sep 21 2022 mknod + -rwxr-xr-x 1 root root 67596 Sep 21 2022 mktemp + -rwxr-xr-x 1 root root 38504 Mar 23 23:02 more + -rwsr-xr-x 1 root root 38496 Mar 23 23:02 mount + -rwxr-xr-x 1 root root 9824 Mar 23 23:02 mountpoint + -rwxr-xr-x 1 root root 133532 Sep 21 2022 mv + lrwxrwxrwx 1 root root 8 Dec 20 03:33 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Apr 3 20:25 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 67608 Sep 21 2022 pwd + lrwxrwxrwx 1 root root 4 Apr 24 11:24 rbash -> bash + -rwxr-xr-x 1 root root 67600 Sep 21 2022 readlink + -rwxr-xr-x 1 root root 67672 Sep 21 2022 rm + -rwxr-xr-x 1 root root 67600 Sep 21 2022 rmdir + -rwxr-xr-x 1 root root 67400 Nov 3 2022 run-parts + -rwxr-xr-x 1 root root 133372 Jan 6 09:55 sed + lrwxrwxrwx 1 root root 9 Jun 9 10:24 sh -> /bin/bash + -rwxr-xr-x 1 root root 67584 Sep 21 2022 sleep + -rwxr-xr-x 1 root root 67644 Sep 21 2022 stty + -rwsr-xr-x 1 root root 50800 Mar 23 23:02 su + -rwxr-xr-x 1 root root 67584 Sep 21 2022 sync + -rwxr-xr-x 1 root root 336764 Apr 7 04:25 tar + -rwxr-xr-x 1 root root 67144 Nov 3 2022 tempfile + -rwxr-xr-x 1 root root 133224 Sep 21 2022 touch + -rwxr-xr-x 1 root root 67548 Sep 21 2022 true + -rwxr-xr-x 1 root root 9768 Mar 23 22:15 ulockmgr_server + -rwsr-xr-x 1 root root 22108 Mar 23 23:02 umount + -rwxr-xr-x 1 root root 67572 Sep 21 2022 uname + -rwxr-xr-x 2 root root 2346 Apr 10 2022 uncompress + -rwxr-xr-x 1 root root 133632 Sep 21 2022 vdir + -rwxr-xr-x 1 root root 42608 Mar 23 23:02 wdctl + lrwxrwxrwx 1 root root 8 Dec 20 03:33 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1984 Apr 10 2022 zcat + -rwxr-xr-x 1 root root 1678 Apr 10 2022 zcmp + -rwxr-xr-x 1 root root 6460 Apr 10 2022 zdiff + -rwxr-xr-x 1 root root 29 Apr 10 2022 zegrep + -rwxr-xr-x 1 root root 29 Apr 10 2022 zfgrep + -rwxr-xr-x 1 root root 2081 Apr 10 2022 zforce + -rwxr-xr-x 1 root root 8103 Apr 10 2022 zgrep + -rwxr-xr-x 1 root root 2206 Apr 10 2022 zless + -rwxr-xr-x 1 root root 1842 Apr 10 2022 zmore + -rwxr-xr-x 1 root root 4577 Apr 10 2022 znew +I: user script /srv/workspace/pbuilder/21585/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -283,7 +315,7 @@ Get: 74 http://deb.debian.org/debian bookworm/main armhf mercurial-git all 1.0.1-1 [62.1 kB] Get: 75 http://deb.debian.org/debian bookworm/main armhf sharness all 1.0.0-1.1 [28.6 kB] Get: 76 http://deb.debian.org/debian bookworm/main armhf xmlto armhf 0.0.28-2.1 [32.5 kB] -Fetched 38.6 MB in 4s (8954 kB/s) +Fetched 38.6 MB in 9s (4371 kB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal:armhf. (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 ... 19324 files and directories currently installed.) @@ -611,8 +643,19 @@ Writing extended state information... Building tag database... -> Finished parsing the build-deps +Reading package lists... +Building dependency tree... +Reading state information... +usrmerge is already the newest version (35). +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/git-remote-hg-1.0.4~ds/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../git-remote-hg_1.0.4~ds-1_source.changes +I: user script /srv/workspace/pbuilder/21585/tmp/hooks/A99_set_merged_usr starting +Re-configuring usrmerge... +removed '/etc/unsupported-skip-usrmerge-conversion' +The system has been successfully converted. +I: user script /srv/workspace/pbuilder/21585/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/git-remote-hg-1.0.4~ds/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../git-remote-hg_1.0.4~ds-1_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.4~ds-1 dpkg-buildpackage: info: source distribution unstable @@ -622,7 +665,7 @@ debian/rules clean dh clean dh_auto_clean - make -j3 clean + make -j4 clean make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' rm -f doc/git-remote-hg.1 rm -f -r bin/ @@ -634,7 +677,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j3 "INSTALL=install --strip-program=true" + make -j4 "INSTALL=install --strip-program=true" make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -658,13 +701,35 @@ a2x -d manpage -f manpage doc/git-remote-hg.txt make[1]: Leaving directory '/build/git-remote-hg-1.0.4~ds' dh_auto_test - make -j3 test + make -j4 test make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' make -C test make[2]: Entering directory '/build/git-remote-hg-1.0.4~ds/test' /bin/sh main.t --verbose /bin/sh main-push.t --verbose /bin/sh bidi.t --verbose +/bin/sh helper.t --verbose +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: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && @@ -701,6 +766,15 @@ test_cmp expected actual +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(+) @@ -713,36 +787,13 @@ Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 gamma -expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - [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/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata ok 1 - setup expecting success: @@ -750,7 +801,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -759,24 +809,40 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 4 changeset con 4 modifiche a 4 file +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 19d788541861 +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiungendo i changeset +aggiunti 1 changeset con 1 modifiche a 1 file +sto aggiungendo i manifesti +new changesets 7bb94e93e5e7 +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 7bb94e93e5e7 +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 7bb94e93e5e7 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 19d788541861 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -809,52 +875,72 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next +marcata directory di lavoro come branch next +(branches are permanent and global, did you want a bookmark?) /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files -new changesets 1e3e49d2cc8f:6674f1c866b5 -marked working directory as branch next +marcata directory di lavoro come branch next (branches are permanent and global, did you want a bookmark?) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 4 changeset con 4 modifiche a 4 file +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?) + origin +ok 1 - subcommand help + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd hgrepo && + pwd >../expected + ) && + + ( + cd gitrepo && + git-hg-helper repo origin > ../actual + ) && + + test_cmp expected actual + Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -added 4 changesets with 4 changes to 4 files -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 19d788541861:7600f6963100 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiungendo i changeset +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 7bb94e93e5e7:ef7a56f7c9ee +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 7bb94e93e5e7:3e0f6f7b1f85 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 19d788541861:714b7e39b702 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) +sto cercando modifiche +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 4 changeset con 4 modifiche a 4 file ok 3 - cloning with branches expecting success: @@ -871,6 +957,7 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a +Cloning into 'gitrepo'... ok 3 - cloning with branches expecting success: @@ -889,6 +976,12 @@ 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 1 - encoding expecting success: @@ -922,10 +1015,12 @@ test_cmp expected actual +Cloning into 'gitrepo'... [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha +Cloning into 'gitrepo'... [master 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) @@ -935,6 +1030,23 @@ 1 file changed, 1 insertion(+) create mode 100644 foo/bar rm 'alpha' +ok 2 - subcommand repo - no local proxy + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd gitrepo && + export gitdir=`git rev-parse --git-dir` + # trick to normalize path + ( cd $gitdir/hg/origin/clone && pwd ) >../expected && + ( cd `git-hg-helper repo origin` && pwd ) > ../actual + ) && + + test_cmp expected actual + [master 74dc957] remove alpha Author: A U Thor 1 file changed, 1 deletion(-) @@ -944,38 +1056,32 @@ Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 19d788541861:1778dca3faef +aggiunti 3 changeset con 3 modifiche a 1 file (+1 head) +new changesets 7bb94e93e5e7:73a8e942615b progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark feature-a +aggiunti 3 changeset con 3 modifiche a 1 file (+1 head) +new changesets 7bb94e93e5e7:b3b56d2d55c1 /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 19d788541861:f5168dcb33f4 -no changes found -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) -searching for changes ok 4 - cloning with bookmarks +progress revision walk 'bookmarks/master' (2/2) expecting success: test_when_finished "rm -rf gitrepo*" && @@ -995,10 +1101,14 @@ check_bookmark hgrepo devel devel -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 3 modifiche a 3 file ok 4 - cloning with bookmarks expecting success: @@ -1022,73 +1132,95 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 19d788541861:1778dca3faef /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets de194d3059e3 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark devel +adding remote bookmark feature-a +aggiunti 3 changeset con 3 modifiche a 1 file (+1 head) +new changesets 7bb94e93e5e7:73a8e942615b progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 19d788541861:f5168dcb33f4 -[devel aba15a9] devel +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +[devel b3f0d71] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark devel +adding remote bookmark feature-a +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +aggiunti 3 changeset con 3 modifiche a 1 file (+1 head) +new changesets 7bb94e93e5e7:b3b56d2d55c1 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 3 modifiche a 3 file new changesets 362b656574c3:54f595cbdf1f +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) -[devel 418cc18] devel +ok 3 - subcommand repo - with local proxy + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd gitrepo && + git rev-parse HEAD > rev-HEAD && + test -s rev-HEAD && + git-hg-helper hg-rev `cat rev-HEAD` > hg-HEAD && + git-hg-helper git-rev `cat hg-HEAD` > git-HEAD && + test_cmp rev-HEAD git-HEAD + ) + +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +[devel f987c0a] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes ok 5 - update bookmark expecting success: @@ -1106,7 +1238,14 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -added 5 changesets with 3 changes to 3 files +sto cercando modifiche +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 3 modifiche a 3 file +Cloning into 'gitrepo'... ok 5 - update bookmark expecting success: @@ -1124,43 +1263,57 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 19d788541861:cc1fec124ba2 +aggiunti 4 changeset con 4 modifiche a 1 file (+1 head) +new changesets 7bb94e93e5e7:55c85752e566 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets ce02500336d4 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[feature-b 910ccee] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 19d788541861:090ac4cb830d -[feature-b ee8eeca] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +aggiunti 4 changeset con 4 modifiche a 1 file (+1 head) +new changesets 7bb94e93e5e7:87af453019f3 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b 4ba6423] feature-b +[feature-b a98ff2c] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 ok 2 - file removal expecting success: @@ -1190,26 +1343,26 @@ test_cmp expected actual -searching for changes [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files [master 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -searching for changes +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file ok 6 - new bookmark -adding changesets expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -1240,19 +1393,47 @@ test_cmp expected actual -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 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 -searching for changes -searching for changes +ok 4 - subcommands hg-rev and git-rev + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + echo one > content && + hg commit -m one && + echo two > content && + hg commit -m two && + echo three > content && + hg commit -m three + ) && + + git clone hg::hgrepo gitrepo && + + ( + cd hgrepo && + hg strip -r 1 && + echo four > content && + hg commit -m four + ) && + + ( + cd gitrepo && + git fetch origin && + git reset --hard origin/master && + git gc && + git-hg-helper gc --check-hg origin > output && + cat output && + grep "hg marks" output && + grep "git marks" output + ) + ok 6 - new bookmark expecting success: @@ -1287,22 +1468,44 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +sto cercando modifiche +sto cercando modifiche +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file new changesets 362b656574c3:7cd99375c843 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 883a1852becb:5bbc8b92b02e +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +salvato bundle di backup in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/2a7aaec2a77f-254514da-backup.hg ok 3 - git tags expecting success: @@ -1341,35 +1544,84 @@ test_cmp expected actual +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +new changesets fb16ff89c83f +progress revision 4 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + + 36b595f...417594a master -> origin/master (forced update) + + 36b595f...417594a branches/default -> origin/branches/default (forced update) +HEAD is now at 417594a four /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +sto cercando modifiche +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... +Loading hg marks ... +Loading git marks ... +Performing garbage collection on git commits ... +Computing marks intersection ... +Including notes commits ... +Trimmed hg marks from #5 down to #0 +Trimmed git marks from #12 down to #2 +Writing hg marks ... +Writing git marks ... +Loading hg marks ... +Trimmed hg marks from #5 down to #0 +Writing hg marks ... +Loading git marks ... +Trimmed git marks from #12 down to #2 +Writing git marks ... +ok 5 - subcommand gc + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd hgrepo && + echo one > content && + hg commit -m one + ) && + + ( + cd gitrepo && + git fetch origin + ) && + + hg log -R hgrepo > expected && + # not inside gitrepo; test shared path handling + GIT_DIR=gitrepo/.git git-hg-helper origin log > actual + + test_cmp expected actual + /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 12 changesets with 12 changes to 1 files -new changesets 58a32f688755:513edd46901d +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 12 changeset con 12 modifiche a 1 file +new changesets c0c59b16a6a7:78a2ac3d1fc3 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 c98b24b1c20a:9f43f1d8d047 ok 7 - authors expecting success: @@ -1409,9 +1661,13 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 12 changeset con 12 modifiche a 1 file +new changesets 40db74e72b28:64ee187d2bd0 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) -marked working directory as branch gamma ok 7 - authors expecting success: @@ -1451,73 +1707,172 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +Cloning into 'gitrepo'... +marcata directory di lavoro come branch gamma +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 0025df6e70ab +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark not-master -added 2 changesets with 1 changes to 1 files +aggiunti 2 changeset con 1 modifiche a 1 file new changesets 5889597089fe:3320583a8de0 1 local changesets published -progress revision 1 'default' (0/1) -progress revision 2 'gamma' (0/1) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +progress revision 1 'default' (0/1) +progress revision 2 'gamma' (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 2 changes to 1 files -new changesets f834a2105816:55f452e4e3bc +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 583dc41ad52a:dabae3990873 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 4d8a254c88d9:0959b89c4da7 -searching for changes -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 2 changesets with 2 changes to 2 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 0 changes to 0 files -searching for changes -searching for changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 31ca3139da1e:c3aa2aa95425 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 43454b10e17f +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + f4c7b4c..f88aba3 master -> origin/master + f4c7b4c..f88aba3 branches/default -> origin/branches/default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/55f452e4e3bc-ac3fd8f2-backup.hg +salvato bundle di backup in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/dabae3990873-62602dcc-backup.hg +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/0959b89c4da7-18b298f7-backup.hg +salvato bundle di backup in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/c3aa2aa95425-c5fb66fa-backup.hg +sto cercando modifiche +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 0 modifiche a 0 file +sto cercando modifiche +sto cercando modifiche +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +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 + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file (+1 head) +new changesets c270b0722e1f:2d28e7fa7b20 +progress revision 2 'default' (0/2) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + + aa21300...5e4d738 master -> origin/master (forced update) + + aa21300...5e4d738 branches/default -> origin/branches/default (forced update) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 6c281fb97222:c069a51601a0 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file (+1 head) +new changesets f7b716f60714:1ad69bdb9fcd +progress revision 2 'default' (0/2) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + a6d9125...1075171 master -> origin/master (forced update) + + a6d9125...1075171 branches/default -> origin/branches/default (forced update) +ok 8 - strip + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + hg bookmark master && + echo one > content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + echo two > content && + git commit -a -m two && + git push + ) && + + check_branch hgrepo default two + ok 4 - hg branch expecting success: @@ -1551,50 +1906,10 @@ test_cmp expected actual -progress revision 2 'default' (0/2) [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + 82f585d...5109177 master -> origin/master (forced update) - + 82f585d...5109177 branches/default -> origin/branches/default (forced update) -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 38503ce9d472:e9828f32291f -progress revision 2 'default' (0/2) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + aedfc45...fcf3d98 master -> origin/master (forced update) - + aedfc45...fcf3d98 branches/default -> origin/branches/default (forced update) -ok 8 - strip - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - hg bookmark master && - echo one > content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - echo two > content && - git commit -a -m two && - git push - ) && - - check_branch hgrepo default two - ok 8 - strip expecting success: @@ -1623,95 +1938,92 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +sto cercando modifiche 0 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -adding remote bookmark not-master -added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -1 local changesets published +Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -progress revision 1 'default' (0/1) -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets fff3a3309187:657360595d2f -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets f0d01957df0f:f641df4f3ac7 progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -adding changesets -adding manifests -adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets fff3a3309187:4c728f4457e3 -[default a00839d] two +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +[default 43c058c] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark master +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets bda414ee15c2:3f13692172c4 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark not-master +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 16869bbe54be +1 local changesets published progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -[default 884612b] two +progress revision 1 'default' (0/1) +[default 5079779] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -no changes found -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 -no changes found -To hg::../hgrepo2 - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] not-master -> not-master - ! [rejected] alpha -> alpha (already exists) -error: failed to push some refs to 'hg::../hgrepo2' +Cloning into 'gitrepo'... +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + 4baf254..43c058c default -> default /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - 4a03fbb..a00839d default -> default -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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..884612b default -> default + fffffff..5079779 default -> default +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 45c3f4220547:4efe73d6ede3 ok 9 - remote push with master bookmark expecting success: @@ -1735,6 +2047,24 @@ check_branch hgrepo default one +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +sto cercando modifiche +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +sto cercando modifiche +sto cercando modifiche +To hg::../hgrepo2 + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] not-master -> not-master + ! [rejected] alpha -> alpha (already exists) +error: failed to push some refs to 'hg::../hgrepo2' +hint: Updates were rejected because the tag already exists in the remote. ok 9 - remote push with master bookmark expecting success: @@ -1758,6 +2088,31 @@ check_branch hgrepo default one +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ +Cloning into './sub_hg_a'... +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::../hgrepo + * [new branch] master -> master ok 5 - hg tags expecting success: @@ -1807,6 +2162,10 @@ Date: Mon Jan 1 00:00:00 2007 +0100 1 file changed, 1 insertion(+) create mode 100644 beta +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] [master d7a1343] add gamma Author: A U Thor Date: Mon Jan 1 00:00:00 2007 -0100 @@ -1822,52 +2181,28 @@ Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content -Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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::../hgrepo - * [new branch] master -> master -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +nessuna modifica trovata +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 6ffd606071c3 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::../hgrepo * [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 +Cloning into './sub_hg_b'... changeset: 0:6e2126489d3d tag: tip user: A U Thor @@ -1890,6 +2225,25 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +nessuna modifica trovata +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets a9672397025b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 5 modifiche a 5 file +Cloning into './sub_git'... +done. ok 10 - remote push from master branch expecting success: @@ -1906,39 +2260,53 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +ok 7 - subcommand sub initial update (hg and git subrepos) + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_subrepos && + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub --recursive update --force && + test -f content_hgrepo && + test -f sub_hg_a/content_sub_hg_a && + test -f sub_hg_a/sub_hg_a_x/content_sub_hg_a_x && + test -f sub_hg_b/content_sub_hg_b && + test -f sub_hg_b/sub_git/content_sub_git + ) && + + check gitrepo HEAD substate && + check gitrepo/sub_hg_a HEAD substate_hg_a && + check gitrepo/sub_hg_b HEAD substate_hg_b && + check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && + check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git + +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 5 modifiche a 5 file new changesets 87c8f82b00d0:21e96c99dac4 progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 34ca68ae42d3 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets fe997f9e3ad9 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] ok 11 - remote cloning expecting success: @@ -1952,11 +2320,13 @@ ) Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4dd06316763f +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets f60338b89f0e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 11 - remote cloning @@ -1972,48 +2342,40 @@ ) Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 5 modifiche a 5 file /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 34ca68ae42d3 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets fe997f9e3ad9 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 4dd06316763f +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets f60338b89f0e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -ok 6 - test timezones - -# passed all 6 test(s) -1..6 -/bin/sh helper.t --verbose /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -expecting success: - test_when_finished "rm -rf 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 - -no changes found +nessuna modifica trovata ok 12 - moving remote clone expecting success: @@ -2037,7 +2399,11 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata +ok 6 - test timezones + +# passed all 6 test(s) +1..6 ok 12 - moving remote clone expecting success: @@ -2065,58 +2431,48 @@ 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 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets 34ca68ae42d3 -Cloning into 'gitrepo'... +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets fe997f9e3ad9 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel d2025e0] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +[devel db0a62d] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets 4dd06316763f +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets f60338b89f0e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -[devel bd156b7] devel +[devel 6a99ee7] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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 7d0d886065a6 -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 -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file ok 13 - remote update bookmark expecting success: @@ -2134,30 +2490,23 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... - origin -ok 1 - subcommand help - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd hgrepo && - pwd >../expected - ) && - - ( - cd gitrepo && - git-hg-helper repo origin > ../actual - ) && - - test_cmp expected actual - +Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark devel +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets fe997f9e3ad9:3b0d21d37d4a +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 13 - remote update bookmark expecting success: @@ -2175,53 +2524,35 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets 34ca68ae42d3:134322f41666 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -[feature-b 6d507f9] feature-b +[feature-b e5121ce] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets 4dd06316763f:c825b2c00396 +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets f60338b89f0e:e6283a2b5d11 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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'... -[feature-b 56ad2a1] feature-b +nessuna modifica trovata +[feature-b 8a40952] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +nessuna modifica trovata ok 14 - remote new bookmark expecting success: @@ -2248,29 +2579,16 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -ok 2 - subcommand repo - no local proxy - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - export gitdir=`git rev-parse --git-dir` - # trick to normalize path - ( cd $gitdir/hg/origin/clone && pwd ) >../expected && - ( cd `git-hg-helper repo origin` && pwd ) > ../actual - ) && - - test_cmp expected actual - ok 14 - remote new bookmark expecting success: @@ -2297,46 +2615,55 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets 34ca68ae42d3:6cee28e6e54e +aggiunti 3 changeset con 3 modifiche a 1 file +new changesets fe997f9e3ad9:ce60e7e27bb6 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -adding changesets -adding manifests -adding file changes +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 0b8f48754e47:fd0f5ab35544 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets 4dd06316763f:55dae9362c90 +aggiunti 3 changeset con 3 modifiche a 1 file +new changesets f60338b89f0e:c5060884e3a0 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -[master da6b899] diverged +[master c31a35a] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 cf75fc67c877 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 54c6c50148cd To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2345,16 +2672,19 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) -[master 335ee46] diverged +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 265bfa0cd61c:64c13269bfdc +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[master ca17d7c] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8c72432fa1e0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +Cloning into './sub_hg_a/sub_hg_a_x'... ok 15 - remote push diverged expecting success: @@ -2386,16 +2716,20 @@ check_bookmark hgrepo diverge "bump bookmark" -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 604ae1c290f0 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets d30fd6b78c35 To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' @@ -2404,23 +2738,12 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) -ok 3 - subcommand repo - with local proxy - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - git rev-parse HEAD > rev-HEAD && - test -s rev-HEAD && - git-hg-helper hg-rev `cat rev-HEAD` > hg-HEAD && - git-hg-helper git-rev `cat hg-HEAD` > git-HEAD && - test_cmp rev-HEAD git-HEAD - ) - -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets f3071243f3ed +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... +Cloning into 'gitrepo'... ok 15 - remote push diverged expecting success: @@ -2452,66 +2775,71 @@ check_bookmark hgrepo diverge "bump bookmark" -Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 -Cloning into 'gitrepo'... -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets ccb900841615:8baa36ed6e5b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 34ca68ae42d3:cf75fc67c877 +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets fe997f9e3ad9:54c6c50148cd Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +Cloning into './sub_hg_b/sub_git'... +done. +ok 8 - subcommand sub initial recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update + /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +creata una nuova head +[diverge 3ee4598] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 4dd06316763f:604ae1c290f0 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 3d3c88708d56 +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets f60338b89f0e:d30fd6b78c35 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -created new head -[diverge 9be3226] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -[diverge c908c43] diverge +creata una nuova head +[diverge e307024] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 a2e5c7e70bd0 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiornando il segnalibro diverge +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +new changesets 36618aab6ffb To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo' @@ -2520,64 +2848,6 @@ hint: '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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark diverge -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 89aa7baf8ff9 -To hg::/build/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/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. Integrate the remote changes (e.g. -hint: '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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -ok 4 - subcommands hg-rev and git-rev - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - echo one > content && - hg commit -m one && - echo two > content && - hg commit -m two && - echo three > content && - hg commit -m three - ) && - - git clone hg::hgrepo gitrepo && - - ( - cd hgrepo && - hg strip -r 1 && - echo four > content && - hg commit -m four - ) && - - ( - cd gitrepo && - git fetch origin && - git reset --hard origin/master && - git gc && - git-hg-helper gc --check-hg origin > output && - cat output && - grep "hg marks" output && - grep "git marks" output - ) - ok 16 - remote update bookmark diverge expecting success: @@ -2595,6 +2865,38 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiornando il segnalibro diverge +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +new changesets f79979369c1e +To hg::/build/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/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. Integrate the remote changes (e.g. +hint: 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + ! [rejected] diverge -> diverge (non-fast-forward) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b +aggiunti 5 changeset con 5 modifiche a 1 file (+1 head) +new changesets fe997f9e3ad9:36618aab6ffb +WARNING: Branch 'default' has more than one head, consider merging +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/4) ok 16 - remote update bookmark diverge expecting success: @@ -2612,58 +2914,38 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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 fe391a8] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 34ca68ae42d3:a2e5c7e70bd0 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/4) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 4dd06316763f:89aa7baf8ff9 -[feature-c 8f7ece7] feature-c - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +aggiunti 5 changeset con 5 modifiche a 1 file (+1 head) +new changesets f60338b89f0e:f79979369c1e +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +nessuna modifica trovata 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 96029a1] feature-c +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +[feature-c c92795c] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +nessuna modifica trovata ok 17 - remote new bookmark multiple branch head checking known breakage: @@ -2703,6 +2985,13 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +Cloning into 'gitrepo'... +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ ok 17 - remote new bookmark multiple branch head expecting success: @@ -2742,95 +3031,83 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 1 files -new changesets 35bc21ac990b:4c8c8f1b0fea -Cloning into 'gitrepo'... -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -Cloning into 'gitrepo'... +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 eb5ee2dfc5bf +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 9c5882d78204 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/a06cb16a4aac-5548945d-backup.hg -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8c9bb71dd6a6 -[master 30a8903] copy +Cloning into 'gitrepo'... +[master 4e57b8d] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 59b370f] moved +[master 6812172] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) -[master bd53c52] copy +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets aa3b72138a7a +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +[master 5f12f48] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master bba56b9] moved +aggiunti 2 changeset con 2 modifiche a 2 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + d4f02cf..6812172 master -> master +[master 4bd179e] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 5bcc435e6b15:ddb62f495325 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - ee95e24..59b370f master -> master -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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..bba56b9 master -> master -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets b10d2711f79b -progress revision 4 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + 0d45d77...b55d340 master -> origin/master (forced update) - + 0d45d77...b55d340 branches/default -> origin/branches/default (forced update) -HEAD is now at b55d340 four -1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..4bd179e master -> master /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... not ok 18 - push commits with copy and rename # TODO known breakage expecting success: @@ -2863,45 +3140,12 @@ echo "ø~?" > expected && test_cmp expected actual -Loading hg marks ... -Loading git marks ... -Performing garbage collection on git commits ... -Computing marks intersection ... -Including notes commits ... -Trimmed hg marks from #5 down to #0 -Trimmed git marks from #12 down to #2 -Writing hg marks ... -Writing git marks ... -Loading hg marks ... -Trimmed hg marks from #5 down to #0 -Writing hg marks ... -Loading git marks ... -Trimmed git marks from #12 down to #2 -Writing git marks ... -ok 5 - subcommand gc - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd hgrepo && - echo one > content && - hg commit -m one - ) && - - ( - cd gitrepo && - git fetch origin - ) && - - hg log -R hgrepo > expected && - # not inside gitrepo; test shared path handling - GIT_DIR=gitrepo/.git git-hg-helper origin log > actual - - test_cmp expected actual - +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file ok 18 - push commits with copy and rename expecting success: @@ -2934,45 +3178,47 @@ echo "ø~?" > expected && test_cmp expected actual -warning: filename contains '?', which is reserved on Windows: 'ø~?' -Cloning into 'gitrepo'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 65a1591a37ba:ae92f590449b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... +attenzione: filename contains '?', which is reserved on Windows: 'ø~?' /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 de9c0f588434 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 9e39bd6cff40 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -warning: filename contains '?', which is reserved on Windows: 'ø~?' +attenzione: filename contains '?', which is reserved on Windows: 'ø~?' +Cloning into './sub_hg_b'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 e6c7ed1c10e0 -warning: filename contains '?', which is reserved on Windows: 'ø~?' -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - a604680..29aa7a8 master -> origin/master - a604680..29aa7a8 branches/default -> origin/branches/default -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets c3f1e4e4419e:81d54f9ec396 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +attenzione: filename contains '?', which is reserved on Windows: 'ø~?' +Clone in 'gitrepo' in corso... +attenzione: filename contains '?', which is reserved on Windows: 'ø~?' WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 4 changes to 2 files -new changesets 73084c165613:56e9d69a9177 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 3 changeset con 4 modifiche a 2 file +new changesets 24ff6fa0dfbd:76a7a44927fc progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +Clone in 'gitrepo' in corso... ok 19 - fetch special filenames expecting success: @@ -3011,11 +3257,11 @@ 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 6cf404df3f5c:4ddd36df15d4 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 3 changeset con 4 modifiche a 2 file +new changesets f481288aa9a6:eff949c26d8e progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) ok 19 - fetch special filenames @@ -3056,85 +3302,95 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -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 - -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets e97c80c5737d +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 9569317..e5b6123 master -> origin/master + 9569317..e5b6123 branches/default -> origin/branches/default +Updating 9569317..e5b6123 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Clone in 'gitrepo' in corso... 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 72721bbdc9eb +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 60f71dc710f5 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 9c2dd70] utf-8 +Clone in 'gitrepo' in corso... +[master f1d5e48] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 1532de3b67c3 +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 724c3aba3c91 +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + e5cfd06..f3880d5 branches/default -> origin/branches/default + e5cfd06..f3880d5 master -> origin/master +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 93ce1af..f1d5e48 master -> master +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 7fbbfe85c9e9 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 974180b] utf-8 +HEAD is now at e5cfd06 substate_hg_a +[master de56b58] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 857a706..9c2dd70 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..974180b master -> master +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..de56b58 master -> master +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets a1b460e15532 +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 96d4a50..c4824a5 branches/default -> origin/branches/default + 96d4a50..c4824a5 master -> origin/master +HEAD is now at 96d4a50 zero_sub_hg_a_x 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 20 - push special filenames @@ -3181,6 +3437,9 @@ check_bookmark hgrepo new_bmark fi +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata ok 20 - push special filenames expecting success: @@ -3226,115 +3485,63 @@ check_bookmark hgrepo new_bmark fi -Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 7e6b60e14ab1:d36b2721bc3a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 d212076080a5 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 59d055ce9083 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. -ok 7 - subcommand sub initial update (hg and git subrepos) +ok 9 - subcommand sub subsequent recursive update expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && - setup_subrepos && - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub --recursive update --force && - test -f content_hgrepo && - test -f sub_hg_a/content_sub_hg_a && - test -f sub_hg_a/sub_hg_a_x/content_sub_hg_a_x && - test -f sub_hg_b/content_sub_hg_b && - test -f sub_hg_b/sub_git/content_sub_git - ) && - - check gitrepo HEAD substate && - check gitrepo/sub_hg_a HEAD substate_hg_a && - check gitrepo/sub_hg_b HEAD substate_hg_b && - check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && - check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git + test_sub_update --rebase Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 cbdc6eaa5584:b46e6054eb0f -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 4748be7bb79c:7f54334d1f47 +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 776d25a4668d:f75816116ce7 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 9a8e87fc6e36:524f6bcc23f4 +HEAD is now at 26d4599 zero progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 78958b3 zero -HEAD is now at 1bd48fb zero -HEAD is now at 78958b3 zero -HEAD is now at 1bd48fb zero -HEAD is now at 4607d70 good branch -HEAD is now at a2af168 good branch +HEAD is now at 26d4599 zero +HEAD is now at 0b72aec good branch +HEAD is now at 59520e6 zero +HEAD is now at 59520e6 zero +HEAD is now at 3d81df3 good branch +Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 4607d70..d293f34 branches/good_branch -> branches/good_branch - 4bb6bdd..234e336 good_bmark -> good_bmark - 4bb6bdd..e56bbfd master -> master + 3d81df3..7bcf213 branches/good_branch -> branches/good_branch + ac198d6..2ab6a00 good_bmark -> good_bmark + ac198d6..4920277 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) @@ -3345,9 +3552,9 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 4bb6bdd..e56bbfd master -> master - 4bb6bdd..234e336 good_bmark -> good_bmark - 4607d70..d293f34 branches/good_branch -> branches/good_branch + ac198d6..4920277 master -> master + ac198d6..2ab6a00 good_bmark -> good_bmark + 3d81df3..7bcf213 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) @@ -3355,36 +3562,36 @@ ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..5b6d25d branches/good_branch -> branches/good_branch - fffffff..087741b good_bmark -> good_bmark - fffffff..521eb27 master -> master + fffffff..cd3ad03 branches/good_branch -> branches/good_branch + fffffff..4040569 good_bmark -> good_bmark + fffffff..621b3fe 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) @@ -3395,19 +3602,27 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..521eb27 master -> master - fffffff..087741b good_bmark -> good_bmark - fffffff..5b6d25d branches/good_branch -> branches/good_branch + fffffff..621b3fe master -> master + fffffff..4040569 good_bmark -> good_bmark + fffffff..cd3ad03 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 8ab737d7c76e:4bdbdf7474df +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... ok 21 - remote big push expecting success: @@ -3484,6 +3699,13 @@ fi ) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 96ee261e51ab:99494912d741 ok 21 - remote big push expecting success: @@ -3560,99 +3782,102 @@ fi ) -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 682d9f86db8e:0e1b12749147 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 acd629517369:f880d90965f8 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into './sub_hg_a/sub_hg_a_x'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 d82265e61b74 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 35c95d25397e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... Cloning into './sub_hg_b'... -Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets cf27d65456cf:f7c949c4482f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 35316f01c979:dcf96e8e7093 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark bad_bmark adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets 47e9498486cd:0d329561ca74 -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +aggiunti 3 changeset con 3 modifiche a 1 file +new changesets eba95cac3d00:ac9abc9bc55c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -adding changesets -adding manifests -adding file changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets a9ddf9d93001 +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 1755c40..8d712e8 master -> origin/master + 1755c40..8d712e8 branches/default -> origin/branches/default +Updating 1755c40..8d712e8 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark bad_bmark adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets 2ba9693c2675:cc136868cac2 -Cloning into './sub_hg_b/sub_git'... -done. +aggiunti 3 changeset con 3 modifiche a 1 file +new changesets 6851a1687cb6:9b3f2e2b576c +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -ok 8 - subcommand sub initial recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update - +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 3cd89cfb429f +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + fea0aba..a57ae30 branches/default -> origin/branches/default + fea0aba..a57ae30 master -> origin/master /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 bad_bmark -added 1 changesets with 1 changes to 1 files -new changesets 29b7b5ed19fc +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiornando il segnalibro bad_bmark +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 6a4a721cdd1e To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 93a306c..028160a good_bmark -> good_bmark - 93a306c..a14b848 master -> master + dc98fcf..432dd89 good_bmark -> good_bmark + dc98fcf..6c86902 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3660,32 +3885,59 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 93a306c..a14b848 master -> master - 93a306c..028160a good_bmark -> good_bmark + dc98fcf..6c86902 master -> master + dc98fcf..432dd89 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +HEAD is now at fea0aba substate_hg_a + Successfully rebased and updated detached HEAD. +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +progress revision 3 'bad_branch' (0/1) +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 7daff07f65b0 +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 1116bf5..b40a7ea branches/default -> origin/branches/default + 1116bf5..b40a7ea master -> origin/master +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 1193519..fd27f25 branches/bad_branch -> origin/branches/bad_branch + dc98fcf..fd27f25 bad_bmark -> origin/bad_bmark + + 432dd89...dc98fcf good_bmark -> origin/good_bmark (forced update) + + 6c86902...dc98fcf master -> origin/master (forced update) +HEAD is now at 1116bf5 zero_sub_hg_a_x + Successfully rebased and updated detached HEAD. /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark bad_bmark -added 1 changesets with 1 changes to 1 files -new changesets 0d163c12e1f5 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto aggiornando il segnalibro bad_bmark +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets e5aab4d1c913 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..c5fa686 good_bmark -> good_bmark - fffffff..7c4bc5d master -> master + fffffff..43d35e1 good_bmark -> good_bmark + fffffff..d3ddfff 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' @@ -3693,40 +3945,24 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..7c4bc5d master -> master - fffffff..c5fa686 good_bmark -> good_bmark + fffffff..d3ddfff master -> master + fffffff..43d35e1 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - e0b44de..b0ea79d branches/bad_branch -> origin/branches/bad_branch - 93a306c..b0ea79d bad_bmark -> origin/bad_bmark - + 028160a...93a306c good_bmark -> origin/good_bmark (forced update) - + a14b848...93a306c master -> origin/master (forced update) +nessuna modifica trovata /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -updating bookmark good_bmark -2 local changesets published -WARNING: Branch 'default' has more than one head, consider merging -progress revision 3 'bad_branch' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 5e58c97..7e0ed1a branches/bad_branch -> origin/branches/bad_branch - c3490e9..7c4bc5d branches/default -> origin/branches/default - c3490e9..7e0ed1a bad_bmark -> origin/bad_bmark +nessuna modifica trovata /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 93a306c..028160a good_bmark -> good_bmark - 93a306c..a14b848 master -> master + dc98fcf..432dd89 good_bmark -> good_bmark + dc98fcf..6c86902 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3734,8 +3970,10 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 93a306c..a14b848 master -> master - 93a306c..028160a good_bmark -> good_bmark +sto aggiornando il segnalibro good_bmark + dc98fcf..6c86902 master -> master +2 local changesets published + dc98fcf..432dd89 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 @@ -3782,9 +4020,22 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +WARNING: Branch 'default' has more than one head, consider merging +progress revision 3 'bad_branch' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + 0a178b9..2db9847 branches/bad_branch -> origin/branches/bad_branch + 107874a..d3ddfff branches/default -> origin/branches/default + 107874a..2db9847 bad_bmark -> origin/bad_bmark +ok 10 - subcommand sub subsequent recursive update -- rebase + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --merge + /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) @@ -3839,178 +4090,167 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 2dc91c082a90:d42ef8a621f1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into './sub_hg_a'... -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 5c05077ef955:09f68e473cb4 -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 021aae209e05:3ec0ee904b07 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -adding changesets -adding manifests -adding file changes +HEAD is now at 35d26ab zero +Initialized empty Git repository in /build/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 35d26ab zero +HEAD is now at f123a06 good branch +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 69ebd88f3a16:1f67e31162fe -HEAD is now at b01ab75 zero +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 2953ba32e878:19f8917caf01 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at b01ab75 zero -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -HEAD is now at 34c69c1 good branch -HEAD is now at 12b163c zero -adding changesets -adding manifests -adding file changes -HEAD is now at 12b163c zero -added 2 changesets with 3 changes to 3 files -new changesets 8e7929a20b80:37cbb69024db -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at edcbac6 good branch -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +HEAD is now at ce15693 zero +HEAD is now at ce15693 zero +HEAD is now at c1814b7 good branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 9 changesets with 9 changes to 1 files (+7 heads) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 9 changeset con 9 modifiche a 1 file (+7 head) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 5342573...54f9ef7 branches/bad_branch -> branches/bad_branch (forced update) - 34c69c1..30faeeb branches/good_branch -> branches/good_branch - + 6232519...6e9ecc5 bad_bmark1 -> bad_bmark1 (forced update) - + 6232519...f4f51f0 bad_bmark2 -> bad_bmark2 (forced update) - 6232519..4a8b4c8 good_bmark -> good_bmark - 6232519..dae8134 master -> master + + bb7c212...7b19e33 branches/bad_branch -> branches/bad_branch (forced update) + f123a06..16b3c7e branches/good_branch -> branches/good_branch + + 444b227...f1e2038 bad_bmark1 -> bad_bmark1 (forced update) + + 444b227...aec5248 bad_bmark2 -> bad_bmark2 (forced update) + 444b227..b0b3d88 good_bmark -> good_bmark + 444b227..6417bf0 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 6232519..dae8134 master -> master - 6232519..4a8b4c8 good_bmark -> good_bmark - 34c69c1..30faeeb branches/good_branch -> branches/good_branch + 444b227..6417bf0 master -> master + 444b227..b0b3d88 good_bmark -> good_bmark + f123a06..16b3c7e branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 6232519...6e9ecc5 bad_bmark1 -> bad_bmark1 (forced update) - + 6232519...f4f51f0 bad_bmark2 -> bad_bmark2 (forced update) - + 5342573...54f9ef7 branches/bad_branch -> branches/bad_branch (forced update) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets be80e2263c5a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + + 444b227...f1e2038 bad_bmark1 -> bad_bmark1 (forced update) + + 444b227...aec5248 bad_bmark2 -> bad_bmark2 (forced update) + + bb7c212...7b19e33 branches/bad_branch -> branches/bad_branch (forced update) +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 9e82992d9ee9:5f3ccff59314 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (+1 head) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...6d3c52b branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...6838367 branches/good_branch -> branches/good_branch (forced update) - + fffffff...449370b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...414ce18 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...7f22a35 good_bmark -> good_bmark (forced update) - + fffffff...8190aeb master -> master (forced update) + + fffffff...3244dc3 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...5ef3056 branches/good_branch -> branches/good_branch (forced update) + + fffffff...b740bb1 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...6eb1f4b bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...50f4010 good_bmark -> good_bmark (forced update) + + fffffff...5a8c331 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...8190aeb master -> master (forced update) - + fffffff...7f22a35 good_bmark -> good_bmark (forced update) - + fffffff...6838367 branches/good_branch -> branches/good_branch (forced update) + + fffffff...5a8c331 master -> master (forced update) + + fffffff...50f4010 good_bmark -> good_bmark (forced update) + + fffffff...5ef3056 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...449370b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...414ce18 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...6d3c52b branches/bad_branch -> branches/bad_branch (forced update) -Cloning into './sub_hg_b'... + + fffffff...b740bb1 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...6eb1f4b bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...3244dc3 branches/bad_branch -> branches/bad_branch (forced update) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 59faaa91aa9c:08045f464f9b +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets cf61388058be:ba3623a02edf progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 864325772c7b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b'... ok 23 - remote big push force expecting success: @@ -4052,6 +4292,13 @@ /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets acf13b431b8f:eb24584ce98b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 23 - remote big push force expecting success: @@ -4091,103 +4338,100 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 27d68cc73669 +Cloning into './sub_hg_b/sub_git'... +done. +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 55738dadbfb3 progress revision 2 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 3792de0..200f30b master -> origin/master - 3792de0..200f30b branches/default -> origin/branches/default -Updating 3792de0..200f30b + ad2dfdf..c1204a6 master -> origin/master + ad2dfdf..c1204a6 branches/default -> origin/branches/default +Updating ad2dfdf..c1204a6 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 2240eb32fd11 -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 03b882b..b6c0c7b branches/default -> origin/branches/default - 03b882b..b6c0c7b master -> origin/master -HEAD is now at 03b882b substate_hg_a -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 f796c702f43e -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 7e2f9ac..81b70a8 branches/default -> origin/branches/default - 7e2f9ac..81b70a8 master -> origin/master -HEAD is now at 7e2f9ac zero_sub_hg_a_x -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -ok 9 - subcommand sub subsequent recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --rebase - Cloning into 'gitrepo'... Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 3d6d78ae5499:e6df8b7875e0 +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 757d6108e70a:0cb9c6d01ba5 +sto aggiungendo i changeset progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 9db2eaa00861:06504b60af18 -HEAD is now at c6a98b3 zero -HEAD is now at c6a98b3 zero +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets ee8a9c4b0cba:1a635f3c7935 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 2a3593d good branch -HEAD is now at ac3bff5 zero -HEAD is now at ac3bff5 zero -HEAD is now at b354448 good branch +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +HEAD is now at 6468e5f zero +HEAD is now at 6468e5f zero +HEAD is now at 913392b zero +HEAD is now at 913392b zero +sto cercando modifiche +HEAD is now at 84660eb good branch +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets f609944205d8 +HEAD is now at 7c62f14 good branch +progress revision 2 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + 36fefda..78efdab branches/default -> origin/branches/default + 36fefda..78efdab master -> origin/master +HEAD is now at 36fefda substate_hg_a +Updating 36fefda..78efdab +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 375703f022dc +progress revision 1 'default' (0/1) +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + c263d02..cd82daf branches/default -> origin/branches/default + c263d02..cd82daf master -> origin/master /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 2a3593d..102182c branches/good_branch -> branches/good_branch - b226160..d10e008 good_bmark -> good_bmark - b226160..c344372 master -> master + 84660eb..686acc5 branches/good_branch -> branches/good_branch + a7f6802..3f75351 good_bmark -> good_bmark + a7f6802..ffb4a9f 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) @@ -4198,21 +4442,26 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - b226160..c344372 master -> master - b226160..d10e008 good_bmark -> good_bmark - 2a3593d..102182c branches/good_branch -> branches/good_branch + a7f6802..ffb4a9f master -> master + a7f6802..3f75351 good_bmark -> good_bmark + 84660eb..686acc5 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 c263d02 zero_sub_hg_a_x +Updating c263d02..cd82daf +Fast-forward + content_sub_hg_a_x | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..5ce2e99 branches/good_branch -> branches/good_branch - fffffff..c636c88 good_bmark -> good_bmark - fffffff..46cc751 master -> master + fffffff..d3cbeb4 branches/good_branch -> branches/good_branch + fffffff..fd521a3 good_bmark -> good_bmark + fffffff..4c5d7e6 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) @@ -4223,49 +4472,54 @@ hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..46cc751 master -> master - fffffff..c636c88 good_bmark -> good_bmark - fffffff..5ce2e99 branches/good_branch -> branches/good_branch + fffffff..4c5d7e6 master -> master + fffffff..fd521a3 good_bmark -> good_bmark + fffffff..d3cbeb4 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 2a3593d..102182c branches/good_branch -> branches/good_branch - b226160..d10e008 good_bmark -> good_bmark - b226160..c344372 master -> master + 84660eb..686acc5 branches/good_branch -> branches/good_branch + a7f6802..3f75351 good_bmark -> good_bmark + a7f6802..ffb4a9f master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - b226160..c344372 master -> master - b226160..d10e008 good_bmark -> good_bmark - 2a3593d..102182c branches/good_branch -> branches/good_branch + a7f6802..ffb4a9f master -> master + a7f6802..3f75351 good_bmark -> good_bmark + 84660eb..686acc5 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..5ce2e99 branches/good_branch -> branches/good_branch - fffffff..c636c88 good_bmark -> good_bmark - fffffff..46cc751 master -> master + fffffff..d3cbeb4 branches/good_branch -> branches/good_branch + fffffff..fd521a3 good_bmark -> good_bmark + fffffff..4c5d7e6 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..46cc751 master -> master - fffffff..c636c88 good_bmark -> good_bmark - fffffff..5ce2e99 branches/good_branch -> branches/good_branch + fffffff..4c5d7e6 master -> master + fffffff..fd521a3 good_bmark -> good_bmark + fffffff..d3cbeb4 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + ok 24 - remote big push dry-run expecting success: @@ -4311,7 +4565,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Cloning into 'gitrepo'... ok 24 - remote big push dry-run expecting success: @@ -4357,176 +4610,171 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 a326c40ec9f0:a94fc30d86a7 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets ea8d8a142a72:c9b171f376ab progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 2a20ab5fbc55:53cad1f9e9b2 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 c3654794de4a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 e19d36f9c60c:929f2f7c3bf3 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. Cloning into 'gitrepo'... +Cloning into './sub_hg_a'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 d3618c084633:307df23ef59a +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets ddd97933980f:916cbb8891ef progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into 'gitrepo'... -HEAD is now at ca55a37 zero -HEAD is now at ca55a37 zero -HEAD is now at dfba9bf good branch -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file 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 4fc0eee0692f:b663e5cbf38e +aggiunti 4 changeset con 4 modifiche a 1 file +new changesets 1df6cfea95f9:0f39ffc81c3b +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 3db87c8 zero -HEAD is now at 3db87c8 zero -HEAD is now at 474f8c3 good branch +HEAD is now at cf7362a zero +HEAD is now at cf7362a zero +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets a36238634b48:be509006ae90 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at 24beed7 good branch +HEAD is now at bda36cc zero +HEAD is now at bda36cc zero +HEAD is now at b1d7713 good branch +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 7511f04feea9 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 8231114...e2432e0 branches/bad_branch -> branches/bad_branch (forced update) - dfba9bf..e76f1bb branches/good_branch -> branches/good_branch - + c7cbafa...40da3fa bad_bmark1 -> bad_bmark1 (forced update) - + c7cbafa...607729d bad_bmark2 -> bad_bmark2 (forced update) - c7cbafa..d65f9f0 good_bmark -> good_bmark - c7cbafa..40cbfbc master -> master + + eeaad46...5549b06 branches/bad_branch -> branches/bad_branch (forced update) + 24beed7..20371ab branches/good_branch -> branches/good_branch + + a810f38...6123625 bad_bmark1 -> bad_bmark1 (forced update) + + a810f38...d85d5ba bad_bmark2 -> bad_bmark2 (forced update) + a810f38..68e24e6 good_bmark -> good_bmark + a810f38..f970a1a master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - c7cbafa..40cbfbc master -> master - c7cbafa..d65f9f0 good_bmark -> good_bmark - dfba9bf..e76f1bb branches/good_branch -> branches/good_branch + a810f38..f970a1a master -> master + a810f38..68e24e6 good_bmark -> good_bmark + 24beed7..20371ab branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + c7cbafa...40da3fa bad_bmark1 -> bad_bmark1 (forced update) - + c7cbafa...607729d bad_bmark2 -> bad_bmark2 (forced update) - + 8231114...e2432e0 branches/bad_branch -> branches/bad_branch (forced update) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 fbe4048ec648 -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 2c80582..4ecc581 master -> origin/master - 2c80582..4ecc581 branches/default -> origin/branches/default -Updating 2c80582..4ecc581 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + + a810f38...6123625 bad_bmark1 -> bad_bmark1 (forced update) + + a810f38...d85d5ba bad_bmark2 -> bad_bmark2 (forced update) + + eeaad46...5549b06 branches/bad_branch -> branches/bad_branch (forced update) +Cloning into './sub_hg_b'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...a2c25c0 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...65453af branches/good_branch -> branches/good_branch (forced update) - + fffffff...806381e bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...d8e9a31 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...23234a2 good_bmark -> good_bmark (forced update) - + fffffff...5274836 master -> master (forced update) + + fffffff...042084c branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...b5922c9 branches/good_branch -> branches/good_branch (forced update) + + fffffff...ff77ff5 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...c3253dc bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...d5cbaf2 good_bmark -> good_bmark (forced update) + + fffffff...d780230 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...5274836 master -> master (forced update) - + fffffff...23234a2 good_bmark -> good_bmark (forced update) - + fffffff...65453af branches/good_branch -> branches/good_branch (forced update) + + fffffff...d780230 master -> master (forced update) + + fffffff...d5cbaf2 good_bmark -> good_bmark (forced update) + + fffffff...b5922c9 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...806381e bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...d8e9a31 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...a2c25c0 branches/bad_branch -> branches/bad_branch (forced update) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 ae4d5eb4aa88 -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 4b15752..0fa315a branches/default -> origin/branches/default - 4b15752..0fa315a master -> origin/master -HEAD is now at 4b15752 substate_hg_a - Successfully rebased and updated detached HEAD. + + fffffff...ff77ff5 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...c3253dc bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...042084c branches/bad_branch -> branches/bad_branch (forced update) /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 9911e0520e96 -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 1f07075..0be946c branches/default -> origin/branches/default - 1f07075..0be946c master -> origin/master -HEAD is now at 1f07075 zero_sub_hg_a_x - Successfully rebased and updated detached HEAD. -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 4c04be023423:c45473c44eb9 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +hg 8642653111d9fab3478dfd019027c174888a9a39 be509006ae902f2eb86f9b9094be5d876b2f00c6 sub_hg_a /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg b2e7e8c62fbb1a3543bb98823b7974784b1891ea 7511f04feea99a98294b530b46fd5f7890248fe9 sub_hg_a_x /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 128e1c6c0f4f587137d40b2c8f0ec4802692dffe c45473c44eb904ea13a435af22ebe6bf46cb073f sub_hg_b /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b +ok 12 - subcommand sub foreach + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg && + echo "sub_hg = sub_hg" > .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force && + + ( + cd sub_hg && + grep url .git/config > ../expected && + git config remote.origin.url foobar && + grep foobar .git/config + ) && + + git-hg-helper sub sync && + grep url sub_hg/.git/config > actual && + test_cmp expected actual + ) + ok 25 - remote big push force dry-run expecting success: @@ -4552,13 +4800,6 @@ test_expect_code 1 git push ) -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - ok 25 - remote big push force dry-run expecting success: @@ -4585,40 +4826,46 @@ ) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 b317e0a6aa02:d2c839971d72 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +Cloning into 'gitrepo'... +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 65393fba3acb:e93d78ed60f5 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 9c97241 zero -[master e92f1c8] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 1206f24137b0:8bda77fe21d0 +Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 080e632cdb02:128e029b35d2 +HEAD is now at fb33623 zero progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 9dafec9 zero -[master 1c71e01] two +[master 1fda1c3] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 29f83fdd6419:ff05f05e16e2 +nessuna modifica trovata +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' @@ -4626,24 +4873,24 @@ hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +HEAD is now at 3bb053d zero +[master 3d5deda] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. Integrate the remote changes (e.g. -hint: 'git pull ...') before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. +Cloning into './sub_hg'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' +nessuna modifica trovata hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. @@ -4679,12 +4926,29 @@ ! grep feature-a out ) +To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. Integrate the remote changes (e.g. +hint: 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 3e4be5999e26 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata To hg::/build/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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' + url = foobar hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. @@ -4720,51 +4984,109 @@ ! grep feature-a out ) -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +ok 13 - subcommand sub sync + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg && + setup_repo git sub_git && + echo "sub_hg = sub_hg" > .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force && + + ( + cd sub_hg && + echo one > content_sub_hg && + git add content_sub_hg && + git commit -m one_sub_hg && + # detached HEAD + git push origin HEAD:master && + # also fetch to ensure notes are updated + git fetch origin + ) && + + ( + cd sub_git && + echo one > content_sub_git && + git add content_sub_git && + git commit -m one_sub_git && + # detached HEAD; push revision to other side ... anywhere + git push origin HEAD:refs/heads/new + ) + ) && + + ( + cd gitrepo && + git-hg-helper sub upstate && + git diff && + git status --porcelain | grep .hgsubstate && + git add .hgsubstate && + git commit -m update_sub && + git push origin master + ) && + + hg clone hgrepo hgclone && + + ( + cd hgclone && + hg update + ) && + + check_branch hgclone default update_sub && + check_branch hgclone/sub_hg default one_sub_hg && + check hgclone/sub_git HEAD one_sub_git + Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes +Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets fd476a7561d0:7b34401ed939 +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets bd600d103032:2ae07ac871cc progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets d5ae40b5ed96:eac509278a31 +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets c62fffc07444:05d557351aab progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... +Initialized empty Git repository in /build/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/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - [deleted] (none) -> origin/feature-a -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes ok 27 - fetch prune expecting success: @@ -4809,14 +5131,20 @@ 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 c996f70ee894:d1ff759d1e4b -no changes found +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 15225b343963:d643e41640b9 ok 27 - fetch prune expecting success: @@ -4861,61 +5189,66 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -added 2 changesets with 3 changes to 3 files -new changesets 9e32efdf73b5:b06cc2b5a422 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -Cloning into './sub_hg_a/sub_hg_a_x'... -created new head +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg'... /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +creata una nuova head +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets adbace4cb68d +0 files updated, 0 files merged, 1 files removed, 0 files unresolved Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 303d8723d343 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -created new head -Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ -Cloning into './sub_hg_b'... +Cloning into './sub_git'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +done. WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 d2a0325c3046:bdea12b9c265 +[detached HEAD 4c49f49] one_sub_hg + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +creata una nuova head +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file (+1 head) +new changesets 4b3263dadf1f:ff9324acc3e3 WARNING: Branch 'default' has more than one head, consider merging WARNING: Branch 'default' has more than one head, consider merging progress revision 1 'default' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] From hg::../hgrepo * [new branch] branches/default -> branches/default * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets a6df74ee37a6:bdea12b9c265 +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +aggiunti 1 changeset con 1 modifiche a 1 file +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..4c49f49 HEAD -> master +aggiunti 2 changeset con 2 modifiche a 2 file (+1 head) +new changesets 478682d511f9:0e67d24af61b 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) @@ -4924,47 +5257,65 @@ * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 1785d9dbf8dd:400e626e9101 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +1 local changesets published 1 files updated, 0 files merged, 1 files removed, 0 files unresolved +From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + 93ec06b..4c49f49 branches/default -> origin/branches/default /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -added 1 changesets with 1 changes to 1 files -new changesets 22dba9c28f93 +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 52ef66e970d2 WARNING: Branch 'default' has more than one head, consider merging +To /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 84b74a8...7f44b0f branches/default -> origin/branches/default (forced update) - + 84b74a8...7f44b0f master -> origin/master (forced update) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d2a5fb02875e + + a80497c...6341944 branches/default -> origin/branches/default (forced update) + + a80497c...6341944 master -> origin/master (forced update) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Updating ./sub_hg to 7ca03c23d5dc3428a0b2be50af80a9b546629974 [git 4c49f49] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 585eca159592 +diff --git a/.hgsubstate b/.hgsubstate +index aa1de7f..c8030c8 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-adbace4cb68d7eca7c2aa2291c5ef6c6be7bad7a sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++7ca03c23d5dc3428a0b2be50af80a9b546629974 sub_hg + M .hgsubstate WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) +[master 9f2c404] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + 84b74a8...dca2551 branches/default -> origin/branches/default (forced update) - + 84b74a8...dca2551 master -> origin/master (forced update) + + 4f6a606...ae96a79 branches/default -> origin/branches/default (forced update) + + 4f6a606...ae96a79 master -> origin/master (forced update) ok 28 - fetch multiple independent histories expecting success: @@ -4991,6 +5342,14 @@ git push origin bookmark ) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file ok 28 - fetch multiple independent histories expecting success: @@ -5017,114 +5376,113 @@ git push origin bookmark ) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 b9fcd37cb0ed -progress revision 2 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 2db1c85..bedb632 master -> origin/master - 2db1c85..bedb632 branches/default -> origin/branches/default -Updating 2db1c85..bedb632 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 172f2deb5abc -Cloning into 'gitrepo'... -progress revision 2 'default' (0/1) +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + fffffff..9f2c404 master -> master +Cloning into '/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... +done. Cloning into 'gitrepo'... -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 8c71e91..29f1535 branches/default -> origin/branches/default - 8c71e91..29f1535 master -> origin/master -HEAD is now at 8c71e91 substate_hg_a -Updating 8c71e91..29f1535 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Switched to a new branch 'new' +sto aggiornando al branch default +cloning subrepo sub_git from /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git +cloning subrepo sub_hg from /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg +3 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets 4f884e507124 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets c6583c5d94dc +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets b0d9e6251ce7 WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (fetch) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark 8546ff9] b +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +[bookmark 6a40b1b] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -searching for changes +adding remote bookmark bookmark +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 52329c1042e0 +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) origin hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4f90c3d8d3be -[bookmark 2637830] b +[bookmark ea22539] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b -progress revision 1 'default' (0/1) -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 8ef3414..8082033 branches/default -> origin/branches/default - 8ef3414..8082033 master -> origin/master -HEAD is now at 8ef3414 zero_sub_hg_a_x -Updating 8ef3414..8082033 -Fast-forward - content_sub_hg_a_x | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +ok 14 - subcommand sub addstate + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg_a && + setup_repo hg sub_hg_b && + setup_repo git sub_git && + echo "sub_hg_a = sub_hg_a" > .hgsub && + echo "sub_hg_b = sub_hg_b" >> .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force sub_hg_a && + git-hg-helper sub update --force sub_git && + ( + # advance and add a tag to the git repo + cd sub_git && + echo one > content_sub_git && + git add content_sub_git && + git commit -m one_sub_git && + git tag feature-a + ) && + + git-hg-helper sub status --cached > output && + cat output && + grep "^ .*sub_hg_a (.*master.*)$" output && + grep "^-.*sub_hg_b$" output && + grep "^+.*sub_git (feature-a~1)$" output && + git-hg-helper sub status sub_git > output && + cat output && + grep "^+.*sub_git (feature-a)$" output > actual && + test_cmp output actual + ) + /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +nessuna modifica trovata WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark -no changes found -WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 29 - clone remote with null bookmark, then push expecting success: @@ -5145,14 +5503,15 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +nessuna modifica trovata +WARNING: Ignoring invalid bookmark 'bookmark' +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] bookmark -> bookmark -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] ok 29 - clone remote with null bookmark, then push expecting success: @@ -5173,36 +5532,21 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -no changes found -ok 11 - subcommand sub subsequent recursive update -- merge - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_foreach - -Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 20ad97635dea:7b080a508d91 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets bd83049815ff:5dcdb8ad2b89 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 ae2109243f16:f9855b3041be -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 30 - notes checking known breakage: @@ -5229,6 +5573,27 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 5fab1b601845:22cf607827ac +Initialized empty Git repository in /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 3 modifiche a 3 file +new changesets 6b5c96c6f122:1317aee7ae6e ok 30 - notes expecting success: @@ -5255,63 +5620,52 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 b1f2c31309f0 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 78e9e2e98df7 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 1b59806] two +[master a999c37] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 0c0aa9dddb23 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 43306fe] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 1dbc2d3..1b59806 master -> master -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 1576543..a999c37 master -> master +Cloning into 'gitrepo'... +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..43306fe master -> master ---- expected 2023-06-08 20:20:24.240140601 +0000 -+++ actual 2023-06-08 20:20:24.436137068 +0000 +--- expected 2023-06-08 20:36:54.074247974 +0000 ++++ actual 2023-06-08 20:36:54.566201815 +0000 @@ -1,4 +1,3 @@ --cc8e632c89649dc6eac83733431fb226b431516e +-332d2b9e0d5f1a21e7803ddb2f90d84307a4c0ca - b1f2c31309f0ef13a2b463bf2bfe2fce05cc4b04 + 78e9e2e98df7e3e6f69eb55bdb7849a353f1a7d0 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file not ok 31 - push updates notes # TODO known breakage expecting success: @@ -5338,11 +5692,44 @@ check_bookmark hgrepo feature-a two -Initialized empty Git repository in /build/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 +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets d05120f5b2f1 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 41050bcc95eb +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master fbf8981] two Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into './sub_git'... +done. +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +nessuna modifica trovata +Cloning into 'gitrepo'... +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..fbf8981 master -> master +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] ok 31 - push updates notes expecting success: @@ -5369,87 +5756,69 @@ check_bookmark hgrepo feature-a two -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 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 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 3ccccb982212 +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets bfb1dedb7178 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 3c9ec4e] two + 2c30dca2a56d8fbad17ca298548d0d8c7687fca8 ./sub_hg_a (heads/master) +-0a078c5c2ec4763f442fb2e01b15f7c32373d915[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 2c30dca2a56d8fbad17ca298548d0d8c7687fca8 ./sub_hg_a (heads/master) +-0a078c5c2ec4763f442fb2e01b15f7c32373d915[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) +[master ee9dd9f] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 0fa821f90bcf -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 d13f707] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding changesets -adding manifests -adding file changes -adding file changes -added 1 changesets with 1 changes to 1 files +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 9fc7234..3c9ec4e master -> master -added 2 changesets with 3 changes to 3 files -new changesets ae28cc62f70f:48c50b760dc1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + 698f3bf..ee9dd9f master -> master +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..d13f707 master -> master +/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) +ok 15 - subcommand sub status + +# passed all 15 test(s) +1..15 /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata 1 local changesets published -Cloning into './sub_hg_a'... -searching for changes +sto cercando modifiche To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] feature-a -> feature-a /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -1 local changesets published -searching for changes -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] feature-a -> feature-a -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 2096e694c322 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master e6cb126] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 32 - push bookmark without changesets expecting success: @@ -5472,13 +5841,23 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 2f453a5bd764:3a6c49cdf5c7 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..e6cb126 master -> master +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +1 local changesets published +sto cercando modifiche +To hg::/build/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: @@ -5501,70 +5880,44 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 6dcc98df3394 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -Cloning into './sub_hg_b'... Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 2fab69e25e3d -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 51086b6a95f3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 454eb0519663:f0eae18cae11 +Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets b18dd10b4db6 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 3740ece68141 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into './sub_hg_b/sub_git'... -done. /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 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 43d487cb60ca +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets f3b922da7c31 progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 70d0257..8c0a55e master -> origin/master - 70d0257..8c0a55e branches/default -> origin/branches/default + 60475c8..505562b master -> origin/master + 60475c8..505562b branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Updating 70d0257..8c0a55e +Updating 60475c8..505562b Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5604,54 +5957,20 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 28584bcac22d +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 47eb01fb8457 progress revision 1 'default' (0/1) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - cbf39ee..4bd0c44 master -> origin/master - cbf39ee..4bd0c44 branches/default -> origin/branches/default + 59f8945..348e411 master -> origin/master + 59f8945..348e411 branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -hg 68842c1e7983a403cedebeae43432283dfaaa703 3a6c49cdf5c73d7cba04296af6d0e4863b1e9938 sub_hg_a /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg 2160b3dbc3ab40a16040b4ebced0fd78ec8ea478 6dcc98df3394433933330b91ce303b35d328091f sub_hg_a_x /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 1e7bac22ffa952eadcfb626d2b8f8512700f4fc4 f0eae18cae11bb62e93691fe4de85cf61099ed08 sub_hg_b /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b -ok 12 - subcommand sub foreach - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg && - echo "sub_hg = sub_hg" > .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force && - - ( - cd sub_hg && - grep url .git/config > ../expected && - git config remote.origin.url foobar && - grep foobar .git/config - ) && - - git-hg-helper sub sync && - grep url sub_hg/.git/config > actual && - test_cmp expected actual - ) - -Updating cbf39ee..4bd0c44 +Updating 59f8945..348e411 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5691,50 +6010,40 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -marked working directory as branch feature +marcata directory di lavoro come branch feature (branches are permanent and global, did you want a bookmark?) -marked working directory as branch feature +marcata directory di lavoro come branch feature (branches are permanent and global, did you want a bookmark?) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets f2d7be584ab9:889eefd1e64e +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +Cloning into 'gitrepo'... +aggiunti 3 changeset con 3 modifiche a 1 file (+1 head) +new changesets 39b786ad7950:03a3a7275f97 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] Auto-merging content Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 6368ab69af48:ae0c28f34c42 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 3 changeset con 3 modifiche a 1 file (+1 head) +new changesets 7cac28036db2:8ab7bf3f3daa progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets f94658faa2ba:e497029806c1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) Auto-merging content Merge made by the 'ort' strategy. content | 2 +- @@ -5743,27 +6052,24 @@ 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) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (-1 head) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - e399eae..41e407d master -> master + 3660fb0..4c6f19c master -> master /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -Cloning into './sub_hg'... -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (-1 heads) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file (-1 head) To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..f1dcd7e master -> master + fffffff..0a84c34 master -> master ok 34 - push merged named branch expecting success: @@ -5788,15 +6094,6 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 24c2266e1445 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 34 - push merged named branch expecting success: @@ -5821,115 +6118,48 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual - url = foobar -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... -ok 13 - subcommand sub sync - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg && - setup_repo git sub_git && - echo "sub_hg = sub_hg" > .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force && - - ( - cd sub_hg && - echo one > content_sub_hg && - git add content_sub_hg && - git commit -m one_sub_hg && - # detached HEAD - git push origin HEAD:master && - # also fetch to ensure notes are updated - git fetch origin - ) && - - ( - cd sub_git && - echo one > content_sub_git && - git add content_sub_git && - git commit -m one_sub_git && - # detached HEAD; push revision to other side ... anywhere - git push origin HEAD:refs/heads/new - ) - ) && - - ( - cd gitrepo && - git-hg-helper sub upstate && - git diff && - git status --porcelain | grep .hgsubstate && - git add .hgsubstate && - git commit -m update_sub && - git push origin master - ) && - - hg clone hgrepo hgclone && - - ( - cd hgclone && - hg update - ) && - - check_branch hgclone default update_sub && - check_branch hgclone/sub_hg default one_sub_hg && - check hgclone/sub_git HEAD one_sub_git - Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 463a3802083b +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 907119010f6a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 1381084ad987 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets d6ec0aa982ab progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/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 @@ -5990,96 +6220,52 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -Initialized empty Git repository in /build/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'... -marked working directory as branch feature +marcata directory di lavoro come branch feature (branches are permanent and global, did you want a bookmark?) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -marked working directory as branch feature +marcata directory di lavoro come branch feature (branches are permanent and global, did you want a bookmark?) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 71402e1e50a1:daf8492d8254 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into './sub_hg'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 8cebaffa0c7b:95fab8bfaefd -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 7bef8959e308:5b0157dd0485 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file +new changesets 12a2468e7605:1c705c2ee1b9 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'. -* master -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 fda3e1eeef6d -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 1 file /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +new changesets afeab85390da:98632033f5f4 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -Cloning into './sub_git'... -done. -no changes found -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 -[detached HEAD cf89357] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] +* master +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. ok 36 - push tag different branch expecting success: @@ -6100,8 +6286,16 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -no changes found -searching for changes +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/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: @@ -6122,70 +6316,17 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..cf89357 HEAD -> master -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -1 local changesets published -From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - f35a556..cf89357 branches/default -> origin/branches/default -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -To /build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Updating ./sub_hg to 7eafab98f1a4583fe14e9c771913b020cf340a62 [git cf89357] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -Cloning into 'gitrepo'... -diff --git a/.hgsubstate b/.hgsubstate -index 46654ec..edbdd0e 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --fda3e1eeef6d6fb26d513ab0e98074af68bface9 sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+7eafab98f1a4583fe14e9c771913b020cf340a62 sub_hg - M .hgsubstate -[master bd9c828] update_sub - Author: A U Thor - 1 file changed, 2 insertions(+), 2 deletions(-) Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -added 2 changesets with 1 changes to 1 files -new changesets 584228a1ce13:b6ff6bfb1e24 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -adding changesets -adding manifests -adding file changes -To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - fffffff..bd9c828 master -> master -added 2 changesets with 1 changes to 1 files -new changesets 50d8bf716822:0f12bdfa493d +Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 1 modifiche a 1 file +new changesets 05f6ec87b160:54aee169f69d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6211,6 +6352,15 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 1 modifiche a 1 file +new changesets 85be1105add8:da47cfc47de6 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 37 - cloning a removed file works expecting success: @@ -6234,73 +6384,24 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" -Cloning into '/build/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/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git -cloning subrepo sub_hg from /build/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 -ok 14 - subcommand sub addstate - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg_a && - setup_repo hg sub_hg_b && - setup_repo git sub_git && - echo "sub_hg_a = sub_hg_a" > .hgsub && - echo "sub_hg_b = sub_hg_b" >> .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force sub_hg_a && - git-hg-helper sub update --force sub_git && - ( - # advance and add a tag to the git repo - cd sub_git && - echo one > content_sub_git && - git add content_sub_git && - git commit -m one_sub_git && - git tag feature-a - ) && - - git-hg-helper sub status --cached > output && - cat output && - grep "^ .*sub_hg_a (.*master.*)$" output && - grep "^-.*sub_hg_b$" output && - grep "^+.*sub_git (feature-a~1)$" output && - git-hg-helper sub status sub_git > output && - cat output && - grep "^+.*sub_git (feature-a)$" output > actual && - test_cmp output actual - ) - Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 18636ad86b59:3eaedeaa277c +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +new changesets 7baea198726c:41c7df985964 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file ok 38 - cloning a file replaced with a directory expecting success: @@ -6326,11 +6427,8 @@ 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 2 files -new changesets 18636ad86b59:c21f6169dd07 +aggiunti 2 changeset con 2 modifiche a 2 file +new changesets a613cd453f7f:1523ecbbbd95 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6358,32 +6456,26 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" -Initialized empty Git repository in /build/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'... Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -Cloning into 'gitrepo'... -added 2 changesets with 2 changes to 2 files -new changesets 2cd5fc8a96bd:4a81cd1e66d7 /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +new changesets 484ecf806e3d:acc85853caf3 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets d7bcb791fe66:f8a5d645632a +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file +new changesets 0907df7653e0:f1090a471e5d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6432,69 +6524,32 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 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 e41ae39c677d:8c4b2df0fa3a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -marked working directory as branch parent +marcata directory di lavoro come branch parent (branches are permanent and global, did you want a bookmark?) -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -marked working directory as branch parent +marcata directory di lavoro come branch parent (branches are permanent and global, did you want a bookmark?) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets b05d5a8a369c -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -marked working directory as branch parent/child -marked working directory as branch parent/child -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -Cloning into './sub_git'... -done. -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +marcata directory di lavoro come branch parent/child +marcata directory di lavoro come branch parent/child Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets 5b24f8ce5805:d12ec549a03b +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 3 changeset con 3 modifiche a 1 file +new changesets b7d136fbdd4d:9fac14a5cfe1 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'parent' (0/1) -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] - d36cba5286f7274b768b44c90532fa59eec08cfd ./sub_hg_a (heads/master) --94f5e315c99db26cace7b80fed030c1f1dfd3165[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - d36cba5286f7274b768b44c90532fa59eec08cfd ./sub_hg_a (heads/master) --94f5e315c99db26cace7b80fed030c1f1dfd3165[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file ok 40 - clone can ignore invalid refnames expecting success: @@ -6524,11 +6579,8 @@ test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets 5b24f8ce5805:a1daa1a9dbd2 +aggiunti 3 changeset con 3 modifiche a 1 file +new changesets b7d136fbdd4d:9fac14a5cfe1 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6562,59 +6614,38 @@ test_cmp expected actual -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -/build/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - 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 6052254d7f1c -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 045587a4347b +Cloning into 'gitrepo'... +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 8f19da7f517c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +sto cercando modifiche +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 2e6a309f05b8 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new tag] v1.0 -> v1.0 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 41 - push annotated tag expecting success: @@ -6637,6 +6668,19 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +Cloning into 'gitrepo1'... ok 41 - push annotated tag expecting success: @@ -6659,77 +6703,60 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -Cloning into 'gitrepo1'... -Cloning into 'gitrepo1'... -/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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 +nessuna modifica trovata 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 +Cloning into 'gitrepo1'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found -warning: You appear to have cloned an empty repository. -[master (root-commit) 9f40cc0] two - Author: A U Thor - Date: Mon Sep 26 00:00:00 2016 -0230 - 1 file changed, 1 insertion(+) - create mode 100644 content /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] master -> master +nessuna modifica trovata +warning: You appear to have cloned an empty repository. Cloning into 'gitrepo2'... +[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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] master -> master -Cloning into 'gitrepo2'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead 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/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 1 changesets with 1 changes to 1 files +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file new changesets e522f351d13b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] master -> master +Cloning into 'gitrepo2'... ok 42 - timezone issues with negative offsets expecting success: @@ -6754,20 +6781,36 @@ check_bookmark hgrepo feature-a +/build/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +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 Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file adding remote bookmark feature-a -added 1 changesets with 1 changes to 1 files -new changesets e701b2c64716 +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 2a3733f54a31 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata error: refusing to update ref with bad name 'hg/origin/refs/heads/feature-a' ok 43 - remote delete bookmark @@ -6805,35 +6848,35 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 c4ed12aa4bb1 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 393bf0f86433 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 7245968] one +[master c6ba147] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata adding remote bookmark feature-b 1 local changesets published -searching for changes +sto cercando modifiche /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata adding remote bookmark feature-a -searching for changes +sto cercando modifiche ok 44 - source:dest bookmark expecting success: @@ -6854,18 +6897,18 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 54ec264b1d65 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 7cdd74dd91b0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -updating to branch default +sto aggiornando al branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) From hg::../hgrepo.second @@ -6873,24 +6916,24 @@ * [new branch] master -> second/master /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files -new changesets 33ff23617bb6:890ff27e4984 +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 5 modifiche a 2 file +new changesets dfd1c3567f5a:9b2427e4c12c progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - ab2511f..701ccc2 master -> origin/master - ab2511f..701ccc2 branches/default -> origin/branches/default -HEAD is now at 701ccc2 restored + a02bc3b..e3e5591 master -> origin/master + a02bc3b..e3e5591 branches/default -> origin/branches/default +HEAD is now at e3e5591 restored /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata To hg::/build/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 7deb5e79e56550fccfc0ea7451d86028f3faa5cd) + ! [remote rejected] master -> master (rejected not pushing hg based commit c66af2439d67924aff1dd16f5b99b129c5c86644) error: failed to push some refs to 'hg::/build/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 7deb5e79e56550fccfc0ea7451d86028f3faa5cd) + ! [remote rejected] master -> master (rejected not pushing hg based commit c66af2439d67924aff1dd16f5b99b129c5c86644) ok 45 - check-hg-commits with fail mode expecting success: @@ -6901,7 +6944,7 @@ or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -updating to branch default +sto aggiornando al branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] @@ -6914,23 +6957,23 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 4d15a2a..c89e046 master -> origin/master - 4d15a2a..c89e046 branches/default -> origin/branches/default -HEAD is now at c89e046 restored + da2aa3b..c5abe19 master -> origin/master + da2aa3b..c5abe19 branches/default -> origin/branches/default +HEAD is now at c5abe19 restored /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -WARNING: Pushing hg changeset 2e2702417f638aea46a2f3f0ff950d133521a52d for 1b7c2e43c9ff56e0ca9754089074fba311a5986f -WARNING: Pushing hg changeset aea714b43d80002e6a25ba8bf0e2179b66f57632 for fcd566f7d515b1fb5071f8db0def06891bd8cc0e -WARNING: Pushing hg changeset df5f7febb6b169c6c791f70d613a3a52c6d0c7a0 for 9f438f003580cb8f1e2ef2f5868af7f00c6fa017 -WARNING: Pushing hg changeset a916fb48c78ec578d036b3b3bfc23fe1e716de1a for f6a3466cfa8b8521544fc66667f635bcbeaa96ac -WARNING: Pushing hg changeset 1d3ec37868415312295a0c401357de969db12499 for c89e046818649eae3928c1188d07c5931df25e9b +WARNING: Pushing hg changeset 29fab57c48867cbd01a8e68940c5e6fff928b4fd for f011ac8a1fc2aa11452f7eb0363740258637c5c9 +WARNING: Pushing hg changeset a6161bc230a3e92128b53912304f4bc93f51a7a0 for b01a42b615765a4fba5f7911d277f30710b85749 +WARNING: Pushing hg changeset fddc067b81757bcac0a5e23d0edbb6a2d835e22b for d32f68ff903cc502fde9db18f9421a1de69acee7 +WARNING: Pushing hg changeset 9a58fb9b71d334452cf8f12065db91f959c27b20 for 7b9910d3d3511a2fa0b7e9706b6243b777262478 +WARNING: Pushing hg changeset 56d3e8cacb7088e0dcadf1e6f6e9260632e7d9d2 for c5abe19caa8a2b850a9b701690602a03df083de2 To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..c89e046 master -> master -WARNING: Pushing hg changeset 2e2702417f638aea46a2f3f0ff950d133521a52d for 1b7c2e43c9ff56e0ca9754089074fba311a5986f -WARNING: Pushing hg changeset aea714b43d80002e6a25ba8bf0e2179b66f57632 for fcd566f7d515b1fb5071f8db0def06891bd8cc0e -WARNING: Pushing hg changeset df5f7febb6b169c6c791f70d613a3a52c6d0c7a0 for 9f438f003580cb8f1e2ef2f5868af7f00c6fa017 -WARNING: Pushing hg changeset a916fb48c78ec578d036b3b3bfc23fe1e716de1a for f6a3466cfa8b8521544fc66667f635bcbeaa96ac -WARNING: Pushing hg changeset 1d3ec37868415312295a0c401357de969db12499 for c89e046818649eae3928c1188d07c5931df25e9b + fffffff..c5abe19 master -> master +WARNING: Pushing hg changeset 29fab57c48867cbd01a8e68940c5e6fff928b4fd for f011ac8a1fc2aa11452f7eb0363740258637c5c9 +WARNING: Pushing hg changeset a6161bc230a3e92128b53912304f4bc93f51a7a0 for b01a42b615765a4fba5f7911d277f30710b85749 +WARNING: Pushing hg changeset fddc067b81757bcac0a5e23d0edbb6a2d835e22b for d32f68ff903cc502fde9db18f9421a1de69acee7 +WARNING: Pushing hg changeset 9a58fb9b71d334452cf8f12065db91f959c27b20 for 7b9910d3d3511a2fa0b7e9706b6243b777262478 +WARNING: Pushing hg changeset 56d3e8cacb7088e0dcadf1e6f6e9260632e7d9d2 for c5abe19caa8a2b850a9b701690602a03df083de2 ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -6939,18 +6982,18 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 4c619556fa39 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets e34f05a9968d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -updating to branch default +sto aggiornando al branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) From hg::../hgrepo.second @@ -6958,37 +7001,37 @@ * [new branch] master -> second/master /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files -new changesets 47dd8d92d725:3be0fcbd14dc +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 5 modifiche a 2 file +new changesets 9092261ee4e4:0a2625cbeecf progress revision 1 'default' (0/5) From hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 534d451..55067cf master -> origin/master - 534d451..55067cf branches/default -> origin/branches/default -HEAD is now at 55067cf restored -/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead - or locale.getdefaultlocale()[1] -no changes found -WARNING: Using hg changeset 47dd8d92d7259af2cdb04b370b0244c43f3ba386 for 2ac177b99c54f16297a58c8d28c7c91e2db4d040 -WARNING: Using hg changeset 66fff7b18740bef1256c01150b8274558bbbde71 for 2537f9d18cd9ba326fe9adae12fa0441745388f8 -WARNING: Using hg changeset 1f3138c32f6f52af486d92cacb0fe0bd5d22d163 for b248240900a1cd4c8e78f47f8ae4303dc637ca0d -WARNING: Using hg changeset fff57bdcd85da5a7a62488a400938b9d18726f5a for cf5694ba73bf6211b3f24781de71c1d0c29b030e -WARNING: Using hg changeset 3be0fcbd14dc164fd7820575b8effad38f31e294 for 55067cf0b63fe56f0c85ef039ca6750c28db8152 -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 2 files + 6a0733d..912a523 master -> origin/master + 6a0733d..912a523 branches/default -> origin/branches/default +HEAD is now at 912a523 restored +/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead + or locale.getdefaultlocale()[1] +nessuna modifica trovata +WARNING: Using hg changeset 9092261ee4e461ef1b925e09ced9b179e6bce91f for ee1b8b9125f7454dfb21691227ce0b937a61cf3f +WARNING: Using hg changeset 3f59604a759bf3e0c095945d38f9c46f1b81af81 for 8e6177df8b093eb7074fc4ce2a3fbdfb60f6a4ed +WARNING: Using hg changeset 8a2811f6d41a5f30020ea4db782a63c8803f2fb1 for 2bfce7435fe5eb4cb0861b2f6a82ec3b1ecefe66 +WARNING: Using hg changeset 69d6f6a4d02a5d44619eec3091641ba441660211 for 1c533d3e9e6fc62a82ee10c62fca3a8946659491 +WARNING: Using hg changeset 0a2625cbeecf1350b143d33fdc8c504396cbfd51 for 912a523654d7aff1caa97f4b3e19343f1227f5ff +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 5 changeset con 5 modifiche a 2 file To hg::/build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..55067cf master -> master -WARNING: Using hg changeset 47dd8d92d7259af2cdb04b370b0244c43f3ba386 for 2ac177b99c54f16297a58c8d28c7c91e2db4d040 -WARNING: Using hg changeset 66fff7b18740bef1256c01150b8274558bbbde71 for 2537f9d18cd9ba326fe9adae12fa0441745388f8 -WARNING: Using hg changeset 1f3138c32f6f52af486d92cacb0fe0bd5d22d163 for b248240900a1cd4c8e78f47f8ae4303dc637ca0d -WARNING: Using hg changeset fff57bdcd85da5a7a62488a400938b9d18726f5a for cf5694ba73bf6211b3f24781de71c1d0c29b030e -WARNING: Using hg changeset 3be0fcbd14dc164fd7820575b8effad38f31e294 for 55067cf0b63fe56f0c85ef039ca6750c28db8152 + fffffff..912a523 master -> master +WARNING: Using hg changeset 9092261ee4e461ef1b925e09ced9b179e6bce91f for ee1b8b9125f7454dfb21691227ce0b937a61cf3f +WARNING: Using hg changeset 3f59604a759bf3e0c095945d38f9c46f1b81af81 for 8e6177df8b093eb7074fc4ce2a3fbdfb60f6a4ed +WARNING: Using hg changeset 8a2811f6d41a5f30020ea4db782a63c8803f2fb1 for 2bfce7435fe5eb4cb0861b2f6a82ec3b1ecefe66 +WARNING: Using hg changeset 69d6f6a4d02a5d44619eec3091641ba441660211 for 1c533d3e9e6fc62a82ee10c62fca3a8946659491 +WARNING: Using hg changeset 0a2625cbeecf1350b143d33fdc8c504396cbfd51 for 912a523654d7aff1caa97f4b3e19343f1227f5ff ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -7006,37 +7049,37 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 bc2e38570a40 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 39541a2e0921 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata From hg::../hgrepo * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:42 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:42 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:42 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:42 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 refs ok 48 - shared-marks unset expecting success: @@ -7064,45 +7107,45 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 ecb26ff9665e +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 380235f79969 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata From hg::../hgrepo * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:42 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:42 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:42 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:42 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 refs /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -WARNING: seeded marks of origin with shared; performing gc +WARNING: seeded marks of second with shared; performing gc /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -ERROR: found both .git/hg/origin/marks-git and .git/hg/marks-git -WARNING: gc for origin failed -WARNING: seeded marks of second with shared; performing gc +ERROR: found both .git/hg/second/marks-git and .git/hg/marks-git +WARNING: gc for second failed +WARNING: seeded marks of origin with shared; performing gc /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-hg-helper:44: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] Loading hg marks ... @@ -7112,27 +7155,29 @@ Including notes commits ... Writing hg marks ... Writing git marks ... -no changes found +nessuna modifica trovata +progress revision walk 'branches/default' (0/0) +progress revision 0 'default' (0/1) total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Jun 8 20:42 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:42 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs -total 20 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone --rw-r--r-- 1 pbuilder1 pbuilder1 0 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 71 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:42 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 refs +total 24 +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:42 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:42 refs ok 49 - shared-marks set to unset expecting success: @@ -7169,86 +7214,86 @@ Cloning into 'gitrepo'... /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 d2a07ce8c506 +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 1 modifiche a 1 file +new changesets 30c4d115c868 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) From hg::../hgrepo * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 refs /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] -no changes found +nessuna modifica trovata total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 refs /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: Use setlocale(), getencoding() and getlocale() instead or locale.getdefaultlocale()[1] WARNING: using marks of remote origin as shared marks -no changes found +nessuna modifica trovata total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jun 8 20:23 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jun 8 20:23 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jun 8 20:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jun 8 20:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jun 8 20:23 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jun 8 20:23 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jun 8 20:23 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Jun 8 20:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Jun 8 20:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Jun 8 20:43 refs ok 50 - shared-marks unset to set expecting success: @@ -7288,16 +7333,16 @@ rename content => content2 (100%) /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 2 changeset con 2 modifiche a 2 file 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: @@ -7344,12 +7389,12 @@ create mode 160000 sub /build/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 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 2 changes to 2 files +nessuna modifica trovata +sto cercando modifiche +sto aggiungendo i changeset +sto aggiungendo i manifesti +sto aggiungendo le modifiche ai file +aggiunti 1 changeset con 2 modifiche a 2 file To hg::../hgrepo * [new branch] master -> master 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -7368,7 +7413,7 @@ debian/rules override_dh_auto_install make[1]: Entering directory '/build/git-remote-hg-1.0.4~ds' dh_auto_install -- prefix=/usr install-doc - make -j3 install DESTDIR=/build/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc + make -j4 install DESTDIR=/build/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc make[2]: Entering directory '/build/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -7420,12 +7465,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/21585/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/21585/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/2856 and its subdirectories -I: Current time: Thu Jun 8 08:23:54 -12 2023 -I: pbuilder-time-stamp: 1686255834 +I: removing directory /srv/workspace/pbuilder/21585 and its subdirectories +I: Current time: Fri Jun 9 10:44:30 +14 2023 +I: pbuilder-time-stamp: 1686257070