Diff of the two buildlogs: -- --- b1/build.log 2021-09-01 11:05:05.131375124 +0000 +++ b2/build.log 2021-09-01 11:06:09.056986670 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Tue Aug 31 23:01:49 -12 2021 -I: pbuilder-time-stamp: 1630494109 +I: Current time: Wed Oct 5 07:28:06 +14 2022 +I: pbuilder-time-stamp: 1664904486 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz] I: copying local configuration @@ -18,7 +18,7 @@ I: Extracting source gpgv: unknown type of key resource 'trustedkeys.kbx' gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error -gpgv: Signature made Sat Mar 31 06:34:39 2018 -12 +gpgv: Signature made Sun Apr 1 08:34:39 2018 +14 gpgv: using RSA key 73B299CBD4EEADDCC017E87A5BFFDCC258E69433 gpgv: issuer "jspricke@debian.org" gpgv: Can't check signature: No public key @@ -30,138 +30,172 @@ dpkg-source: info: applying 0001-Fix-location-of-completion-scripts.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/28084/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/39831/tmp/hooks/D01_modify_environment starting +debug: Running on ionos6-i386. +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 +Removing 'diversion of /bin/sh to /bin/sh.distrib by dash' +Adding 'diversion of /bin/sh to /bin/sh.distrib by bash' +Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash' +Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by 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/39831/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/39831/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='i386' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=8' - DISTRIBUTION='' - HOME='/root' - HOST_ARCH='i386' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="i686-pc-linux-gnu") + BASH_VERSION='5.0.3(1)-release' + BUILDDIR=/build + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=i386 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=15' + DIRSTACK=() + DISTRIBUTION= + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=i686 + HOST_ARCH=i386 IFS=' ' - INVOCATION_ID='795bc36db8844855bcaf72e97a411972' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - LD_LIBRARY_PATH='/usr/lib/libeatmydata' - LD_PRELOAD='libeatmydata.so' - 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='28084' - PS1='# ' - PS2='> ' + INVOCATION_ID=a3415e3bdb22450ca288f11103c00f8f + LANG=C + LANGUAGE=de_CH:de + LC_ALL=C + LD_LIBRARY_PATH=/usr/lib/libeatmydata + LD_PRELOAD=libeatmydata.so + MACHTYPE=i686-pc-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=39831 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/tmp.C67aQlaxoO/pbuilderrc_xKxb --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.C67aQlaxoO/b1 --logfile b1/build.log ros-wstool_0.1.17-1.dsc' - SUDO_GID='112' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://78.137.99.97:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.C67aQlaxoO/pbuilderrc_Zrhx --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.C67aQlaxoO/b2 --logfile b2/build.log ros-wstool_0.1.17-1.dsc' + SUDO_GID=112 + SUDO_UID=107 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://85.184.249.68:3128 I: uname -a - Linux ionos2-i386 5.10.0-8-686-pae #1 SMP Debian 5.10.46-4 (2021-08-03) i686 GNU/Linux + Linux i-capture-the-hostname 5.10.0-8-amd64 #1 SMP Debian 5.10.46-4 (2021-08-03) x86_64 GNU/Linux I: ls -l /bin total 5476 - -rwxr-xr-x 1 root root 1302248 Apr 17 2019 bash - -rwxr-xr-x 3 root root 38280 Jul 10 2019 bunzip2 - -rwxr-xr-x 3 root root 38280 Jul 10 2019 bzcat - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2227 Jul 10 2019 bzdiff - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4877 Jun 24 2019 bzexe - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3641 Jul 10 2019 bzgrep - -rwxr-xr-x 3 root root 38280 Jul 10 2019 bzip2 - -rwxr-xr-x 1 root root 17768 Jul 10 2019 bzip2recover - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Jul 10 2019 bzmore - -rwxr-xr-x 1 root root 38692 Feb 28 2019 cat - -rwxr-xr-x 1 root root 75588 Feb 28 2019 chgrp - -rwxr-xr-x 1 root root 63268 Feb 28 2019 chmod - -rwxr-xr-x 1 root root 75588 Feb 28 2019 chown - -rwxr-xr-x 1 root root 153732 Feb 28 2019 cp - -rwxr-xr-x 1 root root 132820 Jan 17 2019 dash - -rwxr-xr-x 1 root root 120676 Feb 28 2019 date - -rwxr-xr-x 1 root root 92040 Feb 28 2019 dd - -rwxr-xr-x 1 root root 100620 Feb 28 2019 df - -rwxr-xr-x 1 root root 149736 Feb 28 2019 dir - -rwxr-xr-x 1 root root 79412 Jan 9 2019 dmesg - lrwxrwxrwx 1 root root 8 Sep 26 2018 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Sep 26 2018 domainname -> hostname - -rwxr-xr-x 1 root root 34532 Feb 28 2019 echo - -rwxr-xr-x 1 root root 28 Jan 7 2019 egrep - -rwxr-xr-x 1 root root 34532 Feb 28 2019 false - -rwxr-xr-x 1 root root 28 Jan 7 2019 fgrep - -rwxr-xr-x 1 root root 67700 Jan 9 2019 findmnt - -rwsr-xr-x 1 root root 30112 Apr 22 2020 fusermount - -rwxr-xr-x 1 root root 206392 Jan 7 2019 grep - -rwxr-xr-x 2 root root 2345 Jan 5 2019 gunzip - -rwxr-xr-x 1 root root 6375 Jan 5 2019 gzexe - -rwxr-xr-x 1 root root 100952 Jan 5 2019 gzip - -rwxr-xr-x 1 root root 21916 Sep 26 2018 hostname - -rwxr-xr-x 1 root root 79752 Feb 28 2019 ln - -rwxr-xr-x 1 root root 55400 Jul 26 2018 login - -rwxr-xr-x 1 root root 149736 Feb 28 2019 ls - -rwxr-xr-x 1 root root 112032 Jan 9 2019 lsblk - -rwxr-xr-x 1 root root 87972 Feb 28 2019 mkdir - -rwxr-xr-x 1 root root 79748 Feb 28 2019 mknod - -rwxr-xr-x 1 root root 46916 Feb 28 2019 mktemp - -rwxr-xr-x 1 root root 42348 Jan 9 2019 more - -rwsr-xr-x 1 root root 50592 Jan 9 2019 mount - -rwxr-xr-x 1 root root 13724 Jan 9 2019 mountpoint - -rwxr-xr-x 1 root root 157832 Feb 28 2019 mv - lrwxrwxrwx 1 root root 8 Sep 26 2018 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Feb 14 2019 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 38660 Feb 28 2019 pwd - lrwxrwxrwx 1 root root 4 Apr 17 2019 rbash -> bash - -rwxr-xr-x 1 root root 46852 Feb 28 2019 readlink - -rwxr-xr-x 1 root root 75588 Feb 28 2019 rm - -rwxr-xr-x 1 root root 42756 Feb 28 2019 rmdir - -rwxr-xr-x 1 root root 22276 Jan 21 2019 run-parts - -rwxr-xr-x 1 root root 125036 Dec 22 2018 sed - lrwxrwxrwx 1 root root 4 Aug 6 20:26 sh -> dash - -rwxr-xr-x 1 root root 34532 Feb 28 2019 sleep - -rwxr-xr-x 1 root root 79652 Feb 28 2019 stty - -rwsr-xr-x 1 root root 71072 Jan 9 2019 su - -rwxr-xr-x 1 root root 34564 Feb 28 2019 sync - -rwxr-xr-x 1 root root 504024 Apr 23 2019 tar - -rwxr-xr-x 1 root root 13860 Jan 21 2019 tempfile - -rwxr-xr-x 1 root root 104292 Feb 28 2019 touch - -rwxr-xr-x 1 root root 34532 Feb 28 2019 true - -rwxr-xr-x 1 root root 17768 Apr 22 2020 ulockmgr_server - -rwsr-xr-x 1 root root 30108 Jan 9 2019 umount - -rwxr-xr-x 1 root root 34532 Feb 28 2019 uname - -rwxr-xr-x 2 root root 2345 Jan 5 2019 uncompress - -rwxr-xr-x 1 root root 149736 Feb 28 2019 vdir - -rwxr-xr-x 1 root root 34208 Jan 9 2019 wdctl - -rwxr-xr-x 1 root root 946 Jan 21 2019 which - lrwxrwxrwx 1 root root 8 Sep 26 2018 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1983 Jan 5 2019 zcat - -rwxr-xr-x 1 root root 1677 Jan 5 2019 zcmp - -rwxr-xr-x 1 root root 5879 Jan 5 2019 zdiff - -rwxr-xr-x 1 root root 29 Jan 5 2019 zegrep - -rwxr-xr-x 1 root root 29 Jan 5 2019 zfgrep - -rwxr-xr-x 1 root root 2080 Jan 5 2019 zforce - -rwxr-xr-x 1 root root 7584 Jan 5 2019 zgrep - -rwxr-xr-x 1 root root 2205 Jan 5 2019 zless - -rwxr-xr-x 1 root root 1841 Jan 5 2019 zmore - -rwxr-xr-x 1 root root 4552 Jan 5 2019 znew -I: user script /srv/workspace/pbuilder/28084/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 1302248 Apr 18 2019 bash + -rwxr-xr-x 3 root root 38280 Jul 11 2019 bunzip2 + -rwxr-xr-x 3 root root 38280 Jul 11 2019 bzcat + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2227 Jul 11 2019 bzdiff + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4877 Jun 25 2019 bzexe + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3641 Jul 11 2019 bzgrep + -rwxr-xr-x 3 root root 38280 Jul 11 2019 bzip2 + -rwxr-xr-x 1 root root 17768 Jul 11 2019 bzip2recover + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Jul 11 2019 bzmore + -rwxr-xr-x 1 root root 38692 Mar 1 2019 cat + -rwxr-xr-x 1 root root 75588 Mar 1 2019 chgrp + -rwxr-xr-x 1 root root 63268 Mar 1 2019 chmod + -rwxr-xr-x 1 root root 75588 Mar 1 2019 chown + -rwxr-xr-x 1 root root 153732 Mar 1 2019 cp + -rwxr-xr-x 1 root root 132820 Jan 18 2019 dash + -rwxr-xr-x 1 root root 120676 Mar 1 2019 date + -rwxr-xr-x 1 root root 92040 Mar 1 2019 dd + -rwxr-xr-x 1 root root 100620 Mar 1 2019 df + -rwxr-xr-x 1 root root 149736 Mar 1 2019 dir + -rwxr-xr-x 1 root root 79412 Jan 10 2019 dmesg + lrwxrwxrwx 1 root root 8 Sep 27 2018 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Sep 27 2018 domainname -> hostname + -rwxr-xr-x 1 root root 34532 Mar 1 2019 echo + -rwxr-xr-x 1 root root 28 Jan 8 2019 egrep + -rwxr-xr-x 1 root root 34532 Mar 1 2019 false + -rwxr-xr-x 1 root root 28 Jan 8 2019 fgrep + -rwxr-xr-x 1 root root 67700 Jan 10 2019 findmnt + -rwsr-xr-x 1 root root 30112 Apr 23 2020 fusermount + -rwxr-xr-x 1 root root 206392 Jan 8 2019 grep + -rwxr-xr-x 2 root root 2345 Jan 6 2019 gunzip + -rwxr-xr-x 1 root root 6375 Jan 6 2019 gzexe + -rwxr-xr-x 1 root root 100952 Jan 6 2019 gzip + -rwxr-xr-x 1 root root 21916 Sep 27 2018 hostname + -rwxr-xr-x 1 root root 79752 Mar 1 2019 ln + -rwxr-xr-x 1 root root 55400 Jul 27 2018 login + -rwxr-xr-x 1 root root 149736 Mar 1 2019 ls + -rwxr-xr-x 1 root root 112032 Jan 10 2019 lsblk + -rwxr-xr-x 1 root root 87972 Mar 1 2019 mkdir + -rwxr-xr-x 1 root root 79748 Mar 1 2019 mknod + -rwxr-xr-x 1 root root 46916 Mar 1 2019 mktemp + -rwxr-xr-x 1 root root 42348 Jan 10 2019 more + -rwsr-xr-x 1 root root 50592 Jan 10 2019 mount + -rwxr-xr-x 1 root root 13724 Jan 10 2019 mountpoint + -rwxr-xr-x 1 root root 157832 Mar 1 2019 mv + lrwxrwxrwx 1 root root 8 Sep 27 2018 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Feb 15 2019 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 38660 Mar 1 2019 pwd + lrwxrwxrwx 1 root root 4 Apr 18 2019 rbash -> bash + -rwxr-xr-x 1 root root 46852 Mar 1 2019 readlink + -rwxr-xr-x 1 root root 75588 Mar 1 2019 rm + -rwxr-xr-x 1 root root 42756 Mar 1 2019 rmdir + -rwxr-xr-x 1 root root 22276 Jan 22 2019 run-parts + -rwxr-xr-x 1 root root 125036 Dec 23 2018 sed + lrwxrwxrwx 1 root root 4 Oct 5 07:28 sh -> bash + lrwxrwxrwx 1 root root 4 Sep 10 04:48 sh.distrib -> dash + -rwxr-xr-x 1 root root 34532 Mar 1 2019 sleep + -rwxr-xr-x 1 root root 79652 Mar 1 2019 stty + -rwsr-xr-x 1 root root 71072 Jan 10 2019 su + -rwxr-xr-x 1 root root 34564 Mar 1 2019 sync + -rwxr-xr-x 1 root root 504024 Apr 24 2019 tar + -rwxr-xr-x 1 root root 13860 Jan 22 2019 tempfile + -rwxr-xr-x 1 root root 104292 Mar 1 2019 touch + -rwxr-xr-x 1 root root 34532 Mar 1 2019 true + -rwxr-xr-x 1 root root 17768 Apr 23 2020 ulockmgr_server + -rwsr-xr-x 1 root root 30108 Jan 10 2019 umount + -rwxr-xr-x 1 root root 34532 Mar 1 2019 uname + -rwxr-xr-x 2 root root 2345 Jan 6 2019 uncompress + -rwxr-xr-x 1 root root 149736 Mar 1 2019 vdir + -rwxr-xr-x 1 root root 34208 Jan 10 2019 wdctl + -rwxr-xr-x 1 root root 946 Jan 22 2019 which + lrwxrwxrwx 1 root root 8 Sep 27 2018 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1983 Jan 6 2019 zcat + -rwxr-xr-x 1 root root 1677 Jan 6 2019 zcmp + -rwxr-xr-x 1 root root 5879 Jan 6 2019 zdiff + -rwxr-xr-x 1 root root 29 Jan 6 2019 zegrep + -rwxr-xr-x 1 root root 29 Jan 6 2019 zfgrep + -rwxr-xr-x 1 root root 2080 Jan 6 2019 zforce + -rwxr-xr-x 1 root root 7584 Jan 6 2019 zgrep + -rwxr-xr-x 1 root root 2205 Jan 6 2019 zless + -rwxr-xr-x 1 root root 1841 Jan 6 2019 zmore + -rwxr-xr-x 1 root root 4552 Jan 6 2019 znew +I: user script /srv/workspace/pbuilder/39831/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -336,7 +370,7 @@ Get: 107 http://deb.debian.org/debian buster/main i386 python3-yaml i386 3.13-2 [111 kB] Get: 108 http://deb.debian.org/debian buster/main i386 python3-vcstools all 0.1.40-2 [32.6 kB] Get: 109 http://deb.debian.org/debian buster/main i386 subversion i386 1.10.4-1+deb10u2 [1018 kB] -Fetched 49.5 MB in 1s (47.6 MB/s) +Fetched 49.5 MB in 1s (52.5 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libbsd0:i386. (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 ... 19234 files and directories currently installed.) @@ -800,7 +834,8 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/ros-wstool-0.1.17/ && 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 > ../ros-wstool_0.1.17-1_source.changes +hostname: Name or service not known +I: Running cd /build/ros-wstool-0.1.17/ && 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 > ../ros-wstool_0.1.17-1_source.changes dpkg-buildpackage: info: source package ros-wstool dpkg-buildpackage: info: source version 0.1.17-1 dpkg-buildpackage: info: source distribution unstable @@ -837,893 +872,47 @@ running build running build_py creating /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/multiproject_cmd.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/ui.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/common.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/config_elements.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool copying src/wstool/multiproject_cli.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool copying src/wstool/helpers.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/config_elements.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/config.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/__version__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/wstool_cli.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool copying src/wstool/cli_common.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool -copying src/wstool/__init__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool copying src/wstool/config_yaml.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/__version__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/config.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/ui.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/multiproject_cmd.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/__init__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/common.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool +copying src/wstool/wstool_cli.py -> /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool running build_scripts creating build creating build/scripts-2.7 copying and adjusting scripts/wstool -> build/scripts-2.7 -changing mode of build/scripts-2.7/wstool from 644 to 755 +changing mode of build/scripts-2.7/wstool from 664 to 775 I: pybuild base:217: /usr/bin/python3 setup.py build running build running build_py creating /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/multiproject_cmd.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/ui.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/common.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/config_elements.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool copying src/wstool/multiproject_cli.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool copying src/wstool/helpers.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/config_elements.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/config.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/__version__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/wstool_cli.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool copying src/wstool/cli_common.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool -copying src/wstool/__init__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool copying src/wstool/config_yaml.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/__version__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/config.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/ui.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/multiproject_cmd.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/__init__.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/common.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool +copying src/wstool/wstool_cli.py -> /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool running build_scripts creating build/scripts-3.7 copying and adjusting scripts/wstool -> build/scripts-3.7 -changing mode of build/scripts-3.7/wstool from 644 to 755 +changing mode of build/scripts-3.7/wstool from 664 to 775 dh_auto_test -O--buildsystem=pybuild I: pybuild base:217: cd /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build; python2.7 -m unittest discover -v -Initialized empty Git repository in /tmp/tmpkguwdX/ros/.git/ -[master (root-commit) 0dac918] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpkguwdX/gitrepo/.git/ -[master (root-commit) 573dee8] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -test_install (test.local.test_tarfile.RosinstallTarTest) ... Using initial elements from: /tmp/tmpkguwdX/simple_changed_uri.rosinstall -Writing /tmp/tmpJkaVMR/.rosinstall -ok -test_abspath_overlap (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_conditional_abspath (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_distributed_work (test.local.test_multiproject_functions.FunctionsTest) ... [temptar] Fetching /tmp/tmpkguwdX/tarfile.tar.bz2 (version temptar) to /tmp/tmpJkaVMR/temptar -[temptar] Done. - -update complete. -ok -test_distributed_work_init (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_is_web_uri (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_normabspath (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_normalize_uri (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_select_element (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_select_elements (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_string_diff (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_worker_thread (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_get_mode (test.local.test_cli.FunctionsTest) ... ok -test_list_usage (test.local.test_cli.FunctionsTest) ... ok -test_diff (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_get_status (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_info (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_info_list (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_info_real_path (test.local.test_cli.GetStatusDiffInfoCmdTest) ... Warning: version 'version' not found for 'gitname' -ok -test_info_table (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_status (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_unmanaged (test.local.test_cli.GetStatusDiffInfoCmdTest) ... WARNING [vcstools] Command failed: 'svn info /tmp/tmpv846IT/ws/svnrepo' - errcode: 1: -svn: E155007: '/tmp/tmpv846IT/ws/svnrepo' is not a working copy -[/vcstools] -WARNING [vcstools] Command failed: 'hg paths default' - run at: '/tmp/tmpv846IT/ws/sub/hgrepo' - errcode: 1: -not found! -[/vcstools] -WARNING [vcstools] Command failed: 'bzr info /tmp/tmpv846IT/ws/bzrrepo' - errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpv846IT/ws/bzrrepo/". -[/vcstools] -WARNING [vcstools] Command failed: 'svn info /tmp/tmpv846IT/ws/svnrepo' - errcode: 1: -svn: E155007: '/tmp/tmpv846IT/ws/svnrepo' is not a working copy -[/vcstools] -WARNING [vcstools] Command failed: 'bzr info /tmp/tmpv846IT/ws/bzrrepo' - errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpv846IT/ws/bzrrepo/". -[/vcstools] -WARNING [vcstools] Command failed: 'hg paths default' - run at: '/tmp/tmpv846IT/ws/sub/hgrepo' - errcode: 1: -not found! -[/vcstools] -ok -test_version (test.local.test_cli.GetVersionTest) ... ok -test_option_arg (test.local.test_cli.GetWorkspaceTest) ... ok -test_option_env (test.local.test_cli.GetWorkspaceTest) ... ok -test_option_path (test.local.test_cli.GetWorkspaceTest) ... ok -test_mock_install (test.local.test_cli.InstallTest) ... [foo,foos,fooh,foob] still active -[foo,foos,fooh,foob] still active -ok -test_mock_install_fail (test.local.test_cli.InstallTest) ... Exception caught during install: Error processing 'foos' : Unittest Mock says install failed - -ok -Initialized empty Git repository in /tmp/tmpEICuYp/ros/.git/ -[master (root-commit) f2aba1e] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpEICuYp/gitrepo/.git/ -[master (root-commit) 97085b5] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -test_cmd_add_uris (test.local.test_cli.MultiprojectCLITest) ... Exception caught during install: Error processing 'foos' : Unittest Mock says install failed - -Using initial elements from: /tmp/tmpEICuYp/simple_rel3.rosinstall -Writing /tmp/tmpEICuYp/ws33/.rosinstall -Cloning into '/tmp/tmpEICuYp/ws33/ros'... -done. -ok -test_cmd_foreach (test.local.test_cli.MultiprojectCLITest) ... [ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/ws33/ros -[ros] Done. - -update complete. -!!!!! Warning: Not recursing into other config folder /tmp/tmpEICuYp/ws33 containing file .rosinstall -Using initial elements from: /tmp/tmpEICuYp/simple.rosinstall -Writing /tmp/tmpEICuYp/foreach/.rosinstall -Cloning into '/tmp/tmpEICuYp/foreach/ros'... -done. -Cloning into '/tmp/tmpEICuYp/foreach/gitrepo'... -done. -ok -test_cmd_info (test.local.test_cli.MultiprojectCLITest) ... [ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/foreach/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmpEICuYp/gitrepo (version None) to /tmp/tmpEICuYp/foreach/gitrepo -[gitrepo] Done. - -update complete. -workspace: /tmp/tmpEICuYp/ws_test_cmd_info -/tmp/tmpEICuYp/ws_test_cmd_info -[] -workspace: /tmp/tmpEICuYp/ws_test_cmd_info -Using initial elements from: /tmp/tmpEICuYp/simple.rosinstall -Writing /tmp/tmpEICuYp/ws_test_cmd_info/.rosinstall -Cloning into '/tmp/tmpEICuYp/ws_test_cmd_info/gitrepo'... -Cloning into '/tmp/tmpEICuYp/ws_test_cmd_info/ros'... -done. -done. -[ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/ws_test_cmd_info/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmpEICuYp/gitrepo (version None) to /tmp/tmpEICuYp/ws_test_cmd_info/gitrepo -[gitrepo] Done. -[ros,gitrepo] still active - -update complete. - Performing actions: - - Add new elements: - hgrepo hg /tmp/tmpEICuYp/hgrepo - -Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmpEICuYp/ws_test_cmd_info/.rosinstall - -update complete. -workspace: /tmp/tmpEICuYp/ws_test_cmd_info - - Localname S SCM Version (Spec) UID (Spec) URI (Spec) [http(s)://...] - --------- - --- -------------- ----------- --------------------------- - hgrepo x hg (-) /tmp/tmpEICuYp/hgrepo - gitrepo git master (-) 97085b5544b7 /tmp/tmpEICuYp/gitrepo - ros git master (-) f2aba1e7450f /tmp/tmpEICuYp/ros -Localname: gitrepo -Path /tmp/tmpEICuYp/ws_test_cmd_info/gitrepo -Status: -SCM: git -URI: /tmp/tmpEICuYp/gitrepo -Current URI: /tmp/tmpEICuYp/gitrepo -Spec-Version: -Current-Version: master -Spec-Revision: -Current-Revision: 97085b5544b78d1e70f8928f5bf577c9710e3aa0 -Other Properties: [] - -Localname: hgrepo -Path /tmp/tmpEICuYp/ws_test_cmd_info/hgrepo -Status: x -SCM: hg -URI: /tmp/tmpEICuYp/hgrepo -Current URI: -Spec-Version: -Current-Version: -Spec-Revision: -Current-Revision: -Other Properties: [] - -workspace: /tmp/tmpEICuYp/ws_test_cmd_info - - Localname S SCM Version (Spec) UID (Spec) URI (Spec) [http(s)://...] - --------- - --- -------------- ----------- --------------------------- - hgrepo x hg (-) /tmp/tmpEICuYp/hgrepo - gitrepo git master (=) 97085b5544b7 /tmp/tmpEICuYp/gitrepo - ros git master (=) f2aba1e7450f /tmp/tmpEICuYp/ros -Localname: gitrepo -Path /tmp/tmpEICuYp/ws_test_cmd_info/gitrepo -Status: C -SCM: git -URI: /tmp/tmpEICuYp/gitrepo -Current URI: /tmp/tmpEICuYp/gitrepo -Spec-Version: -Current-Version: master -Spec-Revision: -Current-Revision: 97085b5544b78d1e70f8928f5bf577c9710e3aa0 -Other Properties: [] - -ok -test_cmd_init (test.local.test_cli.MultiprojectCLITest) ... Localname: hgrepo -Path /tmp/tmpEICuYp/ws_test_cmd_info/hgrepo -Status: x -SCM: hg -URI: /tmp/tmpEICuYp/hgrepo -Current URI: -Spec-Version: -Current-Version: -Spec-Revision: -Current-Revision: -Other Properties: [] - -Writing /tmp/tmpEICuYp/ws30/.rosinstall -ok -test_cmd_remove (test.local.test_cli.MultiprojectCLITest) ... -update complete. -Writing /tmp/tmpEICuYp/ws32/.rosinstall -ok -test_cmd_set (test.local.test_cli.MultiprojectCLITest) ... -update complete. - Performing actions: - - Add new elements: - /tmp/tmpEICuYp/gitrepo - -Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmpEICuYp/ws32/.rosinstall - -update complete. - Performing actions: - - Add new elements: - /tmp/tmpEICuYp/hgrepo - -Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmpEICuYp/ws32/.rosinstall - -update complete. -Overwriting /tmp/tmpEICuYp/ws32/.rosinstall -Removed entries [u'/tmp/tmpEICuYp/gitrepo'] -Using initial elements from: /tmp/tmpEICuYp/simple.rosinstall -Writing /tmp/tmpEICuYp/ws31b/.rosinstall -Cloning into '/tmp/tmpEICuYp/ws31b/ros'... -Cloning into '/tmp/tmpEICuYp/ws31b/gitrepo'... -done. -done. -[ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/ws31b/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmpEICuYp/gitrepo (version None) to /tmp/tmpEICuYp/ws31b/gitrepo -[gitrepo] Done. -[ros,gitrepo] still active - -update complete. - Performing actions: - - Add new elements: - hgrepo hg http://some_uri - -Overwriting /tmp/tmpEICuYp/ws31b/.rosinstall -Config changed, remember to run 'multi_cli update hgrepo' to update the folder from hg - Performing actions: - - Change details of element (Use --merge-keep or --merge-replace to change): - hgrepo specified uri: http://some_uri -> /tmp/tmpEICuYp/hgrepo; - -Overwriting /tmp/tmpEICuYp/ws31b/.rosinstall -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Usage: multi_cli set [localname] [[SCM-URI] --(svn|hg|git|bzr) [--version=VERSION]?]? - -python -m unittest: error: no such option: --detached -ok -test_export (test.local.test_cli.MultiprojectCLITest) ... Warning, discarding non-vcs element othername -Warning: version 'version' not found for 'gitname' -ok -test_get_element_diff (test.local.test_cli.MultiprojectCLITest) ... ok -test_init_parallel (test.local.test_cli.MultiprojectCLITest) ... [hgrepo] Fetching /tmp/tmpEICuYp/hgrepo (version None) to /tmp/tmpEICuYp/ws31b/hgrepo -[hgrepo] Done. - -update complete. - Performing actions: - - Change details of element (Use --merge-keep or --merge-replace to change): - hgrepo scmtype: hg -> ; specified uri: /tmp/tmpEICuYp/hgrepo -> ; - -Overwriting /tmp/tmpEICuYp/ws31b/.rosinstall -Using initial elements from: /tmp/tmpEICuYp/simple.rosinstall -Writing /tmp/tmpEICuYp/ws31/.rosinstall -Cloning into '/tmp/tmpEICuYp/ws31/gitrepo'... -Cloning into '/tmp/tmpEICuYp/ws31/ros'... -done. -done. -[gitrepo] Fetching /tmp/tmpEICuYp/gitrepo (version None) to /tmp/tmpEICuYp/ws31/gitrepo -[gitrepo] Done. -[ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/ws31/ros -[ros] Done. -[ros,gitrepo] still active - -update complete. - Performing actions: - - Add new elements: - hgrepo hg /tmp/tmpEICuYp/hgrepo - -Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmpEICuYp/ws31/.rosinstall - -update complete. -[gitrepo] Updating /tmp/tmpEICuYp/ws31/gitrepo -[gitrepo] Done. -[ros] Updating /tmp/tmpEICuYp/ws31/ros -[ros] Done. -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -[hgrepo] Fetching /tmp/tmpEICuYp/hgrepo (version None) to /tmp/tmpEICuYp/ws31/hgrepo -[hgrepo] Done. -ok -test_merge_dash (test.local.test_cli.MultiprojectCLITest) ... [ros,gitrepo,hgrepo] still active -Using initial elements from: /tmp/tmpEICuYp/simple.rosinstall -Writing /tmp/tmpEICuYp/ws35/.rosinstall -Cloning into '/tmp/tmpEICuYp/ws35/ros'... -Cloning into '/tmp/tmpEICuYp/ws35/gitrepo'... -done. -done. -[ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/ws35/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmpEICuYp/gitrepo (version None) to /tmp/tmpEICuYp/ws35/gitrepo -[gitrepo] Done. -[ros,gitrepo] still active - -update complete. - Performing actions: - - Add new elements: - hgrepo hg /tmp/tmpEICuYp/hgrepo - -Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmpEICuYp/ws35/.rosinstall - -update complete. -[gitrepo] Updating /tmp/tmpEICuYp/ws35/gitrepo -[gitrepo] Done. -[ros] Updating /tmp/tmpEICuYp/ws35/ros -[ros] Done. -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -[hgrepo] Fetching /tmp/tmpEICuYp/hgrepo (version None) to /tmp/tmpEICuYp/ws35/hgrepo -[hgrepo] Done. -ok -test_scrape (test.local.test_cli.MultiprojectCLITest) ... [ros,gitrepo,hgrepo] still active -Using initial elements from: /tmp/tmpEICuYp/simple.rosinstall -Writing /tmp/tmpEICuYp/ws37/.rosinstall -Cloning into '/tmp/tmpEICuYp/ws37/gitrepo'... -Cloning into '/tmp/tmpEICuYp/ws37/ros'... -done. -done. -[ros] Fetching /tmp/tmpEICuYp/ros (version None) to /tmp/tmpEICuYp/ws37/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmpEICuYp/gitrepo (version None) to /tmp/tmpEICuYp/ws37/gitrepo -[gitrepo] Done. -[ros,gitrepo] still active - -update complete. -Reinitialized existing Git repository in /tmp/tmpEICuYp/ws37/gitrepo/.git/ -adding foo.txt -WARNING [vcstools] Command failed: 'hg paths default' - run at: '/tmp/tmpEICuYp/ws37/hgrepo' - errcode: 1: -not found! -[/vcstools] -ok -test_mock_vcs_element (test.local.test_config.ConfigMock_Test) ... ok -test_absolute_localname (test.local.test_config.ConfigSimple_Test) ... ok -test_config_merging_keep (test.local.test_config.ConfigSimple_Test) ... ok -test_config_merging_kill_append (test.local.test_config.ConfigSimple_Test) ... ok -test_config_merging_replace (test.local.test_config.ConfigSimple_Test) ... ok -test_config_realfolders (test.local.test_config.ConfigSimple_Test) ... ok -test_config_simple1 (test.local.test_config.ConfigSimple_Test) ... ok -test_config_simple1_with_setupfile (test.local.test_config.ConfigSimple_Test) ... ok -test_config_simple2 (test.local.test_config.ConfigSimple_Test) ... ok -test_config_simple3 (test.local.test_config.ConfigSimple_Test) ... ok -test_double_entry (test.local.test_config.ConfigSimple_Test) -Should source be rewritten without duplicates ... ok -test_double_localname (test.local.test_config.ConfigSimple_Test) -Entries have same local name ... ok -test_equivalent_entry (test.local.test_config.ConfigSimple_Test) -Should source be rewritten without duplicates ... ok -test_equivalent_localname (test.local.test_config.ConfigSimple_Test) -Entries have equivalent local name ... ok -test_init (test.local.test_config.ConfigSimple_Test) ... ok -test_init_fail (test.local.test_config.ConfigSimple_Test) ... ok -test_long_localname (test.local.test_config.ConfigSimple_Test) -Should source choose shorter local-name ... ok -test_remove (test.local.test_config.ConfigSimple_Test) ... ok -test_unnormalized_localname (test.local.test_config.ConfigSimple_Test) -Should source normalize local-name ... ok -Initialized empty Git repository in /tmp/tmpQY14xT/ros/.git/ -[master (root-commit) db74453] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Created a standalone tree (format: 2a) -adding fixed.txt -adding modified.txt -adding modified-fs.txt -adding deleted.txt -adding deleted-fs.txt -Committing to: /tmp/tmpQY14xT/remote/ -added deleted-fs.txt -added deleted.txt -added fixed.txt -added modified-fs.txt -added modified.txt -Committed revision 1. - Performing actions: - - Add new elements: - hgrepo hg /tmp/tmpEICuYp/ws37 - -Overwriting /tmp/tmpEICuYp/ws37/.rosinstall -Config changed, remember to run 'multi_cli update hgrepo' to update the folder from hg -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Keep existing entry foo, discard later one -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo by appending. -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry foo -Replace existing entry ./foo/bar/.. -deleted deleted.txt -adding added.txt -test_wstool_diff_bzr_inside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test diff output for bzr when run inside workspace ... [clone] Fetching /tmp/tmpQY14xT/remote (version None) to /tmp/tmpQY14xT/ws/clone -[clone] Done. -ok -test_wstool_diff_bzr_outside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test diff output for bzr when run outside workspace ... === added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:03:01 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:03:00 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:03:01 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:03:00 +0000 -+++ clone/modified.txt 2021-09-01 11:03:01 +0000 -@@ -0,0 +1,1 @@ -+foo -ok -test_wstool_info_bzr (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) ... ok -test_wstool_status_bzr_inside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test status output for bzr when run inside workspace ... === added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:03:01 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:03:00 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:03:01 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:03:00 +0000 -+++ clone/modified.txt 2021-09-01 11:03:01 +0000 -@@ -0,0 +1,1 @@ -+foo -ok -test_wstool_status_bzr_outside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test status output for bzr when run outside workspace ... +N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -ok -test_wstool_status_bzr_untracked (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test status output for bzr when run outside workspace ... +N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -ok -Initialized empty Git repository in /tmp/tmpNoNKzA/ros/.git/ -[master (root-commit) 637c7fa] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_bzr.WstoolInfoBzrTest) ... Created a standalone tree (format: 2a) -adding test.txt -Committing to: /tmp/tmpNoNKzA/remote/ -added test.txt -Committed revision 1. -Created tag footag. -adding test2.txt -Committing to: /tmp/tmpNoNKzA/remote/ -added test2.txt -Committed revision 2. -ok -Initialized empty Git repository in /tmp/tmpX7PeP3/ros/.git/ -[master (root-commit) 6443889] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpX7PeP3/remote/.git/ -[master (root-commit) 23f5a93] modified - Author: Your Name - 5 files changed, 0 insertions(+), 0 deletions(-) - create mode 100644 deleted-fs.txt - create mode 100644 deleted.txt - create mode 100644 fixed.txt - create mode 100644 modified-fs.txt - create mode 100644 modified.txt -Cloning into '/tmp/tmpX7PeP3/ws/clone'... -done. -rm 'deleted.txt' -test_Wstool_status_git_outside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test status output for git when run outside workspace ... ? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -ok -test_Wstool_status_git_untracked (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test untracked status output for git when run outside workspace ... A clone/added.txt - D clone/deleted-fs.txt -D clone/deleted.txt - M clone/modified-fs.txt -M clone/modified.txt -ok -test_wstool_diff_git_inside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test diff output for git when run inside workspace ... A clone/added.txt - D clone/deleted-fs.txt -D clone/deleted.txt - M clone/modified-fs.txt -M clone/modified.txt -?? clone/added-fs.txt -ok -test_wstool_diff_git_outside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test diff output for git when run outside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -ok -test_wstool_info_git (test.local.test_diff_functions_git.WstoolDiffGitTest) ... ok -test_wstool_status_git_inside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test status output for git when run inside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -ok -Initialized empty Git repository in /tmp/tmp8olWCQ/ros/.git/ -[master (root-commit) 4d99b9c] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -test_wstool_detailed_localpath_info (test.local.test_diff_functions_git.WstoolInfoGitTest) ... Initialized empty Git repository in /tmp/tmp8olWCQ/remote/.git/ -[master (root-commit) 04afeaa] modified - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 test.txt -[master 94cac1b] modified - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 test2.txt -Cloning into '/tmp/tmp8olWCQ/ws/clone'... -done. -HEAD is now at 04afeaa modified -HEAD is now at 94cac1b modified -Switched to a new branch 'test_branch' -D test2.txt -From ../../remote - * [new branch] master -> remote2/master -Switched to branch 'master' -D test2.txt -Your branch is up to date with 'origin/master'. -ok -Initialized empty Git repository in /tmp/tmpZ6Lfyb/ros/.git/ -[master (root-commit) 8c8adce] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpZ6Lfyb/gitrepo/.git/ -[master (root-commit) 97a6737] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -test_twice_with_relpath (test.local.test_interation.RosinstallInteractive) -runs wstool with generated self.simple_rosinstall to create local wstool env ... Cloning into '/tmp/tmph8HdxO/ros'... -done. -Cloning into '/tmp/tmph8HdxO/gitrepo'... -done. -ok -test_rewrite_included_source (test.local.test_config_yaml.ConfigElementYamlFunctions_Test) ... ok -test_rewrite_included_source_setupfile (test.local.test_config_yaml.ConfigElementYamlFunctions_Test) ... ok -test_original_syntax_invalids (test.local.test_config_yaml.ConfigElementYamlWrapper_Test) ... ok -test_original_syntax_scm (test.local.test_config_yaml.ConfigElementYamlWrapper_Test) ... ok -test_original_syntax_setupfile (test.local.test_config_yaml.ConfigElementYamlWrapper_Test) ... ok -test_generate (test.local.test_config_yaml.ConfigFile_Test) ... ok -test_generate_sorted_with_localname (test.local.test_config_yaml.ConfigFile_Test) ... ok -test_generate_with_other (test.local.test_config_yaml.ConfigFile_Test) ... ok -test_generate_with_pretty_format (test.local.test_config_yaml.ConfigFile_Test) ... ok -test_generate_with_stack (test.local.test_config_yaml.ConfigFile_Test) ... ok -test_aggregate_from_uris (test.local.test_config_yaml.UriAggregationTest) ... ok -test_get_yaml_from_uri_from_file (test.local.test_config_yaml.YamlIO_Test) ... ok -test_get_yaml_from_uri_from_invalid_url (test.local.test_config_yaml.YamlIO_Test) ... ok -test_get_yaml_from_uri_from_missing_file (test.local.test_config_yaml.YamlIO_Test) ... ok -test_get_ros_package_path (test.local.test_rosinstall_standalone_functions.FunctionsTest) ... ok -Initialized empty Git repository in /tmp/tmpIh72PD/ros/.git/ -[master (root-commit) aec2b14] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -updating to branch default -5 files updated, 0 files merged, 0 files removed, 0 files unresolved -test_wstool_diff_hg_inside (test.local.test_diff_functions_hg.WstoolDiffHgTest) -Test diff output for hg when run inside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -ok -test_wstool_diff_hg_outside (test.local.test_diff_functions_hg.WstoolDiffHgTest) -Test diff output for hg when run outside workspace ... M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -ok -test_wstool_info_hg (test.local.test_diff_functions_hg.WstoolDiffHgTest) ... ok -test_wstool_status_hg_inside (test.local.test_diff_functions_hg.WstoolDiffHgTest) -Test status output for hg when run inside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo -ok -test_wstool_status_hg_outside (test.local.test_diff_functions_hg.WstoolDiffHgTest) -Test status output for hg when run outside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo -ok -test_wstool_status_hg_untracked (test.local.test_diff_functions_hg.WstoolDiffHgTest) -Test untracked status output for hg when run outside workspace ... M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -ok -Initialized empty Git repository in /tmp/tmpGkBhbp/ros/.git/ -[master (root-commit) 32548a6] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_hg.WstoolInfoHgTest) ... updating to branch default -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -ok -Initialized empty Git repository in /tmp/tmpxrLHB3/ros/.git/ -[master (root-commit) 890198c] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpxrLHB3/gitrepo/.git/ -[master (root-commit) 1362118] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -Initialized empty Git repository in /tmp/tmpxrLHB3/gitrepo2/.git/ -[master (root-commit) 1362118] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -test_Rosinstall_help (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok -test_rosinstall_abort_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmpQr1xIj/ros'... -done. -Cloning into '/tmp/tmpQr1xIj/gitrepo'... -done. -ok -test_rosinstall_backup_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmpPhHNXq/ros'... -done. -Cloning into '/tmp/tmpPhHNXq/gitrepo'... -done. -Cloning into '/tmp/tmpPhHNXq/gitrepo'... -done. -ok -test_rosinstall_change_vcs_type (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmp4_j8eF/ros'... -done. -Cloning into '/tmp/tmp4_j8eF/gitrepo'... -done. -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -ok -test_rosinstall_delete_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmpRjp7wK/ros'... -done. -Cloning into '/tmp/tmpRjp7wK/gitrepo'... -done. -Cloning into '/tmp/tmpRjp7wK/gitrepo'... -done. -ok -test_rosinstall_invalid_continue (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok -test_rosinstall_invalid_fail (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok -Initialized empty Git repository in /tmp/tmp11fcNf/ros/.git/ -[master (root-commit) b8784a0] initial +Initialized empty Git repository in /tmp/tmpCCmmgR/ros/.git/ +[master (root-commit) 98199d0] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake @@ -1744,146 +933,8 @@ Transmitting file data .....done Committing transaction... Committed revision 1. -A ws/clone/deleted-fs.txt -A ws/clone/deleted.txt -A ws/clone/fixed.txt -A ws/clone/modified-fs.txt -A ws/clone/modified.txt -Checked out revision 1. -D deleted.txt -A added.txt -test_wstool_diff_svn_inside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test diff output for svn when run inside workspace ... M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -ok -test_wstool_diff_svn_outside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test diff output for svn when run outside workspace ... A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_wstool_info_svn (test.local.test_diff_functions_svn.WstoolDiffSvnTest) ... ok -test_wstool_status_svn_inside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test status output for svn when run inside workspace ... Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -ok -test_wstool_status_svn_outside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test status output for svn when run outside workspace ... Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -ok -test_wstool_status_svn_untracked (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test status output for svn when run outside workspace ... A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -Initialized empty Git repository in /tmp/tmpETjTim/ros/.git/ -[master (root-commit) 1588ee7] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_svn.WstoolInfoSvnTest) ... Checked out revision 0. -A test.txt -Adding test.txt -Transmitting file data .done -Committing transaction... -Committed revision 1. -A test2.txt -Adding test2.txt -Transmitting file data .done -Committing transaction... -Committed revision 2. -A clone/test.txt -A clone/test2.txt -Checked out revision 2. -A test3.txt -ok -test_mock_install (test.local.test_config_elt.ConfigElements_Test) ... ok -test_mock_vcs_config_element_init (test.local.test_config_elt.ConfigElements_Test) ... Warning: version 'some.version' not found for 'some/local/name' -Warning: version 'some.version' not found for 'some/local/name' -Warning: version 'some.version' not found for 'some/local/name' -ok -test_simple_config_element_API (test.local.test_config_elt.ConfigElements_Test) ... ok -Initialized empty Git repository in /tmp/tmpHWhTO0/ros/.git/ -[master (root-commit) e5e1226] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpHWhTO0/remote/.git/ -[master (root-commit) fa4691c] first commit - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 1.txt -[master f1498f8] second commit - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 2.txt -[master 8d0a329] third commit - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 3.txt -Cloning into '/tmp/tmpHWhTO0/ws-without-shallow/clone'... -Cloning into '/tmp/tmpHWhTO0/ws-with-shallow/clone'... -test_compare_workspace (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) -Compare worktrees with/without shallow option ... ok -test_history_with_shallow (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) -Test history of cloned repo with shallow option ... ok -test_history_without_shallow (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) -Test history of cloned repo without shallow option ... ok -Initialized empty Git repository in /tmp/tmpYGM72w/ros/.git/ -[master (root-commit) e5e1226] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Checked out revision 0. -A fixed.txt -A modified.txt -A modified-fs.txt -A deleted.txt -A deleted-fs.txt -Adding deleted-fs.txt -Adding deleted.txt -Adding fixed.txt -Adding modified-fs.txt -Adding modified.txt -Transmitting file data .....done -Committing transaction... -Committed revision 1. -Initialized empty Git repository in /tmp/tmpYGM72w/remote_git/.git/ -[master (root-commit) a4fd96a] modified +Initialized empty Git repository in /tmp/tmpCCmmgR/remote_git/.git/ +[master (root-commit) 2f8094c] modified Author: Your Name 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt @@ -1891,20 +942,20 @@ create mode 100644 fixed.txt create mode 100644 modified-fs.txt create mode 100644 modified.txt -Created a standalone tree (format: 2a) +Ein standalone tree wurde erstellt (Format: 2a) adding fixed.txt adding modified.txt adding modified-fs.txt adding deleted.txt adding deleted-fs.txt -Committing to: /tmp/tmpYGM72w/remote_bzr/ -added deleted-fs.txt -added deleted.txt -added fixed.txt -added modified-fs.txt -added modified.txt +Committing to: /tmp/tmpCCmmgR/remote_bzr/ +Hinzugef?gt deleted-fs.txt +Hinzugef?gt deleted.txt +Hinzugef?gt fixed.txt +Hinzugef?gt modified-fs.txt +Hinzugef?gt modified.txt Committed revision 1. -Cloning into '/tmp/tmpYGM72w/ws/clone_git'... +Cloning into '/tmp/tmpCCmmgR/ws/clone_git'... done. A ws/clone_svn/deleted-fs.txt A ws/clone_svn/deleted.txt @@ -1912,9 +963,9 @@ A ws/clone_svn/modified-fs.txt A ws/clone_svn/modified.txt Checked out revision 1. -updating to branch default -5 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into '/tmp/tmpYGM72w/ws/clone_git2'... +Aktualisiere auf Zweig default +5 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st +Cloning into '/tmp/tmpCCmmgR/ws/clone_git2'... done. rm 'deleted.txt' rm 'deleted.txt' @@ -1927,11 +978,16 @@ test_multi_diff_rosinstall_outside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) Test wstool diff output from outside workspace. ... ok test_multi_diff_wstool_inside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool diff output from inside workspace. ... ? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt +Test wstool diff output from inside workspace. ... [clone_git] Fetching /tmp/tmpCCmmgR/remote_git (version None) to /tmp/tmpCCmmgR/ws/clone_git +[clone_git] Done. +[clone_svn] Fetching file://localhost/tmp/tmpCCmmgR/remote_svn (version None) to /tmp/tmpCCmmgR/ws/clone_svn +[clone_svn] Done. +[clone_hg] Fetching /tmp/tmpCCmmgR/remote_hg (version None) to /tmp/tmpCCmmgR/ws/clone_hg +[clone_hg] Done. +[clone_bzr] Fetching /tmp/tmpCCmmgR/remote_bzr (version None) to /tmp/tmpCCmmgR/ws/clone_bzr +[clone_bzr] Done. +[clone_git2] Fetching /tmp/tmpCCmmgR/remote_git (version None) to /tmp/tmpCCmmgR/ws/clone_git2 +[clone_git2] Done. ok test_multi_diff_wstool_outside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) Test wstool diff output from outside workspace. ... diff --git clone_git/added.txt clone_git/added.txt @@ -1991,21 +1047,21 @@ +foo === added file 'added.txt' --- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:03:45 +0000 ++++ clone_bzr/added.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +flam === removed file 'deleted-fs.txt' === removed file 'deleted.txt' === modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:03:43 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:03:45 +0000 +--- clone_bzr/modified-fs.txt 2022-10-04 17:28:38 +0000 ++++ clone_bzr/modified-fs.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +foo === modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:03:43 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:03:45 +0000 +--- clone_bzr/modified.txt 2022-10-04 17:28:38 +0000 ++++ clone_bzr/modified.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +foo diff --git clone_git2/added.txt clone_git2/added.txt @@ -2096,21 +1152,21 @@ +foo === added file 'added.txt' --- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:03:45 +0000 ++++ clone_bzr/added.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +flam === removed file 'deleted-fs.txt' === removed file 'deleted.txt' === modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:03:43 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:03:45 +0000 +--- clone_bzr/modified-fs.txt 2022-10-04 17:28:38 +0000 ++++ clone_bzr/modified-fs.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +foo === modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:03:43 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:03:45 +0000 +--- clone_bzr/modified.txt 2022-10-04 17:28:38 +0000 ++++ clone_bzr/modified.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +foo diff --git clone_git2/added.txt clone_git2/added.txt @@ -2228,21 +1284,21 @@ +foo === added file 'added.txt' --- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:03:45 +0000 ++++ clone_bzr/added.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +flam === removed file 'deleted-fs.txt' === removed file 'deleted.txt' === modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:03:43 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:03:45 +0000 +--- clone_bzr/modified-fs.txt 2022-10-04 17:28:38 +0000 ++++ clone_bzr/modified-fs.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +foo === modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:03:43 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:03:45 +0000 +--- clone_bzr/modified.txt 2022-10-04 17:28:38 +0000 ++++ clone_bzr/modified.txt 2022-10-04 17:28:39 +0000 @@ -0,0 +1,1 @@ +foo diff --git clone_git2/added.txt clone_git2/added.txt @@ -2271,12 +1327,9 @@ @@ -0,0 +1 @@ +foo ok - ----------------------------------------------------------------------- -Ran 124 tests in 62.605s - -OK -A clone_git/added.txt +test_get_mode (test.local.test_cli.FunctionsTest) ... ok +test_list_usage (test.local.test_cli.FunctionsTest) ... ok +test_diff (test.local.test_cli.GetStatusDiffInfoCmdTest) ... A clone_git/added.txt D clone_git/deleted-fs.txt D clone_git/deleted.txt M clone_git/modified-fs.txt @@ -2300,10 +1353,7 @@ D clone_git2/deleted.txt M clone_git2/modified-fs.txt M clone_git2/modified.txt -I: pybuild base:217: cd /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build; python3.7 -m unittest discover -v -test_get_mode (test.local.test_cli.FunctionsTest) ... ok -test_list_usage (test.local.test_cli.FunctionsTest) ... ok -test_diff (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok +ok test_get_status (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok test_info (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok test_info_list (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok @@ -2311,43 +1361,31 @@ ok test_info_table (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok test_status (test.local.test_cli.GetStatusDiffInfoCmdTest) ... ok -test_unmanaged (test.local.test_cli.GetStatusDiffInfoCmdTest) ... /usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) -WARNING [vcstools] Command failed: 'svn info /tmp/tmpxcw04i3q/ws/svnrepo' +test_unmanaged (test.local.test_cli.GetStatusDiffInfoCmdTest) ... WARNING [vcstools] Command failed: 'svn info /tmp/tmpaKR_9x/ws/svnrepo' errcode: 1: -svn: E155007: '/tmp/tmpxcw04i3q/ws/svnrepo' is not a working copy +svn: E155007: '/tmp/tmpaKR_9x/ws/svnrepo' is not a working copy +[/vcstools] +WARNING [vcstools] Command failed: 'bzr info /tmp/tmpaKR_9x/ws/bzrrepo' + errcode: 3: +bzr: ERROR: Kein Zweig: »/tmp/tmpaKR_9x/ws/bzrrepo/«. [/vcstools] -/usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) WARNING [vcstools] Command failed: 'hg paths default' - run at: '/tmp/tmpxcw04i3q/ws/sub/hgrepo' + run at: '/tmp/tmpaKR_9x/ws/sub/hgrepo' errcode: 1: -not found! -[/vcstools] -/usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) -WARNING [vcstools] Command failed: 'bzr info /tmp/tmpxcw04i3q/ws/bzrrepo' - errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpxcw04i3q/ws/bzrrepo/". +nicht gefunden! [/vcstools] -/usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) -WARNING [vcstools] Command failed: 'svn info /tmp/tmpxcw04i3q/ws/svnrepo' +WARNING [vcstools] Command failed: 'svn info /tmp/tmpaKR_9x/ws/svnrepo' errcode: 1: -svn: E155007: '/tmp/tmpxcw04i3q/ws/svnrepo' is not a working copy +svn: E155007: '/tmp/tmpaKR_9x/ws/svnrepo' is not a working copy [/vcstools] -/usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) -WARNING [vcstools] Command failed: 'bzr info /tmp/tmpxcw04i3q/ws/bzrrepo' +WARNING [vcstools] Command failed: 'bzr info /tmp/tmpaKR_9x/ws/bzrrepo' errcode: 3: -bzr: ERROR: Not a branch: "/tmp/tmpxcw04i3q/ws/bzrrepo/". +bzr: ERROR: Kein Zweig: »/tmp/tmpaKR_9x/ws/bzrrepo/«. [/vcstools] -/usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) WARNING [vcstools] Command failed: 'hg paths default' - run at: '/tmp/tmpxcw04i3q/ws/sub/hgrepo' + run at: '/tmp/tmpaKR_9x/ws/sub/hgrepo' errcode: 1: -not found! +nicht gefunden! [/vcstools] ok test_version (test.local.test_cli.GetVersionTest) ... ok @@ -2359,107 +1397,95 @@ ok test_mock_install_fail (test.local.test_cli.InstallTest) ... Exception caught during install: Error processing 'foos' : Unittest Mock says install failed -Initialized empty Git repository in /tmp/tmph474bxyu/ros/.git/ -[master (root-commit) cf51fa4] initial +ok +Initialized empty Git repository in /tmp/tmpLgMM59/ros/.git/ +[master (root-commit) 7797b49] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake create mode 100755 bin/rospack create mode 100644 setup.sh create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmph474bxyu/gitrepo/.git/ -[master (root-commit) c85ff05] initial +Initialized empty Git repository in /tmp/tmpLgMM59/gitrepo/.git/ +[master (root-commit) c6da9de] initial Author: Your Name 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gitfixed.txt -ok test_cmd_add_uris (test.local.test_cli.MultiprojectCLITest) ... Exception caught during install: Error processing 'foos' : Unittest Mock says install failed -Using initial elements from: /tmp/tmph474bxyu/simple_rel3.rosinstall -Writing /tmp/tmph474bxyu/ws33/.rosinstall -Cloning into '/tmp/tmph474bxyu/ws33/ros'... +Using initial elements from: /tmp/tmpLgMM59/simple_rel3.rosinstall +Writing /tmp/tmpLgMM59/ws33/.rosinstall +Cloning into '/tmp/tmpLgMM59/ws33/ros'... done. ok -test_cmd_foreach (test.local.test_cli.MultiprojectCLITest) ... [ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/ws33/ros +test_cmd_foreach (test.local.test_cli.MultiprojectCLITest) ... [ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/ws33/ros [ros] Done. update complete. -!!!!! Warning: Not recursing into other config folder /tmp/tmph474bxyu/ws33 containing file .rosinstall -Using initial elements from: /tmp/tmph474bxyu/simple.rosinstall -Writing /tmp/tmph474bxyu/foreach/.rosinstall -Cloning into '/tmp/tmph474bxyu/foreach/ros'... +!!!!! Warning: Not recursing into other config folder /tmp/tmpLgMM59/ws33 containing file .rosinstall +Using initial elements from: /tmp/tmpLgMM59/simple.rosinstall +Writing /tmp/tmpLgMM59/foreach/.rosinstall +Cloning into '/tmp/tmpLgMM59/foreach/ros'... done. -Cloning into '/tmp/tmph474bxyu/foreach/gitrepo'... +Cloning into '/tmp/tmpLgMM59/foreach/gitrepo'... done. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/foreach/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/foreach/gitrepo -[gitrepo] Done. - -update complete. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/foreach/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/foreach/gitrepo -[gitrepo] Done. - -update complete. ok -test_cmd_info (test.local.test_cli.MultiprojectCLITest) ... [ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/foreach/ros +test_cmd_info (test.local.test_cli.MultiprojectCLITest) ... [ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/foreach/ros [ros] Done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/foreach/gitrepo +[gitrepo] Fetching /tmp/tmpLgMM59/gitrepo (version None) to /tmp/tmpLgMM59/foreach/gitrepo [gitrepo] Done. update complete. -workspace: /tmp/tmph474bxyu/ws_test_cmd_info -/tmp/tmph474bxyu/ws_test_cmd_info +workspace: /tmp/tmpLgMM59/ws_test_cmd_info +/tmp/tmpLgMM59/ws_test_cmd_info [] -workspace: /tmp/tmph474bxyu/ws_test_cmd_info -Using initial elements from: /tmp/tmph474bxyu/simple.rosinstall -Writing /tmp/tmph474bxyu/ws_test_cmd_info/.rosinstall -Cloning into '/tmp/tmph474bxyu/ws_test_cmd_info/ros'... -Cloning into '/tmp/tmph474bxyu/ws_test_cmd_info/gitrepo'... +workspace: /tmp/tmpLgMM59/ws_test_cmd_info +Using initial elements from: /tmp/tmpLgMM59/simple.rosinstall +Writing /tmp/tmpLgMM59/ws_test_cmd_info/.rosinstall +Cloning into '/tmp/tmpLgMM59/ws_test_cmd_info/ros'... +Cloning into '/tmp/tmpLgMM59/ws_test_cmd_info/gitrepo'... done. done. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/ws_test_cmd_info/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/ws_test_cmd_info/gitrepo +[gitrepo] Fetching /tmp/tmpLgMM59/gitrepo (version None) to /tmp/tmpLgMM59/ws_test_cmd_info/gitrepo [gitrepo] Done. +[ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/ws_test_cmd_info/ros +[ros] Done. [ros,gitrepo] still active update complete. Performing actions: Add new elements: - hgrepo hg /tmp/tmph474bxyu/hgrepo + hgrepo hg /tmp/tmpLgMM59/hgrepo Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmph474bxyu/ws_test_cmd_info/.rosinstall +Overwriting /tmp/tmpLgMM59/ws_test_cmd_info/.rosinstall update complete. -workspace: /tmp/tmph474bxyu/ws_test_cmd_info +workspace: /tmp/tmpLgMM59/ws_test_cmd_info Localname S SCM Version (Spec) UID (Spec) URI (Spec) [http(s)://...] --------- - --- -------------- ----------- --------------------------- - hgrepo x hg (-) /tmp/tmph474bxyu/hgrepo - gitrepo git master (-) c85ff0542098 /tmp/tmph474bxyu/gitrepo - ros git master (-) cf51fa49e384 /tmp/tmph474bxyu/ros + hgrepo x hg (-) /tmp/tmpLgMM59/hgrepo + gitrepo git master (-) c6da9de76feb /tmp/tmpLgMM59/gitrepo + ros git master (-) 7797b49cb83d /tmp/tmpLgMM59/ros Localname: gitrepo -Path /tmp/tmph474bxyu/ws_test_cmd_info/gitrepo +Path /tmp/tmpLgMM59/ws_test_cmd_info/gitrepo Status: SCM: git -URI: /tmp/tmph474bxyu/gitrepo -Current URI: /tmp/tmph474bxyu/gitrepo +URI: /tmp/tmpLgMM59/gitrepo +Current URI: /tmp/tmpLgMM59/gitrepo Spec-Version: Current-Version: master Spec-Revision: -Current-Revision: c85ff0542098e4305b04968ee3c79dc0c64a5c19 +Current-Revision: c6da9de76feb2fe70213acb25ab94247ace0affb Other Properties: [] Localname: hgrepo -Path /tmp/tmph474bxyu/ws_test_cmd_info/hgrepo +Path /tmp/tmpLgMM59/ws_test_cmd_info/hgrepo Status: x SCM: hg -URI: /tmp/tmph474bxyu/hgrepo +URI: /tmp/tmpLgMM59/hgrepo Current URI: Spec-Version: Current-Version: @@ -2467,31 +1493,31 @@ Current-Revision: Other Properties: [] -workspace: /tmp/tmph474bxyu/ws_test_cmd_info +workspace: /tmp/tmpLgMM59/ws_test_cmd_info Localname S SCM Version (Spec) UID (Spec) URI (Spec) [http(s)://...] --------- - --- -------------- ----------- --------------------------- - hgrepo x hg (-) /tmp/tmph474bxyu/hgrepo - gitrepo git master (=) c85ff0542098 /tmp/tmph474bxyu/gitrepo - ros git master (=) cf51fa49e384 /tmp/tmph474bxyu/ros + hgrepo x hg (-) /tmp/tmpLgMM59/hgrepo + gitrepo git master (=) c6da9de76feb /tmp/tmpLgMM59/gitrepo + ros git master (=) 7797b49cb83d /tmp/tmpLgMM59/ros Localname: gitrepo -Path /tmp/tmph474bxyu/ws_test_cmd_info/gitrepo +Path /tmp/tmpLgMM59/ws_test_cmd_info/gitrepo Status: C SCM: git -URI: /tmp/tmph474bxyu/gitrepo -Current URI: /tmp/tmph474bxyu/gitrepo +URI: /tmp/tmpLgMM59/gitrepo +Current URI: /tmp/tmpLgMM59/gitrepo Spec-Version: Current-Version: master Spec-Revision: -Current-Revision: c85ff0542098e4305b04968ee3c79dc0c64a5c19 +Current-Revision: c6da9de76feb2fe70213acb25ab94247ace0affb Other Properties: [] ok test_cmd_init (test.local.test_cli.MultiprojectCLITest) ... Localname: hgrepo -Path /tmp/tmph474bxyu/ws_test_cmd_info/hgrepo +Path /tmp/tmpLgMM59/ws_test_cmd_info/hgrepo Status: x SCM: hg -URI: /tmp/tmph474bxyu/hgrepo +URI: /tmp/tmpLgMM59/hgrepo Current URI: Spec-Version: Current-Version: @@ -2499,44 +1525,44 @@ Current-Revision: Other Properties: [] -Writing /tmp/tmph474bxyu/ws30/.rosinstall +Writing /tmp/tmpLgMM59/ws30/.rosinstall ok test_cmd_remove (test.local.test_cli.MultiprojectCLITest) ... update complete. -Writing /tmp/tmph474bxyu/ws32/.rosinstall +Writing /tmp/tmpLgMM59/ws32/.rosinstall ok test_cmd_set (test.local.test_cli.MultiprojectCLITest) ... update complete. Performing actions: Add new elements: - /tmp/tmph474bxyu/gitrepo + /tmp/tmpLgMM59/gitrepo Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmph474bxyu/ws32/.rosinstall +Overwriting /tmp/tmpLgMM59/ws32/.rosinstall update complete. Performing actions: Add new elements: - /tmp/tmph474bxyu/hgrepo + /tmp/tmpLgMM59/hgrepo Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmph474bxyu/ws32/.rosinstall +Overwriting /tmp/tmpLgMM59/ws32/.rosinstall update complete. -Overwriting /tmp/tmph474bxyu/ws32/.rosinstall -Removed entries ['/tmp/tmph474bxyu/gitrepo'] -Using initial elements from: /tmp/tmph474bxyu/simple.rosinstall -Writing /tmp/tmph474bxyu/ws31b/.rosinstall -Cloning into '/tmp/tmph474bxyu/ws31b/ros'... -Cloning into '/tmp/tmph474bxyu/ws31b/gitrepo'... +Overwriting /tmp/tmpLgMM59/ws32/.rosinstall +Removed entries [u'/tmp/tmpLgMM59/gitrepo'] +Using initial elements from: /tmp/tmpLgMM59/simple.rosinstall +Writing /tmp/tmpLgMM59/ws31b/.rosinstall +Cloning into '/tmp/tmpLgMM59/ws31b/ros'... +Cloning into '/tmp/tmpLgMM59/ws31b/gitrepo'... done. done. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/ws31b/ros -[ros] Done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/ws31b/gitrepo +[gitrepo] Fetching /tmp/tmpLgMM59/gitrepo (version None) to /tmp/tmpLgMM59/ws31b/gitrepo [gitrepo] Done. +[ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/ws31b/ros +[ros] Done. [ros,gitrepo] still active update complete. @@ -2545,43 +1571,43 @@ Add new elements: hgrepo hg http://some_uri -Overwriting /tmp/tmph474bxyu/ws31b/.rosinstall +Overwriting /tmp/tmpLgMM59/ws31b/.rosinstall Config changed, remember to run 'multi_cli update hgrepo' to update the folder from hg Performing actions: Change details of element (Use --merge-keep or --merge-replace to change): - hgrepo specified uri: http://some_uri -> /tmp/tmph474bxyu/hgrepo; + hgrepo specified uri: http://some_uri -> /tmp/tmpLgMM59/hgrepo; -Overwriting /tmp/tmph474bxyu/ws31b/.rosinstall -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Overwriting /tmp/tmpLgMM59/ws31b/.rosinstall +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st Usage: multi_cli set [localname] [[SCM-URI] --(svn|hg|git|bzr) [--version=VERSION]?]? -python3.7 -m unittest: error: no such option: --detached +python -m unittest: error: no such option: --detached ok test_export (test.local.test_cli.MultiprojectCLITest) ... Warning, discarding non-vcs element othername Warning: version 'version' not found for 'gitname' ok test_get_element_diff (test.local.test_cli.MultiprojectCLITest) ... ok -test_init_parallel (test.local.test_cli.MultiprojectCLITest) ... [hgrepo] Fetching /tmp/tmph474bxyu/hgrepo (version None) to /tmp/tmph474bxyu/ws31b/hgrepo +test_init_parallel (test.local.test_cli.MultiprojectCLITest) ... [hgrepo] Fetching /tmp/tmpLgMM59/hgrepo (version None) to /tmp/tmpLgMM59/ws31b/hgrepo [hgrepo] Done. update complete. Performing actions: Change details of element (Use --merge-keep or --merge-replace to change): - hgrepo scmtype: hg -> ; specified uri: /tmp/tmph474bxyu/hgrepo -> ; + hgrepo scmtype: hg -> ; specified uri: /tmp/tmpLgMM59/hgrepo -> ; -Overwriting /tmp/tmph474bxyu/ws31b/.rosinstall -Using initial elements from: /tmp/tmph474bxyu/simple.rosinstall -Writing /tmp/tmph474bxyu/ws31/.rosinstall -Cloning into '/tmp/tmph474bxyu/ws31/ros'... -Cloning into '/tmp/tmph474bxyu/ws31/gitrepo'... +Overwriting /tmp/tmpLgMM59/ws31b/.rosinstall +Using initial elements from: /tmp/tmpLgMM59/simple.rosinstall +Writing /tmp/tmpLgMM59/ws31/.rosinstall +Cloning into '/tmp/tmpLgMM59/ws31/gitrepo'... +Cloning into '/tmp/tmpLgMM59/ws31/ros'... done. done. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/ws31/ros +[ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/ws31/ros [ros] Done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/ws31/gitrepo +[gitrepo] Fetching /tmp/tmpLgMM59/gitrepo (version None) to /tmp/tmpLgMM59/ws31/gitrepo [gitrepo] Done. [ros,gitrepo] still active @@ -2589,31 +1615,31 @@ Performing actions: Add new elements: - hgrepo hg /tmp/tmph474bxyu/hgrepo + hgrepo hg /tmp/tmpLgMM59/hgrepo Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmph474bxyu/ws31/.rosinstall +Overwriting /tmp/tmpLgMM59/ws31/.rosinstall update complete. -[gitrepo] Updating /tmp/tmph474bxyu/ws31/gitrepo -[gitrepo] Done. -[ros] Updating /tmp/tmph474bxyu/ws31/ros +[ros] Updating /tmp/tmpLgMM59/ws31/ros [ros] Done. -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -[hgrepo] Fetching /tmp/tmph474bxyu/hgrepo (version None) to /tmp/tmph474bxyu/ws31/hgrepo +[gitrepo] Updating /tmp/tmpLgMM59/ws31/gitrepo +[gitrepo] Done. +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st +[hgrepo] Fetching /tmp/tmpLgMM59/hgrepo (version None) to /tmp/tmpLgMM59/ws31/hgrepo [hgrepo] Done. ok test_merge_dash (test.local.test_cli.MultiprojectCLITest) ... [ros,gitrepo,hgrepo] still active -Using initial elements from: /tmp/tmph474bxyu/simple.rosinstall -Writing /tmp/tmph474bxyu/ws35/.rosinstall -Cloning into '/tmp/tmph474bxyu/ws35/gitrepo'... -Cloning into '/tmp/tmph474bxyu/ws35/ros'... +Using initial elements from: /tmp/tmpLgMM59/simple.rosinstall +Writing /tmp/tmpLgMM59/ws35/.rosinstall +Cloning into '/tmp/tmpLgMM59/ws35/ros'... +Cloning into '/tmp/tmpLgMM59/ws35/gitrepo'... done. done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/ws35/gitrepo +[gitrepo] Fetching /tmp/tmpLgMM59/gitrepo (version None) to /tmp/tmpLgMM59/ws35/gitrepo [gitrepo] Done. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/ws35/ros +[ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/ws35/ros [ros] Done. [ros,gitrepo] still active @@ -2621,45 +1647,113 @@ Performing actions: Add new elements: - hgrepo hg /tmp/tmph474bxyu/hgrepo + hgrepo hg /tmp/tmpLgMM59/hgrepo Config changed, maybe you need run multi_cli update to update SCM entries. -Overwriting /tmp/tmph474bxyu/ws35/.rosinstall +Overwriting /tmp/tmpLgMM59/ws35/.rosinstall update complete. -[ros] Updating /tmp/tmph474bxyu/ws35/ros -[ros] Done. -[gitrepo] Updating /tmp/tmph474bxyu/ws35/gitrepo +[gitrepo] Updating /tmp/tmpLgMM59/ws35/gitrepo [gitrepo] Done. -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -[hgrepo] Fetching /tmp/tmph474bxyu/hgrepo (version None) to /tmp/tmph474bxyu/ws35/hgrepo +[ros] Updating /tmp/tmpLgMM59/ws35/ros +[ros] Done. +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st +[hgrepo] Fetching /tmp/tmpLgMM59/hgrepo (version None) to /tmp/tmpLgMM59/ws35/hgrepo [hgrepo] Done. ok test_scrape (test.local.test_cli.MultiprojectCLITest) ... [ros,gitrepo,hgrepo] still active -Using initial elements from: /tmp/tmph474bxyu/simple.rosinstall -Writing /tmp/tmph474bxyu/ws37/.rosinstall -Cloning into '/tmp/tmph474bxyu/ws37/ros'... -Cloning into '/tmp/tmph474bxyu/ws37/gitrepo'... +Using initial elements from: /tmp/tmpLgMM59/simple.rosinstall +Writing /tmp/tmpLgMM59/ws37/.rosinstall +Cloning into '/tmp/tmpLgMM59/ws37/ros'... +Cloning into '/tmp/tmpLgMM59/ws37/gitrepo'... done. done. -[gitrepo] Fetching /tmp/tmph474bxyu/gitrepo (version None) to /tmp/tmph474bxyu/ws37/gitrepo +[gitrepo] Fetching /tmp/tmpLgMM59/gitrepo (version None) to /tmp/tmpLgMM59/ws37/gitrepo [gitrepo] Done. -[ros] Fetching /tmp/tmph474bxyu/ros (version None) to /tmp/tmph474bxyu/ws37/ros +[ros] Fetching /tmp/tmpLgMM59/ros (version None) to /tmp/tmpLgMM59/ws37/ros [ros] Done. [ros,gitrepo] still active update complete. -Reinitialized existing Git repository in /tmp/tmph474bxyu/ws37/gitrepo/.git/ -adding foo.txt -/usr/lib/python3/dist-packages/vcstools/common.py:346: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead - logger.warn(message) +Reinitialized existing Git repository in /tmp/tmpLgMM59/ws37/gitrepo/.git/ +F?ge foo.txt hinzu WARNING [vcstools] Command failed: 'hg paths default' - run at: '/tmp/tmph474bxyu/ws37/hgrepo' + run at: '/tmp/tmpLgMM59/ws37/hgrepo' errcode: 1: -not found! +nicht gefunden! [/vcstools] ok +Initialized empty Git repository in /tmp/tmpYTWhVO/ros/.git/ +[master (root-commit) 1607554] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +Initialized empty Git repository in /tmp/tmpYTWhVO/remote/.git/ +[master (root-commit) 468e2f3] first commit + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 1.txt +[master 7b52ce2] second commit + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 2.txt +[master eb14ed2] third commit + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 3.txt + Performing actions: + + Add new elements: + hgrepo hg /tmp/tmpLgMM59/ws37 + +Overwriting /tmp/tmpLgMM59/ws37/.rosinstall +Config changed, remember to run 'multi_cli update hgrepo' to update the folder from hg +Using initial elements from: /tmp/tmpYTWhVO/ws/shallow-test.rosinstall +Writing /tmp/tmpYTWhVO/ws-without-shallow/.rosinstall +Cloning into '/tmp/tmpYTWhVO/ws-without-shallow/clone'... +[clone] Fetching file:///tmp/tmpYTWhVO/remote (version None) to /tmp/tmpYTWhVO/ws-without-shallow/clone +[clone] Done. + +update complete. +Using initial elements from: /tmp/tmpYTWhVO/ws/shallow-test.rosinstall +Writing /tmp/tmpYTWhVO/ws-with-shallow/.rosinstall +Cloning into '/tmp/tmpYTWhVO/ws-with-shallow/clone'... +test_compare_workspace (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) +Compare worktrees with/without shallow option ... ok +test_history_with_shallow (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) +Test history of cloned repo with shallow option ... ok +test_history_without_shallow (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) +Test history of cloned repo without shallow option ... ok +Initialized empty Git repository in /tmp/tmp4Pl0ed/ros/.git/ +[master (root-commit) 1607554] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +Initialized empty Git repository in /tmp/tmp4Pl0ed/gitrepo/.git/ +[master (root-commit) f220320] initial + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 gitfixed.txt +test_install (test.local.test_tarfile.RosinstallTarTest) ... [clone] Fetching file:///tmp/tmpYTWhVO/remote (version None) to /tmp/tmpYTWhVO/ws-with-shallow/clone +[clone] Done. + +update complete. +Using initial elements from: /tmp/tmp4Pl0ed/simple_changed_uri.rosinstall +Writing /tmp/tmpecZK6Z/.rosinstall +ok +test_mock_install (test.local.test_config_elt.ConfigElements_Test) ... ok +test_mock_vcs_config_element_init (test.local.test_config_elt.ConfigElements_Test) ... Warning: version 'some.version' not found for 'some/local/name' +Warning: version 'some.version' not found for 'some/local/name' +Warning: version 'some.version' not found for 'some/local/name' +ok +test_simple_config_element_API (test.local.test_config_elt.ConfigElements_Test) ... ok test_mock_vcs_element (test.local.test_config.ConfigMock_Test) ... ok test_absolute_localname (test.local.test_config.ConfigSimple_Test) ... ok test_config_merging_keep (test.local.test_config.ConfigSimple_Test) ... ok @@ -2685,12 +1779,6 @@ test_remove (test.local.test_config.ConfigSimple_Test) ... ok test_unnormalized_localname (test.local.test_config.ConfigSimple_Test) Should source normalize local-name ... ok -test_mock_install (test.local.test_config_elt.ConfigElements_Test) ... ok -test_mock_vcs_config_element_init (test.local.test_config_elt.ConfigElements_Test) ... Warning: version 'some.version' not found for 'some/local/name' -Warning: version 'some.version' not found for 'some/local/name' -Warning: version 'some.version' not found for 'some/local/name' -ok -test_simple_config_element_API (test.local.test_config_elt.ConfigElements_Test) ... ok test_rewrite_included_source (test.local.test_config_yaml.ConfigElementYamlFunctions_Test) ... ok test_rewrite_included_source_setupfile (test.local.test_config_yaml.ConfigElementYamlFunctions_Test) ... ok test_original_syntax_invalids (test.local.test_config_yaml.ConfigElementYamlWrapper_Test) ... ok @@ -2704,34 +1792,33 @@ test_aggregate_from_uris (test.local.test_config_yaml.UriAggregationTest) ... ok test_get_yaml_from_uri_from_file (test.local.test_config_yaml.YamlIO_Test) ... ok test_get_yaml_from_uri_from_invalid_url (test.local.test_config_yaml.YamlIO_Test) ... ok -test_get_yaml_from_uri_from_missing_file (test.local.test_config_yaml.YamlIO_Test) ... Initialized empty Git repository in /tmp/tmpo1do7yov/ros/.git/ -[master (root-commit) 34f7a63] initial +test_get_yaml_from_uri_from_missing_file (test.local.test_config_yaml.YamlIO_Test) ... ok +Initialized empty Git repository in /tmp/tmpT_P1o3/ros/.git/ +[master (root-commit) 1607554] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake create mode 100755 bin/rospack create mode 100644 setup.sh create mode 100644 stack.xml -Created a standalone tree (format: 2a) -adding fixed.txt -adding modified.txt -adding modified-fs.txt -adding deleted.txt -adding deleted-fs.txt -Committing to: /tmp/tmpo1do7yov/remote/ -added deleted-fs.txt -added deleted.txt -added fixed.txt -added modified-fs.txt -added modified.txt -Committed revision 1. - Performing actions: - - Add new elements: - hgrepo hg /tmp/tmph474bxyu/ws37 +Initialized empty Git repository in /tmp/tmpT_P1o3/gitrepo/.git/ +[master (root-commit) f220320] initial + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 gitfixed.txt +Initialized empty Git repository in /tmp/tmpT_P1o3/gitrepo2/.git/ +[master (root-commit) 6af609c] initial + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 gitfixed.txt +test_Rosinstall_help (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok +test_rosinstall_abort_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... [temptar] Fetching /tmp/tmp4Pl0ed/tarfile.tar.bz2 (version temptar) to /tmp/tmpecZK6Z/temptar +[temptar] Done. -Overwriting /tmp/tmph474bxyu/ws37/.rosinstall -Config changed, remember to run 'multi_cli update hgrepo' to update the folder from hg +update complete. +[some/local/name] Fetching some/uri (version None) to some/path +[some/local/name] Done. +[some/local/name] Fetching some/uri (version None) to some/path Keep existing entry foo, discard later one Keep existing entry foo, discard later one Keep existing entry foo, discard later one @@ -2768,172 +1855,376 @@ Replace existing entry foo Replace existing entry foo Replace existing entry ./foo/bar/.. -[some/local/name] Fetching some/uri (version None) to some/path -[some/local/name] Done. -[some/local/name] Fetching some/uri (version None) to some/path +wstool is a command to manipulate ROS workspaces. wstool replaces its predecessor rosws. + +Official usage: + wstool CMD [ARGS] [OPTIONS] + +wstool will try to infer install path from context + +Type 'wstool help' for usage. + +help provide help for commands +init set up a directory as workspace + +set add or changes one entry from your workspace config +merge merges your workspace with another config set +remove (rm) remove an entry from your workspace config, without deleting files +scrape interactively add all found unmanaged VCS subfolders to workspace + +update (up) update or check out some of your config elements + +info Overview of some entries +status (st) print the change status of files in some SCM controlled entries +diff (di) print a diff over some SCM controlled entries +foreach run shell command in given entries +Using initial elements from: /tmp/tmpT_P1o3/simple.rosinstall +Writing /tmp/tmpOI_fVv/.rosinstall +Cloning into '/tmp/tmpOI_fVv/ros'... +done. +Cloning into '/tmp/tmpOI_fVv/gitrepo'... +done. ok -deleted deleted.txt -adding added.txt -test_wstool_diff_bzr_inside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test diff output for bzr when run inside workspace ... [clone] Fetching /tmp/tmpo1do7yov/remote (version None) to /tmp/tmpo1do7yov/ws/clone -[clone] Done. -[clone] Fetching /tmp/tmpo1do7yov/remote (version None) to /tmp/tmpo1do7yov/ws/clone -[clone] Done. +test_rosinstall_backup_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... [ros] Fetching /tmp/tmpT_P1o3/ros (version None) to /tmp/tmpOI_fVv/ros +[ros] Done. +[gitrepo] Fetching /tmp/tmpT_P1o3/gitrepo (version None) to /tmp/tmpOI_fVv/gitrepo +[gitrepo] Done. + +update complete. + Performing actions: + + Change details of element (Use --merge-keep or --merge-replace to change): + gitrepo specified uri: /tmp/tmpT_P1o3/gitrepo -> ...gitrepo2; + +Config changed, maybe you need run wstool update to update SCM entries. +Overwriting /tmp/tmpOI_fVv/.rosinstall + +update complete. +Using initial elements from: /tmp/tmpT_P1o3/simple.rosinstall +Writing /tmp/tmpCNUiYg/.rosinstall +Cloning into '/tmp/tmpCNUiYg/ros'... +done. +Cloning into '/tmp/tmpCNUiYg/gitrepo'... +done. +[ros] Fetching /tmp/tmpT_P1o3/ros (version None) to /tmp/tmpCNUiYg/ros +[ros] Done. +[gitrepo] Fetching /tmp/tmpT_P1o3/gitrepo (version None) to /tmp/tmpCNUiYg/gitrepo +[gitrepo] Done. + +update complete. + Performing actions: + + Change details of element (Use --merge-keep or --merge-replace to change): + gitrepo specified uri: /tmp/tmpT_P1o3/gitrepo -> ...gitrepo2; + +Config changed, maybe you need run wstool update to update SCM entries. +Overwriting /tmp/tmpCNUiYg/.rosinstall + +update complete. +Cloning into '/tmp/tmpCNUiYg/gitrepo'... +done. ok -test_wstool_diff_bzr_outside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test diff output for bzr when run outside workspace ... === added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+flam +test_rosinstall_change_vcs_type (test.local.test_rosinstall_options.RosinstallOptionsTest) ... [gitrepo] Fetching /tmp/tmpT_P1o3/gitrepo2 (version None) to /tmp/tmpCNUiYg/gitrepo +[gitrepo] Backing up /tmp/tmpCNUiYg/gitrepo to /tmp/tmp125eG_/gitrepo_2022-10-05-07-28-48 +[gitrepo] Done. +[ros] Updating /tmp/tmpCNUiYg/ros +[ros] Done. +Using initial elements from: /tmp/tmpT_P1o3/simple.rosinstall +Writing /tmp/tmph6DCOB/.rosinstall +Cloning into '/tmp/tmph6DCOB/ros'... +done. +Cloning into '/tmp/tmph6DCOB/gitrepo'... +done. +[ros] Fetching /tmp/tmpT_P1o3/ros (version None) to /tmp/tmph6DCOB/ros +[ros] Done. +[gitrepo] Fetching /tmp/tmpT_P1o3/gitrepo (version None) to /tmp/tmph6DCOB/gitrepo +[gitrepo] Done. -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +update complete. + Performing actions: -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+flam + Add new elements: + hgrepo hg /tmp/tmpT_P1o3/hgrepo -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +Config changed, maybe you need run wstool update to update SCM entries. +Overwriting /tmp/tmph6DCOB/.rosinstall -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +update complete. +Aktualisiere auf Zweig default +1 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st ok -test_wstool_info_bzr (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) ... === added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+flam +test_rosinstall_delete_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... [gitrepo] Updating /tmp/tmph6DCOB/gitrepo +[gitrepo] Done. +[hgrepo] Fetching /tmp/tmpT_P1o3/hgrepo (version None) to /tmp/tmph6DCOB/hgrepo +[hgrepo] Done. +[ros] Updating /tmp/tmph6DCOB/ros +[ros] Done. +Using initial elements from: /tmp/tmpT_P1o3/simple.rosinstall +Writing /tmp/tmpfHfAMd/.rosinstall +Cloning into '/tmp/tmpfHfAMd/ros'... +done. +Cloning into '/tmp/tmpfHfAMd/gitrepo'... +done. +[ros] Fetching /tmp/tmpT_P1o3/ros (version None) to /tmp/tmpfHfAMd/ros +[ros] Done. +[gitrepo] Fetching /tmp/tmpT_P1o3/gitrepo (version None) to /tmp/tmpfHfAMd/gitrepo +[gitrepo] Done. -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +update complete. + Performing actions: -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+flam + Change details of element (Use --merge-keep or --merge-replace to change): + gitrepo specified uri: /tmp/tmpT_P1o3/gitrepo -> ...gitrepo2; -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +Config changed, maybe you need run wstool update to update SCM entries. +Overwriting /tmp/tmpfHfAMd/.rosinstall -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+flam +update complete. +Cloning into '/tmp/tmpfHfAMd/gitrepo'... +done. +ok +test_rosinstall_invalid_continue (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok +test_rosinstall_invalid_fail (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok +test_get_ros_package_path (test.local.test_rosinstall_standalone_functions.FunctionsTest) ... ok +test_abspath_overlap (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_conditional_abspath (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_distributed_work (test.local.test_multiproject_functions.FunctionsTest) ... [gitrepo] Fetching /tmp/tmpT_P1o3/gitrepo2 (version None) to /tmp/tmpfHfAMd/gitrepo +[gitrepo] Done. +[ros] Updating /tmp/tmpfHfAMd/ros +[ros] Done. +First argument must be name of a command: -t +wstool is a command to manipulate ROS workspaces. wstool replaces its predecessor rosws. -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +Official usage: + wstool CMD [ARGS] [OPTIONS] -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+flam +wstool will try to infer install path from context -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ -+foo +Type 'wstool help' for usage. -=== modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 -@@ -0,0 +1,1 @@ +help provide help for commands +init set up a directory as workspace + +set add or changes one entry from your workspace config +merge merges your workspace with another config set +remove (rm) remove an entry from your workspace config, without deleting files +scrape interactively add all found unmanaged VCS subfolders to workspace + +update (up) update or check out some of your config elements + +info Overview of some entries +status (st) print the change status of files in some SCM controlled entries +diff (di) print a diff over some SCM controlled entries +foreach run shell command in given entries +ok +test_distributed_work_init (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_is_web_uri (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_normabspath (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_normalize_uri (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_select_element (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_select_elements (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_string_diff (test.local.test_multiproject_functions.FunctionsTest) ... ok +test_worker_thread (test.local.test_multiproject_functions.FunctionsTest) ... ok +Initialized empty Git repository in /tmp/tmpjR2LDZ/ros/.git/ +[master (root-commit) f01c2b4] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +Initialized empty Git repository in /tmp/tmpjR2LDZ/gitrepo/.git/ +[master (root-commit) 2c8617c] initial + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 gitfixed.txt +test_twice_with_relpath (test.local.test_interation.RosinstallInteractive) +runs wstool with generated self.simple_rosinstall to create local wstool env ... Cloning into '/tmp/tmpzMDjM2/ros'... +done. +Cloning into '/tmp/tmpzMDjM2/gitrepo'... +done. +[ros] Fetching /tmp/tmpjR2LDZ/ros (version None) to /tmp/tmpzMDjM2/ros +[ros] Done. +[gitrepo] Fetching /tmp/tmpjR2LDZ/gitrepo (version None) to /tmp/tmpzMDjM2/gitrepo +[gitrepo] Done. +[ros] Updating /tmp/tmpzMDjM2/ros +[ros] Done. +[gitrepo] Updating /tmp/tmpzMDjM2/gitrepo +[gitrepo] Done. +ok +Initialized empty Git repository in /tmp/tmpjbPPTe/ros/.git/ +[master (root-commit) a3443f0] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +Checked out revision 0. +A fixed.txt +A modified.txt +A modified-fs.txt +A deleted.txt +A deleted-fs.txt +Adding deleted-fs.txt +Adding deleted.txt +Adding fixed.txt +Adding modified-fs.txt +Adding modified.txt +Transmitting file data .....done +Committing transaction... +Committed revision 1. +[ros] Updating /tmp/tmpzMDjM2/ros +[ros] Done. +[gitrepo] Updating /tmp/tmpzMDjM2/gitrepo +[gitrepo] Done. +A ws/clone/deleted-fs.txt +A ws/clone/deleted.txt +A ws/clone/fixed.txt +A ws/clone/modified-fs.txt +A ws/clone/modified.txt +Checked out revision 1. +D deleted.txt +A added.txt +test_wstool_diff_svn_inside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) +Test diff output for svn when run inside workspace ... [clone] Fetching file://localhost/tmp/tmpjbPPTe/remote (version None) to /tmp/tmpjbPPTe/ws/clone +[clone] Done. +ok +test_wstool_diff_svn_outside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) +Test diff output for svn when run outside workspace ... A clone/added.txt +! clone/deleted-fs.txt +D clone/deleted.txt +M clone/modified.txt +ok +test_wstool_info_svn (test.local.test_diff_functions_svn.WstoolDiffSvnTest) ... ok +test_wstool_status_svn_inside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) +Test status output for svn when run inside workspace ... Index: clone/added.txt +=================================================================== +--- clone/added.txt (nonexistent) ++++ clone/added.txt (working copy) +@@ -0,0 +1 @@ ++flam +Index: clone/modified.txt +=================================================================== +--- clone/modified.txt (revision 1) ++++ clone/modified.txt (working copy) +@@ -0,0 +1 @@ +foo ok -test_wstool_status_bzr_inside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) -Test status output for bzr when run inside workspace ... === added file 'added.txt' +test_wstool_status_svn_outside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) +Test status output for svn when run outside workspace ... Index: clone/added.txt +=================================================================== +--- clone/added.txt (nonexistent) ++++ clone/added.txt (working copy) +@@ -0,0 +1 @@ ++flam +Index: clone/modified.txt +=================================================================== +--- clone/modified.txt (revision 1) ++++ clone/modified.txt (working copy) +@@ -0,0 +1 @@ ++foo +ok +test_wstool_status_svn_untracked (test.local.test_diff_functions_svn.WstoolDiffSvnTest) +Test status output for svn when run outside workspace ... A clone/added.txt +! clone/deleted-fs.txt +D clone/deleted.txt +M clone/modified.txt +ok +Initialized empty Git repository in /tmp/tmpH1WrM4/ros/.git/ +[master (root-commit) e71cda4] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_svn.WstoolInfoSvnTest) ... Checked out revision 0. +A test.txt +Adding test.txt +Transmitting file data .done +Committing transaction... +Committed revision 1. +A test2.txt +Adding test2.txt +Transmitting file data .done +Committing transaction... +Committed revision 2. +A clone/test.txt +A clone/test2.txt +Checked out revision 2. +A test3.txt +ok +Initialized empty Git repository in /tmp/tmp7pQdXg/ros/.git/ +[master (root-commit) e71cda4] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +Ein standalone tree wurde erstellt (Format: 2a) +adding fixed.txt +adding modified.txt +adding modified-fs.txt +adding deleted.txt +adding deleted-fs.txt +Committing to: /tmp/tmp7pQdXg/remote/ +Hinzugef?gt deleted-fs.txt +Hinzugef?gt deleted.txt +Hinzugef?gt fixed.txt +Hinzugef?gt modified-fs.txt +Hinzugef?gt modified.txt +Committed revision 1. +deleted deleted.txt +adding added.txt +test_wstool_diff_bzr_inside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) +Test diff output for bzr when run inside workspace ... ? clone/added-fs.txt +A clone/added.txt +! clone/deleted-fs.txt +D clone/deleted.txt +M clone/modified.txt +ok +test_wstool_diff_bzr_outside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) +Test diff output for bzr when run outside workspace ... === added file 'added.txt' --- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 ++++ clone/added.txt 2022-10-04 17:28:52 +0000 @@ -0,0 +1,1 @@ +flam === removed file 'deleted-fs.txt' === removed file 'deleted.txt' === modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 +--- clone/modified-fs.txt 2022-10-04 17:28:52 +0000 ++++ clone/modified-fs.txt 2022-10-04 17:28:52 +0000 @@ -0,0 +1,1 @@ +foo === modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 +--- clone/modified.txt 2022-10-04 17:28:52 +0000 ++++ clone/modified.txt 2022-10-04 17:28:52 +0000 @@ -0,0 +1,1 @@ +foo -=== added file 'added.txt' +ok +test_wstool_info_bzr (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) ... ok +test_wstool_status_bzr_inside (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) +Test status output for bzr when run inside workspace ... === added file 'added.txt' --- clone/added.txt 1970-01-01 00:00:00 +0000 -+++ clone/added.txt 2021-09-01 11:04:03 +0000 ++++ clone/added.txt 2022-10-04 17:28:52 +0000 @@ -0,0 +1,1 @@ +flam === removed file 'deleted-fs.txt' === removed file 'deleted.txt' === modified file 'modified-fs.txt' ---- clone/modified-fs.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified-fs.txt 2021-09-01 11:04:03 +0000 +--- clone/modified-fs.txt 2022-10-04 17:28:52 +0000 ++++ clone/modified-fs.txt 2022-10-04 17:28:52 +0000 @@ -0,0 +1,1 @@ +foo === modified file 'modified.txt' ---- clone/modified.txt 2021-09-01 11:04:02 +0000 -+++ clone/modified.txt 2021-09-01 11:04:03 +0000 +--- clone/modified.txt 2022-10-04 17:28:52 +0000 ++++ clone/modified.txt 2022-10-04 17:28:52 +0000 @@ -0,0 +1,1 @@ +foo ok @@ -2943,11 +2234,6 @@ -D clone/deleted.txt M clone/modified-fs.txt M clone/modified.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt ok test_wstool_status_bzr_untracked (test.local.test_diff_functions_bzr.WstoolDiffBzrTest) Test status output for bzr when run outside workspace ... +N clone/added.txt @@ -2955,869 +2241,52 @@ -D clone/deleted.txt M clone/modified-fs.txt M clone/modified.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -Initialized empty Git repository in /tmp/tmp4vueyvyf/ros/.git/ -[master (root-commit) 3de4ae8] initial +ok +Initialized empty Git repository in /tmp/tmpy_DKoe/ros/.git/ +[master (root-commit) 714beea] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake create mode 100755 bin/rospack create mode 100644 setup.sh create mode 100644 stack.xml -ok -test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_bzr.WstoolInfoBzrTest) ... Created a standalone tree (format: 2a) +test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_bzr.WstoolInfoBzrTest) ... Ein standalone tree wurde erstellt (Format: 2a) adding test.txt -Committing to: /tmp/tmp4vueyvyf/remote/ -added test.txt +Committing to: /tmp/tmpy_DKoe/remote/ +Hinzugef?gt test.txt Committed revision 1. Created tag footag. adding test2.txt -Committing to: /tmp/tmp4vueyvyf/remote/ -added test2.txt +Committing to: /tmp/tmpy_DKoe/remote/ +Hinzugef?gt test2.txt Committed revision 2. -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -Initialized empty Git repository in /tmp/tmpsqycdum3/ros/.git/ -[master (root-commit) 8f1df76] initial +ok +Initialized empty Git repository in /tmp/tmpkTu7TT/ros/.git/ +[master (root-commit) a94fece] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake create mode 100755 bin/rospack create mode 100644 setup.sh create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpsqycdum3/remote/.git/ -[master (root-commit) bedb7c2] modified - Author: Your Name - 5 files changed, 0 insertions(+), 0 deletions(-) - create mode 100644 deleted-fs.txt - create mode 100644 deleted.txt - create mode 100644 fixed.txt - create mode 100644 modified-fs.txt - create mode 100644 modified.txt -ok -Cloning into '/tmp/tmpsqycdum3/ws/clone'... -done. -? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -rm 'deleted.txt' -test_Wstool_status_git_outside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test status output for git when run outside workspace ... ? clone/added-fs.txt -+N clone/added.txt - D clone/deleted-fs.txt --D clone/deleted.txt - M clone/modified-fs.txt - M clone/modified.txt -? clone/added-fs.txt +Aktualisiere auf Zweig default +5 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st +test_wstool_diff_hg_inside (test.local.test_diff_functions_hg.WstoolDiffHgTest) +Test diff output for hg when run inside workspace ... ? clone/added-fs.txt +N clone/added.txt D clone/deleted-fs.txt -D clone/deleted.txt M clone/modified-fs.txt M clone/modified.txt ok -test_Wstool_status_git_untracked (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test untracked status output for git when run outside workspace ... A clone/added.txt - D clone/deleted-fs.txt -D clone/deleted.txt - M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt - D clone/deleted-fs.txt -D clone/deleted.txt - M clone/modified-fs.txt -M clone/modified.txt -ok -test_wstool_diff_git_inside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test diff output for git when run inside workspace ... A clone/added.txt - D clone/deleted-fs.txt -D clone/deleted.txt - M clone/modified-fs.txt -M clone/modified.txt -?? clone/added-fs.txt -A clone/added.txt - D clone/deleted-fs.txt -D clone/deleted.txt - M clone/modified-fs.txt -M clone/modified.txt -?? clone/added-fs.txt -ok -test_wstool_diff_git_outside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test diff output for git when run outside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -ok -test_wstool_info_git (test.local.test_diff_functions_git.WstoolDiffGitTest) ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -ok -test_wstool_status_git_inside (test.local.test_diff_functions_git.WstoolDiffGitTest) -Test status output for git when run inside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -Initialized empty Git repository in /tmp/tmpz2lch96d/ros/.git/ -[master (root-commit) f3e2eae] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -ok -test_wstool_detailed_localpath_info (test.local.test_diff_functions_git.WstoolInfoGitTest) ... Initialized empty Git repository in /tmp/tmpz2lch96d/remote/.git/ -[master (root-commit) dfc3074] modified - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 test.txt -[master 8d42b35] modified - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 test2.txt -/usr/lib/python3.7/subprocess.py:858: ResourceWarning: subprocess 11573 is still running - ResourceWarning, source=self) -ResourceWarning: Enable tracemalloc to get the object allocation traceback -/build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/test/local/test_diff_functions_git.py:203: ResourceWarning: unclosed file <_io.BufferedReader name=3> - po = subprocess.Popen(["git", "log", "-n", "1", "--pretty=format:\"%H\""], cwd=self.remote_path, stdout=subprocess.PIPE) -ResourceWarning: Enable tracemalloc to get the object allocation traceback -Cloning into '/tmp/tmpz2lch96d/ws/clone'... -done. -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -/usr/lib/python3.7/subprocess.py:858: ResourceWarning: subprocess 11579 is still running - ResourceWarning, source=self) -ResourceWarning: Enable tracemalloc to get the object allocation traceback -/usr/lib/python3.7/unittest/case.py:611: ResourceWarning: unclosed file <_io.BufferedReader name=4> - self.setUp() -ResourceWarning: Enable tracemalloc to get the object allocation traceback -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -HEAD is now at dfc3074 modified -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -HEAD is now at 8d42b35 modified -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -Switched to a new branch 'test_branch' -D test2.txt -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -From ../../remote - * [new branch] master -> remote2/master -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -Switched to branch 'master' -D test2.txt -Your branch is up to date with 'origin/master'. -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -Initialized empty Git repository in /tmp/tmp7087gyqx/ros/.git/ -[master (root-commit) 1625e16] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -ok -updating to branch default -5 files updated, 0 files merged, 0 files removed, 0 files unresolved -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -test_wstool_diff_hg_inside (test.local.test_diff_functions_hg.WstoolDiffHgTest) -Test diff output for hg when run inside workspace ... diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone/deleted-fs.txt clone/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone/modified-fs.txt clone/modified-fs.txt -index e69de29..257cc56 100644 ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt -index e69de29..257cc56 100644 ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1 @@ -+foo -ok test_wstool_diff_hg_outside (test.local.test_diff_functions_hg.WstoolDiffHgTest) Test diff output for hg when run outside workspace ... M clone/modified-fs.txt M clone/modified.txt A clone/added.txt R clone/deleted.txt ! clone/deleted-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -ok -test_wstool_info_hg (test.local.test_diff_functions_hg.WstoolDiffHgTest) ... diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo ok +test_wstool_info_hg (test.local.test_diff_functions_hg.WstoolDiffHgTest) ... ok test_wstool_status_hg_inside (test.local.test_diff_functions_hg.WstoolDiffHgTest) Test status output for hg when run inside workspace ... diff --git clone/added.txt clone/added.txt new file mode 100644 @@ -3837,24 +2306,6 @@ +++ clone/modified.txt @@ -0,0 +1,1 @@ +foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo ok test_wstool_status_hg_outside (test.local.test_diff_functions_hg.WstoolDiffHgTest) Test status output for hg when run outside workspace ... diff --git clone/added.txt clone/added.txt @@ -3875,24 +2326,6 @@ +++ clone/modified.txt @@ -0,0 +1,1 @@ +foo -diff --git clone/added.txt clone/added.txt -new file mode 100644 ---- /dev/null -+++ clone/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone/deleted.txt clone/deleted.txt -deleted file mode 100644 -diff --git clone/modified-fs.txt clone/modified-fs.txt ---- clone/modified-fs.txt -+++ clone/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone/modified.txt clone/modified.txt ---- clone/modified.txt -+++ clone/modified.txt -@@ -0,0 +1,1 @@ -+foo ok test_wstool_status_hg_untracked (test.local.test_diff_functions_hg.WstoolDiffHgTest) Test untracked status output for hg when run outside workspace ... M clone/modified-fs.txt @@ -3900,112 +2333,29 @@ A clone/added.txt R clone/deleted.txt ! clone/deleted-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -Initialized empty Git repository in /tmp/tmppw21fku3/ros/.git/ -[master (root-commit) d8f3e56] initial +ok +Initialized empty Git repository in /tmp/tmplhkGuO/ros/.git/ +[master (root-commit) 0c0f705] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake create mode 100755 bin/rospack create mode 100644 setup.sh create mode 100644 stack.xml -ok -test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_hg.WstoolInfoHgTest) ... /usr/lib/python3.7/subprocess.py:858: ResourceWarning: subprocess 13061 is still running - ResourceWarning, source=self) -ResourceWarning: Enable tracemalloc to get the object allocation traceback -/build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/test/local/test_diff_functions_hg.py:204: ResourceWarning: unclosed file <_io.BufferedReader name=3> - po = subprocess.Popen(["hg", "log", "--template", "'{node|short}'", "-l1"], cwd=remote_path, stdout=subprocess.PIPE) -ResourceWarning: Enable tracemalloc to get the object allocation traceback -updating to branch default -3 files updated, 0 files merged, 0 files removed, 0 files unresolved -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -/usr/lib/python3.7/subprocess.py:858: ResourceWarning: subprocess 13077 is still running - ResourceWarning, source=self) -ResourceWarning: Enable tracemalloc to get the object allocation traceback -/usr/lib/python3.7/unittest/case.py:611: ResourceWarning: unclosed file <_io.BufferedReader name=4> - self.setUp() -ResourceWarning: Enable tracemalloc to get the object allocation traceback -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -Initialized empty Git repository in /tmp/tmp93mikmj_/ros/.git/ -[master (root-commit) 68201f2] initial +test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_hg.WstoolInfoHgTest) ... Aktualisiere auf Zweig default +3 Dateien aktualisiert, 0 Dateien zusammengef?hrt, 0 Dateien entfernt, 0 Dateien ungel?st +Warning: found several candidates for hg spec footagWarning: version 'footag' not found for 'clone' +FAIL +Initialized empty Git repository in /tmp/tmpxyeRBm/ros/.git/ +[master (root-commit) 40c2725] initial Author: Your Name 4 files changed, 4 insertions(+) create mode 100755 bin/rosmake create mode 100755 bin/rospack create mode 100644 setup.sh create mode 100644 stack.xml -Checked out revision 0. -A fixed.txt -A modified.txt -A modified-fs.txt -A deleted.txt -A deleted-fs.txt -Adding deleted-fs.txt -Adding deleted.txt -Adding fixed.txt -Adding modified-fs.txt -Adding modified.txt -Transmitting file data .....done -Committing transaction... -Committed revision 1. -Initialized empty Git repository in /tmp/tmp93mikmj_/remote_git/.git/ -[master (root-commit) 746a11a] modified +Initialized empty Git repository in /tmp/tmpxyeRBm/remote/.git/ +[master (root-commit) 9ab2147] modified Author: Your Name 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 deleted-fs.txt @@ -4013,1799 +2363,184 @@ create mode 100644 fixed.txt create mode 100644 modified-fs.txt create mode 100644 modified.txt -Created a standalone tree (format: 2a) -adding fixed.txt -adding modified.txt -adding modified-fs.txt -adding deleted.txt -adding deleted-fs.txt -Committing to: /tmp/tmp93mikmj_/remote_bzr/ -added deleted-fs.txt -added deleted.txt -added fixed.txt -added modified-fs.txt -added modified.txt -Committed revision 1. -ok -Cloning into '/tmp/tmp93mikmj_/ws/clone_git'... -done. -A ws/clone_svn/deleted-fs.txt -A ws/clone_svn/deleted.txt -A ws/clone_svn/fixed.txt -A ws/clone_svn/modified-fs.txt -A ws/clone_svn/modified.txt -Checked out revision 1. -updating to branch default -5 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into '/tmp/tmp93mikmj_/ws/clone_git2'... +Cloning into '/tmp/tmpxyeRBm/ws/clone'... done. -M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -rm 'deleted.txt' rm 'deleted.txt' -D deleted.txt -A added.txt -deleted deleted.txt -adding added.txt -test_multi_diff_rosinstall_inside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool diff output from inside workspace. ... M clone/modified-fs.txt +test_Wstool_status_git_outside (test.local.test_diff_functions_git.WstoolDiffGitTest) +Test status output for git when run outside workspace ... M clone/modified-fs.txt M clone/modified.txt A clone/added.txt R clone/deleted.txt ! clone/deleted-fs.txt ? clone/added-fs.txt ok -test_multi_diff_rosinstall_outside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool diff output from outside workspace. ... M clone/modified-fs.txt +test_Wstool_status_git_untracked (test.local.test_diff_functions_git.WstoolDiffGitTest) +Test untracked status output for git when run outside workspace ... A clone/added.txt + D clone/deleted-fs.txt +D clone/deleted.txt + M clone/modified-fs.txt M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt ok -test_multi_diff_wstool_inside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool diff output from inside workspace. ... M clone/modified-fs.txt -M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -M clone/modified-fs.txt +test_wstool_diff_git_inside (test.local.test_diff_functions_git.WstoolDiffGitTest) +Test diff output for git when run inside workspace ... A clone/added.txt + D clone/deleted-fs.txt +D clone/deleted.txt + M clone/modified-fs.txt M clone/modified.txt -A clone/added.txt -R clone/deleted.txt -! clone/deleted-fs.txt -? clone/added-fs.txt -ok -test_multi_diff_wstool_outside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool diff output from outside workspace. ... diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -ok -test_multi_status_rosinstall_inside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool status output when run inside workspace. ... diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo +?? clone/added-fs.txt ok -test_multi_status_rosinstall_outside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool status output when run outside workspace. ... diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt +test_wstool_diff_git_outside (test.local.test_diff_functions_git.WstoolDiffGitTest) +Test diff output for git when run outside workspace ... diff --git clone/added.txt clone/added.txt new file mode 100644 index 0000000..8d63207 --- /dev/null -+++ clone_git2/added.txt ++++ clone/added.txt @@ -0,0 +1 @@ +flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt +diff --git clone/deleted-fs.txt clone/deleted-fs.txt deleted file mode 100644 index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt +diff --git clone/deleted.txt clone/deleted.txt deleted file mode 100644 index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt +diff --git clone/modified-fs.txt clone/modified-fs.txt index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt +--- clone/modified-fs.txt ++++ clone/modified-fs.txt @@ -0,0 +1 @@ +foo -diff --git clone_git2/modified.txt clone_git2/modified.txt +diff --git clone/modified.txt clone/modified.txt index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt +--- clone/modified.txt ++++ clone/modified.txt @@ -0,0 +1 @@ +foo ok -test_multi_status_untracked (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -tests status output for --untracked. ... diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo - -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt +test_wstool_info_git (test.local.test_diff_functions_git.WstoolDiffGitTest) ... ok +test_wstool_status_git_inside (test.local.test_diff_functions_git.WstoolDiffGitTest) +Test status output for git when run inside workspace ... diff --git clone/added.txt clone/added.txt new file mode 100644 index 0000000..8d63207 --- /dev/null -+++ clone_git2/added.txt ++++ clone/added.txt @@ -0,0 +1 @@ +flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt +diff --git clone/deleted-fs.txt clone/deleted-fs.txt deleted file mode 100644 index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt +diff --git clone/deleted.txt clone/deleted.txt deleted file mode 100644 index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt +diff --git clone/modified-fs.txt clone/modified-fs.txt index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt +--- clone/modified-fs.txt ++++ clone/modified-fs.txt @@ -0,0 +1 @@ +foo -diff --git clone_git2/modified.txt clone_git2/modified.txt +diff --git clone/modified.txt clone/modified.txt index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt +--- clone/modified.txt ++++ clone/modified.txt @@ -0,0 +1 @@ +foo ok -test_multi_status_wstool_inside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool status output when run inside workspace. ... A clone_git/added.txt - D clone_git/deleted-fs.txt -D clone_git/deleted.txt - M clone_git/modified-fs.txt -M clone_git/modified.txt -?? clone_git/added-fs.txt -? clone_svn/added-fs.txt -A clone_svn/added.txt -! clone_svn/deleted-fs.txt -D clone_svn/deleted.txt -M clone_svn/modified.txt -M clone_hg/modified-fs.txt -M clone_hg/modified.txt -A clone_hg/added.txt -R clone_hg/deleted.txt -! clone_hg/deleted-fs.txt -? clone_hg/added-fs.txt -? clone_bzr/added-fs.txt -+N clone_bzr/added.txt - D clone_bzr/deleted-fs.txt --D clone_bzr/deleted.txt - M clone_bzr/modified-fs.txt - M clone_bzr/modified.txt -A clone_git2/added.txt - D clone_git2/deleted-fs.txt -D clone_git2/deleted.txt - M clone_git2/modified-fs.txt -M clone_git2/modified.txt -?? clone_git2/added-fs.txt -A clone_git/added.txt - D clone_git/deleted-fs.txt -D clone_git/deleted.txt - M clone_git/modified-fs.txt -M clone_git/modified.txt -?? clone_git/added-fs.txt -? clone_svn/added-fs.txt -A clone_svn/added.txt -! clone_svn/deleted-fs.txt -D clone_svn/deleted.txt -M clone_svn/modified.txt -M clone_hg/modified-fs.txt -M clone_hg/modified.txt -A clone_hg/added.txt -R clone_hg/deleted.txt -! clone_hg/deleted-fs.txt -? clone_hg/added-fs.txt -? clone_bzr/added-fs.txt -+N clone_bzr/added.txt - D clone_bzr/deleted-fs.txt --D clone_bzr/deleted.txt - M clone_bzr/modified-fs.txt - M clone_bzr/modified.txt -A clone_git2/added.txt - D clone_git2/deleted-fs.txt -D clone_git2/deleted.txt - M clone_git2/modified-fs.txt -M clone_git2/modified.txt -?? clone_git2/added-fs.txt +Initialized empty Git repository in /tmp/tmp5ivbQ3/ros/.git/ +[master (root-commit) 1cbbbec] initial + Author: Your Name + 4 files changed, 4 insertions(+) + create mode 100755 bin/rosmake + create mode 100755 bin/rospack + create mode 100644 setup.sh + create mode 100644 stack.xml +test_wstool_detailed_localpath_info (test.local.test_diff_functions_git.WstoolInfoGitTest) ... Initialized empty Git repository in /tmp/tmp5ivbQ3/remote/.git/ +[master (root-commit) b4f586e] modified + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 test.txt +[master ccead58] modified + Author: Your Name + 1 file changed, 0 insertions(+), 0 deletions(-) + create mode 100644 test2.txt +Cloning into '/tmp/tmp5ivbQ3/ws/clone'... +done. +HEAD is now at b4f586e modified +HEAD is now at ccead58 modified +Switched to a new branch 'test_branch' +D test2.txt +From ../../remote + * [new branch] master -> remote2/master +Switched to branch 'master' +D test2.txt +Your branch is up to date with 'origin/master'. ok -test_multi_status_wstool_outside (test.local.test_diff_functions_multi.WstoolDiffMultiTest) -Test wstool status output when run outside workspace. ... diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam - -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git2/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git2/modified.txt clone_git2/modified.txt -index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/added.txt clone_git/added.txt -new file mode 100644 -index 0000000..8d63207 ---- /dev/null -+++ clone_git/added.txt -@@ -0,0 +1 @@ -+flam -diff --git clone_git/deleted-fs.txt clone_git/deleted-fs.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/deleted.txt clone_git/deleted.txt -deleted file mode 100644 -index e69de29..0000000 -diff --git clone_git/modified-fs.txt clone_git/modified-fs.txt -index e69de29..257cc56 100644 ---- clone_git/modified-fs.txt -+++ clone_git/modified-fs.txt -@@ -0,0 +1 @@ -+foo -diff --git clone_git/modified.txt clone_git/modified.txt -index e69de29..257cc56 100644 ---- clone_git/modified.txt -+++ clone_git/modified.txt -@@ -0,0 +1 @@ -+foo -Index: clone_svn/added.txt -=================================================================== ---- clone_svn/added.txt (nonexistent) -+++ clone_svn/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone_svn/modified.txt -=================================================================== ---- clone_svn/modified.txt (revision 1) -+++ clone_svn/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -diff --git clone_hg/added.txt clone_hg/added.txt -new file mode 100644 ---- /dev/null -+++ clone_hg/added.txt -@@ -0,0 +1,1 @@ -+flam -diff --git clone_hg/deleted.txt clone_hg/deleted.txt -deleted file mode 100644 -diff --git clone_hg/modified-fs.txt clone_hg/modified-fs.txt ---- clone_hg/modified-fs.txt -+++ clone_hg/modified-fs.txt -@@ -0,0 +1,1 @@ -+foo -diff --git clone_hg/modified.txt clone_hg/modified.txt ---- clone_hg/modified.txt -+++ clone_hg/modified.txt -@@ -0,0 +1,1 @@ -+foo -=== added file 'added.txt' ---- clone_bzr/added.txt 1970-01-01 00:00:00 +0000 -+++ clone_bzr/added.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+flam +====================================================================== +FAIL: test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_hg.WstoolInfoHgTest) +---------------------------------------------------------------------- +Traceback (most recent call last): + File "test/local/test_diff_functions_hg.py", line 243, in test_rosinstall_detailed_locapath_info + self.assertEqual(['clone', 'MV', 'hg', 'default', '(footag)', self.version_end, "(%s)" % self.version_init, os.path.join(self.test_root_path, 'remote')], tokens) +AssertionError: Lists differ: [u'clone', u'MV', u'hg', u'def... != [u'clone', u'MV', u'hg', u'def... + +First differing element 6: +u'(57e3e42603d5)' +u'("footag")' + + [u'clone', + u'MV', + u'hg', + u'default', + u'(footag)', + u'9e1116e730a4', +- u'(57e3e42603d5)', ++ u'("footag")', + u'/tmp/tmplhkGuO/remote'] -=== removed file 'deleted-fs.txt' -=== removed file 'deleted.txt' -=== modified file 'modified-fs.txt' ---- clone_bzr/modified-fs.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified-fs.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo +---------------------------------------------------------------------- +Ran 124 tests in 31.056s -=== modified file 'modified.txt' ---- clone_bzr/modified.txt 2021-09-01 11:04:34 +0000 -+++ clone_bzr/modified.txt 2021-09-01 11:04:35 +0000 -@@ -0,0 +1,1 @@ -+foo -diff --git clone_git2/added.txt clone_git2/added.txt +FAILED (failures=1) +diff --git clone/added.txt clone/added.txt new file mode 100644 index 0000000..8d63207 --- /dev/null -+++ clone_git2/added.txt ++++ clone/added.txt @@ -0,0 +1 @@ +flam -diff --git clone_git2/deleted-fs.txt clone_git2/deleted-fs.txt +diff --git clone/deleted-fs.txt clone/deleted-fs.txt deleted file mode 100644 index e69de29..0000000 -diff --git clone_git2/deleted.txt clone_git2/deleted.txt +diff --git clone/deleted.txt clone/deleted.txt deleted file mode 100644 index e69de29..0000000 -diff --git clone_git2/modified-fs.txt clone_git2/modified-fs.txt +diff --git clone/modified-fs.txt clone/modified-fs.txt index e69de29..257cc56 100644 ---- clone_git2/modified-fs.txt -+++ clone_git2/modified-fs.txt +--- clone/modified-fs.txt ++++ clone/modified-fs.txt @@ -0,0 +1 @@ +foo -diff --git clone_git2/modified.txt clone_git2/modified.txt +diff --git clone/modified.txt clone/modified.txt index e69de29..257cc56 100644 ---- clone_git2/modified.txt -+++ clone_git2/modified.txt -@@ -0,0 +1 @@ -+foo -Initialized empty Git repository in /tmp/tmpsr4btb35/ros/.git/ -[master (root-commit) 911a792] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Checked out revision 0. -A fixed.txt -A modified.txt -A modified-fs.txt -A deleted.txt -A deleted-fs.txt -Adding deleted-fs.txt -Adding deleted.txt -Adding fixed.txt -Adding modified-fs.txt -Adding modified.txt -Transmitting file data .....done -Committing transaction... -Committed revision 1. -A clone_git/added.txt - D clone_git/deleted-fs.txt -D clone_git/deleted.txt - M clone_git/modified-fs.txt -M clone_git/modified.txt -A clone_svn/added.txt -! clone_svn/deleted-fs.txt -D clone_svn/deleted.txt -M clone_svn/modified.txt -M clone_hg/modified-fs.txt -M clone_hg/modified.txt -A clone_hg/added.txt -R clone_hg/deleted.txt -! clone_hg/deleted-fs.txt -+N clone_bzr/added.txt - D clone_bzr/deleted-fs.txt --D clone_bzr/deleted.txt - M clone_bzr/modified-fs.txt - M clone_bzr/modified.txt -A clone_git2/added.txt - D clone_git2/deleted-fs.txt -D clone_git2/deleted.txt - M clone_git2/modified-fs.txt -M clone_git2/modified.txt -ok -A ws/clone/deleted-fs.txt -A ws/clone/deleted.txt -A ws/clone/fixed.txt -A ws/clone/modified-fs.txt -A ws/clone/modified.txt -Checked out revision 1. -D deleted.txt -A added.txt -test_wstool_diff_svn_inside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test diff output for svn when run inside workspace ... [clone] Fetching file://localhost/tmp/tmpsr4btb35/remote (version None) to /tmp/tmpsr4btb35/ws/clone -[clone] Done. -[clone] Fetching file://localhost/tmp/tmpsr4btb35/remote (version None) to /tmp/tmpsr4btb35/ws/clone -[clone] Done. -ok -test_wstool_diff_svn_outside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test diff output for svn when run outside workspace ... A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_wstool_info_svn (test.local.test_diff_functions_svn.WstoolDiffSvnTest) ... Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -ok -test_wstool_status_svn_inside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test status output for svn when run inside workspace ... Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -ok -test_wstool_status_svn_outside (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test status output for svn when run outside workspace ... Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) -@@ -0,0 +1 @@ -+foo -Index: clone/added.txt -=================================================================== ---- clone/added.txt (nonexistent) -+++ clone/added.txt (working copy) -@@ -0,0 +1 @@ -+flam -Index: clone/modified.txt -=================================================================== ---- clone/modified.txt (revision 1) -+++ clone/modified.txt (working copy) +--- clone/modified.txt ++++ clone/modified.txt @@ -0,0 +1 @@ +foo -ok -test_wstool_status_svn_untracked (test.local.test_diff_functions_svn.WstoolDiffSvnTest) -Test status output for svn when run outside workspace ... A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -Initialized empty Git repository in /tmp/tmpwm9hw2ly/ros/.git/ -[master (root-commit) 388b4f9] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -ok -test_rosinstall_detailed_locapath_info (test.local.test_diff_functions_svn.WstoolInfoSvnTest) ... Checked out revision 0. -A test.txt -Adding test.txt -Transmitting file data .done -Committing transaction... -Committed revision 1. -A test2.txt -Adding test2.txt -Transmitting file data .done -Committing transaction... -Committed revision 2. -A clone/test.txt -A clone/test2.txt -Checked out revision 2. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -A test3.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -Initialized empty Git repository in /tmp/tmpevqqfs97/ros/.git/ -[master (root-commit) 67f896a] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpevqqfs97/gitrepo/.git/ -[master (root-commit) 2a510d8] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -ok -test_twice_with_relpath (test.local.test_interation.RosinstallInteractive) -runs wstool with generated self.simple_rosinstall to create local wstool env ... ? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -Cloning into '/tmp/tmpbncwww2q/ros'... -done. -Cloning into '/tmp/tmpbncwww2q/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_abspath_overlap (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_conditional_abspath (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_distributed_work (test.local.test_multiproject_functions.FunctionsTest) ... ? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_distributed_work_init (test.local.test_multiproject_functions.FunctionsTest) ... ? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_is_web_uri (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_normabspath (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_normalize_uri (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_select_element (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_select_elements (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_string_diff (test.local.test_multiproject_functions.FunctionsTest) ... ok -test_worker_thread (test.local.test_multiproject_functions.FunctionsTest) ... Initialized empty Git repository in /tmp/tmpqqsqhnzw/ros/.git/ -[master (root-commit) 76ece3c] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmpqqsqhnzw/gitrepo/.git/ -[master (root-commit) 83af585] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -Initialized empty Git repository in /tmp/tmpqqsqhnzw/gitrepo2/.git/ -[master (root-commit) 83af585] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -ok -test_Rosinstall_help (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok -test_rosinstall_abort_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmp8abbmdmb/ros'... -done. -Cloning into '/tmp/tmp8abbmdmb/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_rosinstall_backup_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmpovp1374p/ros'... -done. -Cloning into '/tmp/tmpovp1374p/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -Cloning into '/tmp/tmpovp1374p/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_rosinstall_change_vcs_type (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmpik7m2ulr/ros'... -done. -Cloning into '/tmp/tmpik7m2ulr/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_rosinstall_delete_changes (test.local.test_rosinstall_options.RosinstallOptionsTest) ... Cloning into '/tmp/tmpdx4tslbw/ros'... -done. -Cloning into '/tmp/tmpdx4tslbw/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -Cloning into '/tmp/tmpdx4tslbw/gitrepo'... -done. -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -ok -test_rosinstall_invalid_continue (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok -test_rosinstall_invalid_fail (test.local.test_rosinstall_options.RosinstallOptionsTest) ... ok -test_get_ros_package_path (test.local.test_rosinstall_standalone_functions.FunctionsTest) ... Initialized empty Git repository in /tmp/tmphsue46cp/ros/.git/ -[master (root-commit) badbac6] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmphsue46cp/remote/.git/ -[master (root-commit) 6316dfb] first commit - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 1.txt -[master d3cbfdb] second commit - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 2.txt -[master 7a9083a] third commit - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 3.txt -ok -Cloning into '/tmp/tmphsue46cp/ws-without-shallow/clone'... -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -Cloning into '/tmp/tmphsue46cp/ws-with-shallow/clone'... -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -test_compare_workspace (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) -Compare worktrees with/without shallow option ... ok -test_history_with_shallow (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) -Test history of cloned repo with shallow option ... ok -test_history_without_shallow (test.local.test_shallow_checkout_git.WstoolShallowCheckoutGitTest) -Test history of cloned repo without shallow option ... Initialized empty Git repository in /tmp/tmp_tgl4ob_/ros/.git/ -[master (root-commit) badbac6] initial - Author: Your Name - 4 files changed, 4 insertions(+) - create mode 100755 bin/rosmake - create mode 100755 bin/rospack - create mode 100644 setup.sh - create mode 100644 stack.xml -Initialized empty Git repository in /tmp/tmp_tgl4ob_/gitrepo/.git/ -[master (root-commit) b57b0ec] initial - Author: Your Name - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 gitfixed.txt -ok -test_install (test.local.test_tarfile.RosinstallTarTest) ... ? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt -/build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/test/local/test_tarfile.py:32: DeprecationWarning: Please use assertEqual instead. - self.assertEquals(0, wstool_main(cmd)) -ok - ----------------------------------------------------------------------- -Ran 124 tests in 59.588s - -OK -? clone/added-fs.txt -A clone/added.txt -! clone/deleted-fs.txt -D clone/deleted.txt -M clone/modified.txt - create-stamp debian/debhelper-build-stamp - dh_testroot -O--buildsystem=pybuild - dh_prep -O--buildsystem=pybuild - dh_auto_install -O--buildsystem=pybuild -I: pybuild base:217: /usr/bin/python setup.py install --root /build/ros-wstool-0.1.17/debian/python-wstool -running install -running build -running build_py -running build_scripts -running install_lib -creating /build/ros-wstool-0.1.17/debian/python-wstool -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7 -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/wstool_cli.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/multiproject_cmd.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/multiproject_cli.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/ui.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/config.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/common.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/multiproject_cli.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/config_yaml.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/helpers.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/helpers.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/config_elements.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/config_elements.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/config.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/__version__.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/wstool_cli.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/multiproject_cmd.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/ui.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/__init__.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/cli_common.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/common.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/cli_common.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/__init__.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/config_yaml.py -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build/wstool/__version__.pyc -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/multiproject_cmd.py to multiproject_cmd.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/ui.py to ui.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/common.py to common.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/multiproject_cli.py to multiproject_cli.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/helpers.py to helpers.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/config_elements.py to config_elements.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/config.py to config.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/__version__.py to __version__.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/wstool_cli.py to wstool_cli.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/cli_common.py to cli_common.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/__init__.py to __init__.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool/config_yaml.py to config_yaml.pyc -running install_data -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/share -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/bash-completion -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/bash-completion/completions -copying completion/wstool-completion.bash -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/bash-completion/completions -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/zsh -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/zsh/vendor-completions -copying completion/_wstool -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/zsh/vendor-completions -copying completion/wstool-completion.bash -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/share/zsh/vendor-completions -running install_egg_info -running egg_info -creating src/wstool.egg-info -writing requirements to src/wstool.egg-info/requires.txt -writing src/wstool.egg-info/PKG-INFO -writing top-level names to src/wstool.egg-info/top_level.txt -writing dependency_links to src/wstool.egg-info/dependency_links.txt -writing manifest file 'src/wstool.egg-info/SOURCES.txt' -reading manifest file 'src/wstool.egg-info/SOURCES.txt' -reading manifest template 'MANIFEST.in' -writing manifest file 'src/wstool.egg-info/SOURCES.txt' -Copying src/wstool.egg-info to /build/ros-wstool-0.1.17/debian/python-wstool/usr/lib/python2.7/dist-packages/wstool-0.1.17.egg-info -Skipping SOURCES.txt -running install_scripts -creating /build/ros-wstool-0.1.17/debian/python-wstool/usr/bin -copying build/scripts-2.7/wstool -> /build/ros-wstool-0.1.17/debian/python-wstool/usr/bin -changing mode of /build/ros-wstool-0.1.17/debian/python-wstool/usr/bin/wstool to 755 -I: pybuild pybuild:298: rm -rf 'debian/python3-wstool/usr/bin' 'debian/python3-wstool/usr/share/bash-completion' 'debian/python3-wstool/usr/share/zsh' -I: pybuild base:217: /usr/bin/python3 setup.py install --root /build/ros-wstool-0.1.17/debian/python3-wstool -running install -running build -running build_py -running build_scripts -running install_lib -creating /build/ros-wstool-0.1.17/debian/python3-wstool -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7 -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/multiproject_cmd.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/ui.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/common.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/multiproject_cli.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/helpers.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/ui.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/common.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/multiproject_cli.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/cli_common.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/config.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/__version__.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/helpers.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/config_elements.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/multiproject_cmd.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/__init__.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/wstool_cli.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__pycache__/config_yaml.cpython-37.pyc -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__pycache__ -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/config_elements.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/config.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__version__.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/wstool_cli.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/cli_common.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/__init__.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -copying /build/ros-wstool-0.1.17/.pybuild/cpython3_3.7_wstool/build/wstool/config_yaml.py -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/multiproject_cmd.py to multiproject_cmd.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/ui.py to ui.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/common.py to common.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/multiproject_cli.py to multiproject_cli.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/helpers.py to helpers.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/config_elements.py to config_elements.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/config.py to config.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__version__.py to __version__.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/wstool_cli.py to wstool_cli.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/cli_common.py to cli_common.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/__init__.py to __init__.cpython-37.pyc -byte-compiling /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool/config_yaml.py to config_yaml.cpython-37.pyc -running install_data -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/bash-completion -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/bash-completion/completions -copying completion/wstool-completion.bash -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/bash-completion/completions -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/zsh -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/zsh/vendor-completions -copying completion/_wstool -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/zsh/vendor-completions -copying completion/wstool-completion.bash -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/share/zsh/vendor-completions -running install_egg_info -running egg_info -writing src/wstool.egg-info/PKG-INFO -writing dependency_links to src/wstool.egg-info/dependency_links.txt -writing requirements to src/wstool.egg-info/requires.txt -writing top-level names to src/wstool.egg-info/top_level.txt -reading manifest file 'src/wstool.egg-info/SOURCES.txt' -reading manifest template 'MANIFEST.in' -writing manifest file 'src/wstool.egg-info/SOURCES.txt' -Copying src/wstool.egg-info to /build/ros-wstool-0.1.17/debian/python3-wstool/usr/lib/python3.7/dist-packages/wstool-0.1.17.egg-info -Skipping SOURCES.txt -running install_scripts -creating /build/ros-wstool-0.1.17/debian/python3-wstool/usr/bin -copying build/scripts-3.7/wstool -> /build/ros-wstool-0.1.17/debian/python3-wstool/usr/bin -changing mode of /build/ros-wstool-0.1.17/debian/python3-wstool/usr/bin/wstool to 755 -I: pybuild pybuild:298: rm -rf 'debian/python3-wstool/usr/bin' 'debian/python3-wstool/usr/share/bash-completion' 'debian/python3-wstool/usr/share/zsh' - dh_installdocs -O--buildsystem=pybuild - dh_installchangelogs -O--buildsystem=pybuild - dh_python2 -O--buildsystem=pybuild -I: dh_python2 tools:114: replacing shebang in debian/python-wstool/usr/bin/wstool - dh_python3 -O--buildsystem=pybuild - dh_installinit -O--buildsystem=pybuild - dh_perl -O--buildsystem=pybuild - dh_link -O--buildsystem=pybuild - dh_strip_nondeterminism -O--buildsystem=pybuild - dh_compress -O--buildsystem=pybuild - dh_fixperms -O--buildsystem=pybuild - dh_missing -O--buildsystem=pybuild - dh_installdeb -O--buildsystem=pybuild - dh_gencontrol -O--buildsystem=pybuild -dpkg-gencontrol: warning: package python-wstool: substitution variable ${python:Provides} unused, but is defined -dpkg-gencontrol: warning: package python-wstool: substitution variable ${python:Versions} unused, but is defined - dh_md5sums -O--buildsystem=pybuild - dh_builddeb -O--buildsystem=pybuild -dpkg-deb: building package 'python3-wstool' in '../python3-wstool_0.1.17-1_all.deb'. -dpkg-deb: building package 'python-wstool' in '../python-wstool_0.1.17-1_all.deb'. - dpkg-genbuildinfo --build=binary - dpkg-genchanges --build=binary >../ros-wstool_0.1.17-1_i386.changes -dpkg-genchanges: info: binary-only upload (no source code included) - dpkg-source --after-build . -dpkg-source: info: using options from ros-wstool-0.1.17/debian/source/options: --extend-diff-ignore=^[^/]*[.]egg-info/ -dpkg-buildpackage: info: binary-only upload (no source included) -dpkg-genchanges: info: including full source code in upload +E: pybuild pybuild:341: test: plugin distutils failed with: exit code=1: cd /build/ros-wstool-0.1.17/.pybuild/cpython2_2.7_wstool/build; python2.7 -m unittest discover -v +dh_auto_test: pybuild --test -i python{version} -p 2.7 returned exit code 13 +make: *** [debian/rules:7: binary] Error 25 +dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration +E: Failed autobuilding of package +I: user script /srv/workspace/pbuilder/39831/tmp/hooks/C01_cleanup starting +debug output: disk usage on i-capture-the-hostname at Tue Oct 4 17:29:08 UTC 2022 +Filesystem Size Used Avail Use% Mounted on +tmpfs 3.9G 0 3.9G 0% /dev/shm + +I: user script /srv/workspace/pbuilder/39831/tmp/hooks/C01_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/28084 and its subdirectories -I: Current time: Tue Aug 31 23:05:04 -12 2021 -I: pbuilder-time-stamp: 1630494304 +I: removing directory /srv/workspace/pbuilder/39831 and its subdirectories