* Package: dev-vcs/mercurial-1.7  * Repository: gentoo  * Maintainer: nelchael@gentoo.org djc@gentoo.org  * USE: arm elibc_glibc kernel_linux test userland_GNU >>> Unpacking source... >>> Unpacking mercurial-1.7.tar.gz to /var/tmp/portage/dev-vcs/mercurial-1.7/work >>> Source unpacked in /var/tmp/portage/dev-vcs/mercurial-1.7/work >>> Preparing source in /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7 ... >>> Source prepared. >>> Configuring source in /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7 ... >>> Source configured. >>> Compiling source in /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7 ... * Building of dev-vcs/mercurial-1.7 with CPython 2.6... python2.6 setup.py build -b build-2.6 running build running build_mo creating mercurial/locale creating mercurial/locale/zh_CN creating mercurial/locale/zh_CN/LC_MESSAGES generating mercurial/locale/zh_CN/LC_MESSAGES/hg.mo from i18n/zh_CN.po msgfmt -v -o mercurial/locale/zh_CN/LC_MESSAGES/hg.mo i18n/zh_CN.po -c 335 translated messages, 204 fuzzy translations, 1791 untranslated messages. creating mercurial/locale/de creating mercurial/locale/de/LC_MESSAGES generating mercurial/locale/de/LC_MESSAGES/hg.mo from i18n/de.po msgfmt -v -o mercurial/locale/de/LC_MESSAGES/hg.mo i18n/de.po -c 2245 translated messages, 237 fuzzy translations, 417 untranslated messages. creating mercurial/locale/pt_BR creating mercurial/locale/pt_BR/LC_MESSAGES generating mercurial/locale/pt_BR/LC_MESSAGES/hg.mo from i18n/pt_BR.po msgfmt -v -o mercurial/locale/pt_BR/LC_MESSAGES/hg.mo i18n/pt_BR.po -c 3026 translated messages. creating mercurial/locale/zh_TW creating mercurial/locale/zh_TW/LC_MESSAGES generating mercurial/locale/zh_TW/LC_MESSAGES/hg.mo from i18n/zh_TW.po msgfmt -v -o mercurial/locale/zh_TW/LC_MESSAGES/hg.mo i18n/zh_TW.po -c 640 translated messages, 8 fuzzy translations, 2372 untranslated messages. creating mercurial/locale/it creating mercurial/locale/it/LC_MESSAGES generating mercurial/locale/it/LC_MESSAGES/hg.mo from i18n/it.po msgfmt -v -o mercurial/locale/it/LC_MESSAGES/hg.mo i18n/it.po -c 1166 translated messages, 285 fuzzy translations, 1392 untranslated messages. creating mercurial/locale/da creating mercurial/locale/da/LC_MESSAGES generating mercurial/locale/da/LC_MESSAGES/hg.mo from i18n/da.po msgfmt -v -o mercurial/locale/da/LC_MESSAGES/hg.mo i18n/da.po -c 1855 translated messages, 1164 untranslated messages. creating mercurial/locale/el creating mercurial/locale/el/LC_MESSAGES generating mercurial/locale/el/LC_MESSAGES/hg.mo from i18n/el.po msgfmt -v -o mercurial/locale/el/LC_MESSAGES/hg.mo i18n/el.po -c 315 translated messages, 35 fuzzy translations, 1933 untranslated messages. creating mercurial/locale/sv creating mercurial/locale/sv/LC_MESSAGES generating mercurial/locale/sv/LC_MESSAGES/hg.mo from i18n/sv.po msgfmt -v -o mercurial/locale/sv/LC_MESSAGES/hg.mo i18n/sv.po -c 1188 translated messages, 1832 untranslated messages. creating mercurial/locale/fr creating mercurial/locale/fr/LC_MESSAGES generating mercurial/locale/fr/LC_MESSAGES/hg.mo from i18n/fr.po msgfmt -v -o mercurial/locale/fr/LC_MESSAGES/hg.mo i18n/fr.po -c 358 translated messages, 104 fuzzy translations, 1775 untranslated messages. creating mercurial/locale/ja creating mercurial/locale/ja/LC_MESSAGES generating mercurial/locale/ja/LC_MESSAGES/hg.mo from i18n/ja.po msgfmt -v -o mercurial/locale/ja/LC_MESSAGES/hg.mo i18n/ja.po -c 2526 translated messages, 493 untranslated messages. creating mercurial/locale/ro creating mercurial/locale/ro/LC_MESSAGES generating mercurial/locale/ro/LC_MESSAGES/hg.mo from i18n/ro.po msgfmt -v -o mercurial/locale/ro/LC_MESSAGES/hg.mo i18n/ro.po -c 517 translated messages, 5 fuzzy translations, 2350 untranslated messages. running build_py creating build-2.6 creating build-2.6/lib.linux-armv5tel-2.6 creating build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/__version__.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/changegroup.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/archival.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/ui.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/filemerge.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/help.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/hook.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/sshrepo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/parser.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/keepalive.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/localrepo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/extensions.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/minirst.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/templatekw.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/context.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/py3kcompat.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/config.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/hbisect.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/verify.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/win32.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/error.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/hg.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/mail.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/dagparser.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/util.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/node.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/repo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/tags.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/windows.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/lock.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/revlog.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/ancestor.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/ignore.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/cmdutil.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/patch.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/dirstate.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/subrepo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/strutil.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/demandimport.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/posix.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/byterange.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/bundlerepo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/changelog.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/encoding.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/httprepo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/lsprofcalltree.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/similar.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/match.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/commands.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/discovery.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/wireproto.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/templatefilters.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/fancyopts.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/repair.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/i18n.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/copies.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/url.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/pushkey.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/manifest.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/filelog.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/mdiff.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/sshserver.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/store.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/simplemerge.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/templater.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/revset.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/graphmod.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/dispatch.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/statichttprepo.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/transaction.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/merge.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial copying mercurial/lsprof.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial creating build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/hgweb_mod.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/server.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/webcommands.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/request.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/hgwebdir_mod.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/protocol.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/common.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/webutil.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb copying mercurial/hgweb/wsgicgi.py -> build-2.6/lib.linux-armv5tel-2.6/mercurial/hgweb creating build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/churn.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/hgk.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/fetch.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/win32mbcs.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/gpg.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/share.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/rebase.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/color.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/patchbomb.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/pager.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/bugzilla.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/eol.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/win32text.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/children.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/parentrevspec.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/schemes.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/relink.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/notify.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/purge.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/keyword.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/interhg.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/record.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/mq.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/bookmarks.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/transplant.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/extdiff.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/progress.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/graphlog.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/acl.py -> build-2.6/lib.linux-armv5tel-2.6/hgext copying hgext/hgcia.py -> build-2.6/lib.linux-armv5tel-2.6/hgext creating build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/bzr.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/cvsps.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/p4.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/hg.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/subversion.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/convcmd.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/gnuarch.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/darcs.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/transport.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/monotone.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/filemap.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/common.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/cvs.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert copying hgext/convert/git.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/convert creating build-2.6/lib.linux-armv5tel-2.6/hgext/highlight copying hgext/highlight/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/highlight copying hgext/highlight/highlight.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/highlight creating build-2.6/lib.linux-armv5tel-2.6/hgext/zeroconf copying hgext/zeroconf/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/zeroconf copying hgext/zeroconf/Zeroconf.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/zeroconf creating build-2.6/lib.linux-armv5tel-2.6/hgext/inotify copying hgext/inotify/server.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify copying hgext/inotify/client.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify copying hgext/inotify/common.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify copying hgext/inotify/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify copying hgext/inotify/linuxserver.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify creating build-2.6/lib.linux-armv5tel-2.6/hgext/inotify/linux copying hgext/inotify/linux/watcher.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify/linux copying hgext/inotify/linux/__init__.py -> build-2.6/lib.linux-armv5tel-2.6/hgext/inotify/linux creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/zh_CN creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/zh_CN/LC_MESSAGES copying mercurial/locale/zh_CN/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/zh_CN/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/de creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/de/LC_MESSAGES copying mercurial/locale/de/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/de/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/pt_BR creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/pt_BR/LC_MESSAGES copying mercurial/locale/pt_BR/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/pt_BR/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/zh_TW creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/zh_TW/LC_MESSAGES copying mercurial/locale/zh_TW/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/zh_TW/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/it creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/it/LC_MESSAGES copying mercurial/locale/it/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/it/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/da creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/da/LC_MESSAGES copying mercurial/locale/da/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/da/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/el creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/el/LC_MESSAGES copying mercurial/locale/el/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/el/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/sv creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/sv/LC_MESSAGES copying mercurial/locale/sv/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/sv/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/fr creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/fr/LC_MESSAGES copying mercurial/locale/fr/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/fr/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/ja creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/ja/LC_MESSAGES copying mercurial/locale/ja/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/ja/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/ro creating build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/ro/LC_MESSAGES copying mercurial/locale/ro/LC_MESSAGES/hg.mo -> build-2.6/lib.linux-armv5tel-2.6/mercurial/locale/ro/LC_MESSAGES creating build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/revsets.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/config.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/extensions.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/merge-tools.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/multirevs.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/glossary.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/hgweb.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/revisions.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/diffs.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/subrepos.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/templates.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/urls.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/environment.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/patterns.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help copying mercurial/help/dates.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/help creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates copying mercurial/templates/map-cmdline.changelog -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates copying mercurial/templates/map-cmdline.compact -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates copying mercurial/templates/template-vars.txt -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates copying mercurial/templates/map-cmdline.default -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates copying mercurial/templates/map-cmdline.xml -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/style.css -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/excanvas.js -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/coal-file.png -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/hgicon.png -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/coal-folder.png -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/hglogo.png -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/background.png -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/style-paper.css -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/style-gitweb.css -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/graph.js -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/style-coal.css -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static copying mercurial/templates/static/style-monoblue.css -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/static creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/coal copying mercurial/templates/coal/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/coal copying mercurial/templates/coal/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/coal creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/footer.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/filelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/changelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/helptopics.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/index.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/tags.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/help.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/branches.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/changelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/filerevision.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/changeset.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/notfound.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/filediff.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/manifest.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/shortlog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/graph.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/fileannotate.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/search.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/summary.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue copying mercurial/templates/monoblue/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/monoblue creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/filelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/changelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/tags.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/changelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/tagentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom copying mercurial/templates/atom/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/atom creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/index.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/changeset.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/notfound.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/filediff.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/manifest.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/fileannotate.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw copying mercurial/templates/raw/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/raw creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/footer.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/filelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/filelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/helptopics.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/index.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/tags.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/help.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/branches.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/filerevision.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/changeset.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/notfound.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/shortlogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/filediff.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/manifest.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/shortlog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/graph.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/fileannotate.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/search.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper copying mercurial/templates/paper/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/paper creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/filelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/filelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/changelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/tags.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/changelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/tagentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss copying mercurial/templates/rss/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/rss creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/footer.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/filelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/filelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/changelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/index.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/tags.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/branches.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/changelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/filerevision.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/changeset.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/notfound.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/shortlogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/filediff.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/manifest.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/shortlog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/graph.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/fileannotate.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/search.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan copying mercurial/templates/spartan/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/spartan creating build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/footer.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/filelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/error.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/changelog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/helptopics.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/index.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/header.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/tags.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/help.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/branches.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/changelogentry.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/filerevision.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/changeset.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/notfound.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/filediff.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/manifest.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/shortlog.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/graph.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/fileannotate.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/search.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/summary.tmpl -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb copying mercurial/templates/gitweb/map -> build-2.6/lib.linux-armv5tel-2.6/mercurial/templates/gitweb warning: hgbuildpy: byte-compiling is disabled, skipping. running build_ext building 'mercurial.base85' extension creating build-2.6/temp.linux-armv5tel-2.6 creating build-2.6/temp.linux-armv5tel-2.6/mercurial armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -I/usr/include/python2.6 -c mercurial/base85.c -o build-2.6/temp.linux-armv5tel-2.6/mercurial/base85.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/mercurial/base85.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/mercurial/base85.so building 'mercurial.bdiff' extension armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -I/usr/include/python2.6 -c mercurial/bdiff.c -o build-2.6/temp.linux-armv5tel-2.6/mercurial/bdiff.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/mercurial/bdiff.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/mercurial/bdiff.so building 'mercurial.diffhelpers' extension armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -I/usr/include/python2.6 -c mercurial/diffhelpers.c -o build-2.6/temp.linux-armv5tel-2.6/mercurial/diffhelpers.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/mercurial/diffhelpers.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/mercurial/diffhelpers.so building 'mercurial.mpatch' extension armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -I/usr/include/python2.6 -c mercurial/mpatch.c -o build-2.6/temp.linux-armv5tel-2.6/mercurial/mpatch.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/mercurial/mpatch.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/mercurial/mpatch.so building 'mercurial.parsers' extension armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -I/usr/include/python2.6 -c mercurial/parsers.c -o build-2.6/temp.linux-armv5tel-2.6/mercurial/parsers.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/mercurial/parsers.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/mercurial/parsers.so building 'mercurial.osutil' extension armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -I/usr/include/python2.6 -c mercurial/osutil.c -o build-2.6/temp.linux-armv5tel-2.6/mercurial/osutil.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/mercurial/osutil.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/mercurial/osutil.so building 'hgext.inotify.linux._inotify' extension creating build-2.6/temp.linux-armv5tel-2.6/hgext creating build-2.6/temp.linux-armv5tel-2.6/hgext/inotify creating build-2.6/temp.linux-armv5tel-2.6/hgext/inotify/linux armv5tel-softfloat-linux-gnueabi-gcc -pthread -O2 -march=armv5te -pipe -fno-strict-aliasing -fPIC -Imercurial -I/usr/include/python2.6 -c hgext/inotify/linux/_inotify.c -o build-2.6/temp.linux-armv5tel-2.6/hgext/inotify/linux/_inotify.o armv5tel-softfloat-linux-gnueabi-gcc -pthread -shared -Wl,-O1 -Wl,--as-needed -O2 -march=armv5te -pipe -fno-strict-aliasing build-2.6/temp.linux-armv5tel-2.6/hgext/inotify/linux/_inotify.o -L/usr/lib -lpython2.6 -o build-2.6/lib.linux-armv5tel-2.6/hgext/inotify/linux/_inotify.so running build_scripts creating build-2.6/scripts-2.6 copying and adjusting hg -> build-2.6/scripts-2.6 changing mode of build-2.6/scripts-2.6/hg from 644 to 755 >>> Source compiled. * Testing of dev-vcs/mercurial-1.7 with CPython 2.6... .... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-586.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-586.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-586.t.err @@ -1,89 +1,6 @@ + + ### Abort: timeout after 180 seconds. Issue586: removing remote files after merge appears to corrupt the dirstate $ hg init a - $ cd a - $ echo a > a - $ hg ci -Ama - adding a - - $ hg init ../b - $ cd ../b - $ echo b > b - $ hg ci -Amb - adding b - - $ hg pull -f ../a - pulling from ../a - searching for changes - warning: repository is unrelated - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg merge - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg rm -f a - $ hg ci -Amc - - $ hg st -A - C b - $ cd .. - -Issue1433: Traceback after two unrelated pull, two move, a merge and -a commit (related to issue586) - -create test repos - - $ hg init repoa - $ touch repoa/a - $ hg -R repoa ci -Am adda - adding a - - $ hg init repob - $ touch repob/b - $ hg -R repob ci -Am addb - adding b - - $ hg init repoc - $ cd repoc - $ hg pull ../repoa - pulling from ../repoa - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - $ hg update - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ mkdir tst - $ hg mv * tst - $ hg ci -m "import a in tst" - $ hg pull -f ../repob - pulling from ../repob - searching for changes - warning: repository is unrelated - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -merge both repos - - $ hg merge - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ mkdir src - -move b content - - $ hg mv b src - $ hg ci -m "import b in src" - $ hg manifest - src/b - tst/a - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-acl.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-acl.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-acl.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. > do_push() > { > user=$1 @@ -45,1691 +47,3 @@ > } $ hg init a - $ cd a - $ mkdir foo foo/Bar quux - $ echo 'in foo' > foo/file.txt - $ echo 'in foo/Bar' > foo/Bar/file.txt - $ echo 'in quux' > quux/file.py - $ hg add -q - $ hg ci -m 'add files' -d '1000000 0' - $ echo >> foo/file.txt - $ hg ci -m 'change foo/file' -d '1000001 0' - $ echo >> foo/Bar/file.txt - $ hg ci -m 'change foo/Bar/file' -d '1000002 0' - $ echo >> quux/file.py - $ hg ci -m 'change quux/file' -d '1000003 0' - $ hg tip --quiet - 3:911600dab2ae - - $ cd .. - $ hg clone -r 0 a b - adding changesets - adding manifests - adding file changes - added 1 changesets with 3 changes to 3 files - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - - $ echo '[extensions]' >> $HGRCPATH - $ echo 'acl =' >> $HGRCPATH - - $ config=b/.hg/hgrc - -Extension disabled for lack of a hook - - $ do_push fred - Pushing as user fred - hgrc = """ - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - - $ echo '[hooks]' >> $config - $ echo 'pretxnchangegroup.acl = python:hgext.acl.hook' >> $config - -Extension disabled for lack of acl.sources - - $ do_push fred - Pushing as user fred - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: changes have source "push" - skipping - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - -No [acl.allow]/[acl.deny] - - $ echo '[acl]' >> $config - $ echo 'sources = push' >> $config - $ do_push fred - Pushing as user fred - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow not enabled - acl: acl.deny not enabled - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: allowing changeset 911600dab2ae - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - -Empty [acl.allow] - - $ echo '[acl.allow]' >> $config - $ do_push fred - Pushing as user fred - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 0 entries for user fred - acl: acl.deny not enabled - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: user fred not allowed on foo/file.txt - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset ef1ea85a6374 - transaction abort! - rollback completed - abort: acl: access denied for changeset ef1ea85a6374 - no rollback information available - 0:6675d58eff77 - - -fred is allowed inside foo/ - - $ echo 'foo/** = fred' >> $config - $ do_push fred - Pushing as user fred - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user fred - acl: acl.deny not enabled - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: user fred not allowed on quux/file.py - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset 911600dab2ae - transaction abort! - rollback completed - abort: acl: access denied for changeset 911600dab2ae - no rollback information available - 0:6675d58eff77 - - -Empty [acl.deny] - - $ echo '[acl.deny]' >> $config - $ do_push barney - Pushing as user barney - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 0 entries for user barney - acl: acl.deny enabled, 0 entries for user barney - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: user barney not allowed on foo/file.txt - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset ef1ea85a6374 - transaction abort! - rollback completed - abort: acl: access denied for changeset ef1ea85a6374 - no rollback information available - 0:6675d58eff77 - - -fred is allowed inside foo/, but not foo/bar/ (case matters) - - $ echo 'foo/bar/** = fred' >> $config - $ do_push fred - Pushing as user fred - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user fred - acl: acl.deny enabled, 1 entries for user fred - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: user fred not allowed on quux/file.py - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset 911600dab2ae - transaction abort! - rollback completed - abort: acl: access denied for changeset 911600dab2ae - no rollback information available - 0:6675d58eff77 - - -fred is allowed inside foo/, but not foo/Bar/ - - $ echo 'foo/Bar/** = fred' >> $config - $ do_push fred - Pushing as user fred - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user fred - acl: acl.deny enabled, 2 entries for user fred - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: user fred denied on foo/Bar/file.txt - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset f9cafe1212c8 - transaction abort! - rollback completed - abort: acl: access denied for changeset f9cafe1212c8 - no rollback information available - 0:6675d58eff77 - - - $ echo 'barney is not mentioned => not allowed anywhere' - barney is not mentioned => not allowed anywhere - $ do_push barney - Pushing as user barney - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 0 entries for user barney - acl: acl.deny enabled, 0 entries for user barney - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: user barney not allowed on foo/file.txt - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset ef1ea85a6374 - transaction abort! - rollback completed - abort: acl: access denied for changeset ef1ea85a6374 - no rollback information available - 0:6675d58eff77 - - -barney is allowed everywhere - - $ echo '[acl.allow]' >> $config - $ echo '** = barney' >> $config - $ do_push barney - Pushing as user barney - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - [acl.allow] - ** = barney - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user barney - acl: acl.deny enabled, 0 entries for user barney - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: allowing changeset 911600dab2ae - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - -wilma can change files with a .txt extension - - $ echo '**/*.txt = wilma' >> $config - $ do_push wilma - Pushing as user wilma - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - [acl.allow] - ** = barney - **/*.txt = wilma - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user wilma - acl: acl.deny enabled, 0 entries for user wilma - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: user wilma not allowed on quux/file.py - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset 911600dab2ae - transaction abort! - rollback completed - abort: acl: access denied for changeset 911600dab2ae - no rollback information available - 0:6675d58eff77 - - -file specified by acl.config does not exist - - $ echo '[acl]' >> $config - $ echo 'config = ../acl.config' >> $config - $ do_push barney - Pushing as user barney - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - [acl.allow] - ** = barney - **/*.txt = wilma - [acl] - config = ../acl.config - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config' - transaction abort! - rollback completed - abort: No such file or directory: ../acl.config - no rollback information available - 0:6675d58eff77 - - -betty is allowed inside foo/ by a acl.config file - - $ echo '[acl.allow]' >> acl.config - $ echo 'foo/** = betty' >> acl.config - $ do_push betty - Pushing as user betty - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - [acl.allow] - ** = barney - **/*.txt = wilma - [acl] - config = ../acl.config - """ - acl.config = """ - [acl.allow] - foo/** = betty - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user betty - acl: acl.deny enabled, 0 entries for user betty - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: user betty not allowed on quux/file.py - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset 911600dab2ae - transaction abort! - rollback completed - abort: acl: access denied for changeset 911600dab2ae - no rollback information available - 0:6675d58eff77 - - -acl.config can set only [acl.allow]/[acl.deny] - - $ echo '[hooks]' >> acl.config - $ echo 'changegroup.acl = false' >> acl.config - $ do_push barney - Pushing as user barney - hgrc = """ - [hooks] - pretxnchangegroup.acl = python:hgext.acl.hook - [acl] - sources = push - [acl.allow] - foo/** = fred - [acl.deny] - foo/bar/** = fred - foo/Bar/** = fred - [acl.allow] - ** = barney - **/*.txt = wilma - [acl] - config = ../acl.config - """ - acl.config = """ - [acl.allow] - foo/** = betty - [hooks] - changegroup.acl = false - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user barney - acl: acl.deny enabled, 0 entries for user barney - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: allowing changeset 911600dab2ae - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - -asterisk - - $ init_config - -asterisk test - - $ echo '[acl.allow]' >> $config - $ echo "** = fred" >> $config - -fred is always allowed - - $ do_push fred - Pushing as user fred - hgrc = """ - [acl] - sources = push - [extensions] - [acl.allow] - ** = fred - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user fred - acl: acl.deny not enabled - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: allowing changeset 911600dab2ae - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - - $ echo '[acl.deny]' >> $config - $ echo "foo/Bar/** = *" >> $config - -no one is allowed inside foo/Bar/ - - $ do_push fred - Pushing as user fred - hgrc = """ - [acl] - sources = push - [extensions] - [acl.allow] - ** = fred - [acl.deny] - foo/Bar/** = * - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: acl.allow enabled, 1 entries for user fred - acl: acl.deny enabled, 1 entries for user fred - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: user fred denied on foo/Bar/file.txt - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset f9cafe1212c8 - transaction abort! - rollback completed - abort: acl: access denied for changeset f9cafe1212c8 - no rollback information available - 0:6675d58eff77 - - -Groups - - $ init_config - -OS-level groups - - $ echo '[acl.allow]' >> $config - $ echo "** = @group1" >> $config - -@group1 is always allowed - - $ do_push fred - Pushing as user fred - hgrc = """ - [acl] - sources = push - [extensions] - [acl.allow] - ** = @group1 - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: "group1" not defined in [acl.groups] - acl: acl.allow enabled, 1 entries for user fred - acl: acl.deny not enabled - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: allowing changeset f9cafe1212c8 - acl: branch access granted: "911600dab2ae" on branch "default" - acl: allowing changeset 911600dab2ae - updating the branch cache - rolling back to revision 0 (undo push) - 0:6675d58eff77 - - - $ echo '[acl.deny]' >> $config - $ echo "foo/Bar/** = @group1" >> $config - -@group is allowed inside anything but foo/Bar/ - - $ do_push fred - Pushing as user fred - hgrc = """ - [acl] - sources = push - [extensions] - [acl.allow] - ** = @group1 - [acl.deny] - foo/Bar/** = @group1 - """ - pushing to ../b - searching for changes - common changesets up to 6675d58eff77 - invalidating branch cache (tip differs) - 3 changesets found - list of changesets: - ef1ea85a6374b77d6da9dcda9541f498f2d17df7 - f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd - 911600dab2ae7a9baff75958b84fe606851ce955 - adding changesets - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling changes: 7 chunks - bundling changes: 8 chunks - bundling changes: 9 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling manifests: 7 chunks - bundling manifests: 8 chunks - bundling manifests: 9 chunks - bundling files: foo/Bar/file.txt 0 chunks - bundling files: foo/Bar/file.txt 1 chunks - bundling files: foo/Bar/file.txt 2 chunks - bundling files: foo/Bar/file.txt 3 chunks - bundling files: foo/file.txt 4 chunks - bundling files: foo/file.txt 5 chunks - bundling files: foo/file.txt 6 chunks - bundling files: foo/file.txt 7 chunks - bundling files: quux/file.py 8 chunks - bundling files: quux/file.py 9 chunks - bundling files: quux/file.py 10 chunks - bundling files: quux/file.py 11 chunks - changesets: 1 chunks - add changeset ef1ea85a6374 - changesets: 2 chunks - add changeset f9cafe1212c8 - changesets: 3 chunks - add changeset 911600dab2ae - adding manifests - manifests: 1/3 chunks (33.33%) - manifests: 2/3 chunks (66.67%) - manifests: 3/3 chunks (100.00%) - adding file changes - adding foo/Bar/file.txt revisions - files: 1/3 chunks (33.33%) - adding foo/file.txt revisions - files: 2/3 chunks (66.67%) - adding quux/file.py revisions - files: 3/3 chunks (100.00%) - added 3 changesets with 3 changes to 3 files - calling hook pretxnchangegroup.acl: hgext.acl.hook - acl: acl.allow.branches not enabled - acl: acl.deny.branches not enabled - acl: "group1" not defined in [acl.groups] - acl: acl.allow enabled, 1 entries for user fred - acl: "group1" not defined in [acl.groups] - acl: acl.deny enabled, 1 entries for user fred - acl: branch access granted: "ef1ea85a6374" on branch "default" - acl: allowing changeset ef1ea85a6374 - acl: branch access granted: "f9cafe1212c8" on branch "default" - acl: user fred denied on foo/Bar/file.txt - error: pretxnchangegroup.acl hook failed: acl: access denied for changeset f9cafe1212c8 - transaction abort! - rollback completed - abort: acl: access denied for changeset f9cafe1212c8 - no rollback information available - 0:6675d58eff77 - - -Invalid group - -Disable the fakegroups trick to get real failures - - $ grep -v fakegroups $config > config.tmp - $ mv config.tmp $config - $ echo '[acl.allow]' >> $config - $ echo "** = @unlikelytoexist" >> $config - $ do_push fred 2>&1 | grep unlikelytoexist - ** = @unlikelytoexist - acl: "unlikelytoexist" not defined in [acl.groups] - error: pretxnchangegroup.acl hook failed: group 'unlikelytoexist' is undefined - abort: group 'unlikelytoexist' is undefined ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-add.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-add.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-add.t.err @@ -1,99 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init a - $ cd a - $ echo a > a - $ hg add -n - adding a - $ hg st - ? a - $ hg add - adding a - $ hg st - A a - $ hg forget a - $ hg add - adding a - $ hg st - A a - - $ echo b > b - $ hg add -n b - $ hg st - A a - ? b - $ hg add b - $ hg st - A a - A b - -should fail - - $ hg add b - b already tracked! - $ hg st - A a - A b - - $ hg ci -m 0 --traceback - -should fail - - $ hg add a - a already tracked! - - $ echo aa > a - $ hg ci -m 1 - $ hg up 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo aaa > a - $ hg ci -m 2 - created new head - - $ hg merge - merging a - warning: conflicts during merge. - merging a failed! - 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon - [1] - $ hg st - M a - ? a.orig - -should fail - - $ hg add a - a already tracked! - $ hg st - M a - ? a.orig - $ hg resolve -m a - $ hg ci -m merge - -Issue683: peculiarity with hg revert of an removed then added file - - $ hg forget a - $ hg add a - $ hg st - ? a.orig - $ hg rm a - $ hg st - R a - ? a.orig - $ echo a > a - $ hg add a - $ hg st - M a - ? a.orig - - $ hg add c && echo "unexpected addition of missing file" - c: No such file or directory - [1] - $ echo c > c - $ hg add d c && echo "unexpected addition of missing file" - d: No such file or directory - [1] - $ hg st - M a - A c - ? a.orig - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-archive.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-archive.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-archive.t.err @@ -1,235 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ mkdir test - $ cd test - $ hg init - $ echo foo>foo - $ hg commit -Am 1 -d '1 0' - adding foo - $ echo bar>bar - $ hg commit -Am 2 -d '2 0' - adding bar - $ mkdir baz - $ echo bletch>baz/bletch - $ hg commit -Am 3 -d '1000000000 0' - adding baz/bletch - $ echo "[web]" >> .hg/hgrc - $ echo "name = test-archive" >> .hg/hgrc - $ cp .hg/hgrc .hg/hgrc-base - > test_archtype() { - > echo "allow_archive = $1" >> .hg/hgrc - > hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log - > cat hg.pid >> $DAEMON_PIDS - > echo % $1 allowed should give 200 - > "$TESTDIR/get-with-headers.py" localhost:$HGPORT "/archive/tip.$2" | head -n 1 - > echo % $3 and $4 disallowed should both give 403 - > "$TESTDIR/get-with-headers.py" localhost:$HGPORT "/archive/tip.$3" | head -n 1 - > "$TESTDIR/get-with-headers.py" localhost:$HGPORT "/archive/tip.$4" | head -n 1 - > "$TESTDIR/killdaemons.py" - > cat errors.log - > cp .hg/hgrc-base .hg/hgrc - > } - -check http return codes - - - $ test_archtype gz tar.gz tar.bz2 zip - % gz allowed should give 200 - 200 Script output follows - % tar.bz2 and zip disallowed should both give 403 - 403 Archive type not allowed: bz2 - 403 Archive type not allowed: zip - $ test_archtype bz2 tar.bz2 zip tar.gz - % bz2 allowed should give 200 - 200 Script output follows - % zip and tar.gz disallowed should both give 403 - 403 Archive type not allowed: zip - 403 Archive type not allowed: gz - $ test_archtype zip zip tar.gz tar.bz2 - % zip allowed should give 200 - 200 Script output follows - % tar.gz and tar.bz2 disallowed should both give 403 - 403 Archive type not allowed: gz - 403 Archive type not allowed: bz2 - - $ echo "allow_archive = gz bz2 zip" >> .hg/hgrc - $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log - $ cat hg.pid >> $DAEMON_PIDS - -invalid arch type should give 404 - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT "/archive/tip.invalid" | head -n 1 - 404 Unsupported archive type: None - - $ TIP=`hg id -v | cut -f1 -d' '` - $ QTIP=`hg id -q` - $ cat > getarchive.py < import os, sys, urllib2 - > try: - > # Set stdout to binary mode for win32 platforms - > import msvcrt - > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - > except ImportError: - > pass - > node, archive = sys.argv[1:] - > f = urllib2.urlopen('http://127.0.0.1:%s/?cmd=archive;node=%s;type=%s' - > % (os.environ['HGPORT'], node, archive)) - > sys.stdout.write(f.read()) - > EOF - $ python getarchive.py "$TIP" gz | gunzip | tar tf - 2>/dev/null - test-archive-2c0277f05ed4/.hg_archival.txt - test-archive-2c0277f05ed4/bar - test-archive-2c0277f05ed4/baz/bletch - test-archive-2c0277f05ed4/foo - $ python getarchive.py "$TIP" bz2 | bunzip2 | tar tf - 2>/dev/null - test-archive-2c0277f05ed4/.hg_archival.txt - test-archive-2c0277f05ed4/bar - test-archive-2c0277f05ed4/baz/bletch - test-archive-2c0277f05ed4/foo - $ python getarchive.py "$TIP" zip > archive.zip - $ unzip -t archive.zip - Archive: archive.zip - testing: test-archive-2c0277f05ed4/.hg_archival.txt OK - testing: test-archive-2c0277f05ed4/bar OK - testing: test-archive-2c0277f05ed4/baz/bletch OK - testing: test-archive-2c0277f05ed4/foo OK - No errors detected in compressed data of archive.zip. - - $ "$TESTDIR/killdaemons.py" - - $ hg archive -t tar test.tar - $ tar tf test.tar - test/.hg_archival.txt - test/bar - test/baz/bletch - test/foo - - $ hg archive -t tbz2 -X baz test.tar.bz2 - $ bunzip2 -dc test.tar.bz2 | tar tf - 2>/dev/null - test/.hg_archival.txt - test/bar - test/foo - - $ hg archive -t tgz -p %b-%h test-%h.tar.gz - $ gzip -dc test-$QTIP.tar.gz | tar tf - 2>/dev/null - test-2c0277f05ed4/.hg_archival.txt - test-2c0277f05ed4/bar - test-2c0277f05ed4/baz/bletch - test-2c0277f05ed4/foo - - $ hg archive autodetected_test.tar - $ tar tf autodetected_test.tar - autodetected_test/.hg_archival.txt - autodetected_test/bar - autodetected_test/baz/bletch - autodetected_test/foo - -The '-t' should override autodetection - - $ hg archive -t tar autodetect_override_test.zip - $ tar tf autodetect_override_test.zip - autodetect_override_test.zip/.hg_archival.txt - autodetect_override_test.zip/bar - autodetect_override_test.zip/baz/bletch - autodetect_override_test.zip/foo - - $ for ext in tar tar.gz tgz tar.bz2 tbz2 zip; do - > hg archive auto_test.$ext - > if [ -d auto_test.$ext ]; then - > echo "extension $ext was not autodetected." - > fi - > done - - $ cat > md5comp.py < try: - > from hashlib import md5 - > except ImportError: - > from md5 import md5 - > import sys - > f1, f2 = sys.argv[1:3] - > h1 = md5(file(f1, 'rb').read()).hexdigest() - > h2 = md5(file(f2, 'rb').read()).hexdigest() - > print h1 == h2 or "md5 differ: " + repr((h1, h2)) - > EOF - -archive name is stored in the archive, so create similar - -archives and rename them afterwards. - - $ hg archive -t tgz tip.tar.gz - $ mv tip.tar.gz tip1.tar.gz - $ sleep 1 - $ hg archive -t tgz tip.tar.gz - $ mv tip.tar.gz tip2.tar.gz - $ python md5comp.py tip1.tar.gz tip2.tar.gz - True - - $ hg archive -t zip -p /illegal test.zip - abort: archive prefix contains illegal components - [255] - $ hg archive -t zip -p very/../bad test.zip - - $ hg archive --config ui.archivemeta=false -t zip -r 2 test.zip - $ unzip -t test.zip - Archive: test.zip - testing: test/bar OK - testing: test/baz/bletch OK - testing: test/foo OK - No errors detected in compressed data of test.zip. - - $ hg archive -t tar - | tar tf - 2>/dev/null - test-2c0277f05ed4/.hg_archival.txt - test-2c0277f05ed4/bar - test-2c0277f05ed4/baz/bletch - test-2c0277f05ed4/foo - - $ hg archive -r 0 -t tar rev-%r.tar - $ if [ -f rev-0.tar ]; then - $ fi - -test .hg_archival.txt - - $ hg archive ../test-tags - $ cat ../test-tags/.hg_archival.txt - repo: daa7f7c60e0a224faa4ff77ca41b2760562af264 - node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e - branch: default - latesttag: null - latesttagdistance: 3 - $ hg tag -r 2 mytag - $ hg tag -r 2 anothertag - $ hg archive -r 2 ../test-lasttag - $ cat ../test-lasttag/.hg_archival.txt - repo: daa7f7c60e0a224faa4ff77ca41b2760562af264 - node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e - branch: default - tag: anothertag - tag: mytag - - $ hg archive -t bogus test.bogus - abort: unknown archive type 'bogus' - [255] - -server errors - - $ cat errors.log - -empty repo - - $ hg init ../empty - $ cd ../empty - $ hg archive ../test-empty - abort: no working directory: please specify a revision - [255] -old file -- date clamped to 1980 - - $ touch -t 197501010000 old - $ hg add old - $ hg commit -m old - $ hg archive ../old.zip - $ unzip -l ../old.zip - Archive: ../old.zip - \s*Length.* (re) - *-----* (glob) - *147*80*00:00*old/.hg_archival.txt (glob) - *0*80*00:00*old/old (glob) - *-----* (glob) - \s*147\s+2 files (re) !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-addremove-similar.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-addremove-similar.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-addremove-similar.t.err @@ -1,100 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init rep; cd rep - - $ touch empty-file - $ python -c 'for x in range(10000): print x' > large-file - - $ hg addremove - adding empty-file - adding large-file - - $ hg commit -m A - - $ rm large-file empty-file - $ python -c 'for x in range(10,10000): print x' > another-file - - $ hg addremove -s50 - adding another-file - removing empty-file - removing large-file - recording removal of large-file as rename to another-file (99% similar) - - $ hg commit -m B - -comparing two empty files caused ZeroDivisionError in the past - - $ hg update -C 0 - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ rm empty-file - $ touch another-empty-file - $ hg addremove -s50 - adding another-empty-file - removing empty-file - - $ cd .. - - $ hg init rep2; cd rep2 - - $ python -c 'for x in range(10000): print x' > large-file - $ python -c 'for x in range(50): print x' > tiny-file - - $ hg addremove - adding large-file - adding tiny-file - - $ hg commit -m A - - $ python -c 'for x in range(70): print x' > small-file - $ rm tiny-file - $ rm large-file - - $ hg addremove -s50 - removing large-file - adding small-file - removing tiny-file - recording removal of tiny-file as rename to small-file (82% similar) - - $ hg commit -m B - -should all fail - - $ hg addremove -s foo - abort: similarity must be a number - [255] - $ hg addremove -s -1 - abort: similarity must be between 0 and 100 - [255] - $ hg addremove -s 1e6 - abort: similarity must be between 0 and 100 - [255] - - $ cd .. - -Issue1527: repeated addremove causes util.Abort - - $ hg init rep3; cd rep3 - $ mkdir d - $ echo a > d/a - $ hg add d/a - $ hg commit -m 1 - - $ mv d/a d/b - $ hg addremove -s80 - removing d/a - adding d/b - recording removal of d/a as rename to d/b (100% similar) - $ hg debugstate - r 0 0 1970-01-01 00:00:00 d/a - a 0 -1 unset d/b - copy: d/a -> d/b - $ mv d/b c - -no copies found here (since the target isn't in d - - $ hg addremove -s80 d - removing d/b - -copies here - - $ hg addremove -s80 - adding c - recording removal of d/a as rename to c (100% similar) !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-alias.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-alias.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-alias.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. $ cat >> $HGRCPATH < [extensions] > graphlog= @@ -35,311 +37,3 @@ > lognull = -q > log = -v > EOF - - -basic - - $ hg myinit alias - - -unknown - - $ hg unknown - alias 'unknown' resolves to unknown command 'bargle' - $ hg help unknown - alias 'unknown' resolves to unknown command 'bargle' - - -ambiguous - - $ hg ambiguous - alias 'ambiguous' resolves to ambiguous command 's' - $ hg help ambiguous - alias 'ambiguous' resolves to ambiguous command 's' - - -recursive - - $ hg recursive - alias 'recursive' resolves to unknown command 'recursive' - $ hg help recursive - alias 'recursive' resolves to unknown command 'recursive' - - -no definition - - $ hg nodef - no definition for alias 'nodefinition' - $ hg help nodef - no definition for alias 'nodefinition' - - -invalid options - - $ hg no--cwd - error in definition for alias 'no--cwd': --cwd may only be given on the command line - $ hg help no--cwd - error in definition for alias 'no--cwd': --cwd may only be given on the command line - $ hg no-R - error in definition for alias 'no-R': -R may only be given on the command line - $ hg help no-R - error in definition for alias 'no-R': -R may only be given on the command line - $ hg no--repo - error in definition for alias 'no--repo': --repo may only be given on the command line - $ hg help no--repo - error in definition for alias 'no--repo': --repo may only be given on the command line - $ hg no--repository - error in definition for alias 'no--repository': --repository may only be given on the command line - $ hg help no--repository - error in definition for alias 'no--repository': --repository may only be given on the command line - - $ cd alias - - -no usage - - $ hg nousage - no rollback information available - - $ echo foo > foo - $ hg ci -Amfoo - adding foo - - -with opts - - $ hg cleanst - C foo - - -with opts and whitespace - - $ hg shortlog - 0 e63c23eaa88a | 1970-01-01 00:00 +0000 - - -interaction with defaults - - $ hg mylog - 0:e63c23eaa88a - $ hg lognull - -1:000000000000 - - -properly recursive - - $ hg dln - changeset: -1:0000000000000000000000000000000000000000 - parent: -1:0000000000000000000000000000000000000000 - parent: -1:0000000000000000000000000000000000000000 - manifest: -1:0000000000000000000000000000000000000000 - user: - date: Thu Jan 01 00:00:00 1970 +0000 - extra: branch=default - - - -path expanding - - $ FOO=`pwd` hg put - $ cat 0.diff - # HG changeset patch - # User test - # Date 0 0 - # Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0 - # Parent 0000000000000000000000000000000000000000 - foo - - diff -r 000000000000 -r e63c23eaa88a foo - --- /dev/null Thu Jan 01 00:00:00 1970 +0000 - +++ b/foo Thu Jan 01 00:00:00 1970 +0000 - @@ -0,0 +1,1 @@ - +foo - - -simple shell aliases - - $ hg blank - - $ hg blank foo - - $ hg self - self - $ hg echo - - $ hg echo foo - foo - $ hg echo 'test $2' foo - test $2 foo - $ hg echo1 foo bar baz - foo - $ hg echo2 foo bar baz - bar - $ hg echo13 foo bar baz test - foo baz - $ hg echo2 foo - - $ echo bar > bar - $ hg ci -qA -m bar - $ hg count . - 1 - $ hg count 'branch(default)' - 2 - $ hg mcount -r '"branch(default)"' - 2 - - $ hg tglog - @ 1:7e7f92de180e: 'bar' - | - o 0:e63c23eaa88a: 'foo' - - -shell aliases with global options - - $ hg init sub - $ cd sub - $ hg count 'branch(default)' - 0 - $ hg -v count 'branch(default)' - 0 - $ hg -R .. count 'branch(default)' - 0 - $ hg --cwd .. count 'branch(default)' - 2 - $ hg echo --cwd .. - --cwd .. - - -repo specific shell aliases - - $ cat >> .hg/hgrc < [alias] - > subalias = !echo sub \$@ - > EOF - $ cat >> ../.hg/hgrc < [alias] - > mainalias = !echo main \$@ - > EOF - - -shell alias defined in current repo - - $ hg subalias - sub - $ hg --cwd .. subalias > /dev/null - hg: unknown command 'subalias' - [255] - $ hg -R .. subalias > /dev/null - hg: unknown command 'subalias' - [255] - - -shell alias defined in other repo - - $ hg mainalias > /dev/null - hg: unknown command 'mainalias' - [255] - $ hg -R .. mainalias - main - $ hg --cwd .. mainalias - main - - -invalid arguments - - $ hg rt foo - hg rt: invalid arguments - hg rt - - alias for: hg root - - print the root (top) of the current working directory - - Print the root directory of the current repository. - - Returns 0 on success. - - use "hg -v help rt" to show global options - [255] - -invalid global arguments for normal commands, aliases, and shell aliases - - $ hg --invalid root - hg: option --invalid not recognized - Mercurial Distributed SCM - - basic commands: - - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) - - use "hg help" for the full list of commands or "hg -v" for details - [255] - $ hg --invalid mylog - hg: option --invalid not recognized - Mercurial Distributed SCM - - basic commands: - - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) - - use "hg help" for the full list of commands or "hg -v" for details - [255] - $ hg --invalid blank - hg: option --invalid not recognized - Mercurial Distributed SCM - - basic commands: - - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge working directory with another revision - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) - - use "hg help" for the full list of commands or "hg -v" for details - [255] - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-annotate.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-annotate.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-annotate.t.err @@ -1,230 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ HGMERGE=true; export HGMERGE - -init - - $ hg init - -commit - - $ echo 'a' > a - $ hg ci -A -m test -u nobody -d '1 0' - adding a - -annotate -c - - $ hg annotate -c a - 8435f90966e4: a - -annotate -cl - - $ hg annotate -cl a - 8435f90966e4:1: a - -annotate -d - - $ hg annotate -d a - Thu Jan 01 00:00:01 1970 +0000: a - -annotate -n - - $ hg annotate -n a - 0: a - -annotate -nl - - $ hg annotate -nl a - 0:1: a - -annotate -u - - $ hg annotate -u a - nobody: a - -annotate -cdnu - - $ hg annotate -cdnu a - nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a - -annotate -cdnul - - $ hg annotate -cdnul a - nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a - - $ cat <>a - > a - > a - > EOF - $ hg ci -ma1 -d '1 0' - $ hg cp a b - $ hg ci -mb -d '1 0' - $ cat <> b - > b4 - > b5 - > b6 - > EOF - $ hg ci -mb2 -d '2 0' - -annotate -n b - - $ hg annotate -n b - 0: a - 1: a - 1: a - 3: b4 - 3: b5 - 3: b6 - -annotate --no-follow b - - $ hg annotate --no-follow b - 2: a - 2: a - 2: a - 3: b4 - 3: b5 - 3: b6 - -annotate -nl b - - $ hg annotate -nl b - 0:1: a - 1:2: a - 1:3: a - 3:4: b4 - 3:5: b5 - 3:6: b6 - -annotate -nf b - - $ hg annotate -nf b - 0 a: a - 1 a: a - 1 a: a - 3 b: b4 - 3 b: b5 - 3 b: b6 - -annotate -nlf b - - $ hg annotate -nlf b - 0 a:1: a - 1 a:2: a - 1 a:3: a - 3 b:4: b4 - 3 b:5: b5 - 3 b:6: b6 - - $ hg up -C 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cat <> b - > b4 - > c - > b5 - > EOF - $ hg ci -mb2.1 -d '2 0' - created new head - $ hg merge - merging b - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -mmergeb -d '3 0' - -annotate after merge - - $ hg annotate -nf b - 0 a: a - 1 a: a - 1 a: a - 3 b: b4 - 4 b: c - 3 b: b5 - -annotate after merge with -l - - $ hg annotate -nlf b - 0 a:1: a - 1 a:2: a - 1 a:3: a - 3 b:4: b4 - 4 b:5: c - 3 b:5: b5 - - $ hg up -C 1 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg cp a b - $ cat < b - > a - > z - > a - > EOF - $ hg ci -mc -d '3 0' - created new head - $ hg merge - merging b - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ cat <> b - > b4 - > c - > b5 - > EOF - $ echo d >> b - $ hg ci -mmerge2 -d '4 0' - -annotate after rename merge - - $ hg annotate -nf b - 0 a: a - 6 b: z - 1 a: a - 3 b: b4 - 4 b: c - 3 b: b5 - 7 b: d - -annotate after rename merge with -l - - $ hg annotate -nlf b - 0 a:1: a - 6 b:2: z - 1 a:3: a - 3 b:4: b4 - 4 b:5: c - 3 b:5: b5 - 7 b:7: d - -linkrev vs rev - - $ hg annotate -r tip -n a - 0: a - 1: a - 1: a - -linkrev vs rev with -l - - $ hg annotate -r tip -nl a - 0:1: a - 1:2: a - 1:3: a - -Issue589: "undelete" sequence leads to crash - -annotate was crashing when trying to --follow something - -like A -> B -> A - -generate ABA rename configuration - - $ echo foo > foo - $ hg add foo - $ hg ci -m addfoo - $ hg rename foo bar - $ hg ci -m renamefoo - $ hg rename bar foo - $ hg ci -m renamebar - -annotate after ABA with follow - - $ hg annotate --follow foo - foo: foo - !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bheads.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bheads.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bheads.t.err @@ -1,367 +1,6 @@ + + ### Abort: timeout after 180 seconds. $ heads() > { > hg heads --template '{rev}: {desc|firstline|strip} ({branches})\n' "$@" > } - - $ hg init a - $ cd a - $ echo 'root' >root - $ hg add root - $ hg commit -m "Adding root node" - $ heads - 0: Adding root node () -------- - $ heads . - 0: Adding root node () - -======= - - $ echo 'a' >a - $ hg add a - $ hg branch a - marked working directory as branch a - $ hg commit -m "Adding a branch" - $ heads - 1: Adding a branch (a) - 0: Adding root node () -------- - $ heads . - 1: Adding a branch (a) - -======= - - $ hg update -C 0 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo 'b' >b - $ hg add b - $ hg branch b - marked working directory as branch b - $ hg commit -m "Adding b branch" - $ heads - 2: Adding b branch (b) - 1: Adding a branch (a) - 0: Adding root node () -------- - $ heads . - 2: Adding b branch (b) - -======= - - $ echo 'bh1' >bh1 - $ hg add bh1 - $ hg commit -m "Adding b branch head 1" - $ heads - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () -------- - $ heads . - 3: Adding b branch head 1 (b) - -======= - - $ hg update -C 2 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo 'bh2' >bh2 - $ hg add bh2 - $ hg commit -m "Adding b branch head 2" - created new head - $ heads - 4: Adding b branch head 2 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - $ heads . - 4: Adding b branch head 2 (b) - 3: Adding b branch head 1 (b) - -======= - - $ hg update -C 2 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo 'bh3' >bh3 - $ hg add bh3 - $ hg commit -m "Adding b branch head 3" - created new head - $ heads - 5: Adding b branch head 3 (b) - 4: Adding b branch head 2 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () -------- - $ heads . - 5: Adding b branch head 3 (b) - 4: Adding b branch head 2 (b) - 3: Adding b branch head 1 (b) - -======= - - $ hg merge 4 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg commit -m "Merging b branch head 2 and b branch head 3" - $ heads - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () -------- - $ heads . - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - -======= - - $ echo 'c' >c - $ hg add c - $ hg branch c - marked working directory as branch c - $ hg commit -m "Adding c branch" - $ heads - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () -------- - $ heads . - 7: Adding c branch (c) - -======= - - $ heads -r 3 . - no open branch heads found on branches c (started at 3) - [1] - $ heads -r 2 . - 7: Adding c branch (c) -------- - $ hg update -C 4 - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -------- - $ heads -r 3 . - 3: Adding b branch head 1 (b) -------- - $ heads -r 2 . - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) -------- - $ heads -r 7 . - no open branch heads found on branches b (started at 7) - [1] - -======= - - $ for i in 0 1 2 3 4 5 6 7; do - > hg update -C "$i" - > heads - > echo '-------' - > heads . - > echo '-------' - > done - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 0: Adding root node () - ------- - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 1: Adding a branch (a) - ------- - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - ------- - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - ------- - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - ------- - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - ------- - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - ------- - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - ------- - 7: Adding c branch (c) - ------- - -======= - - $ for i in a b c z; do - > heads "$i" - > echo '-------' - > done - 1: Adding a branch (a) - ------- - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - ------- - 7: Adding c branch (c) - ------- - abort: unknown revision 'z'! - ------- - -======= - - $ heads 0 1 2 3 4 5 6 7 - 7: Adding c branch (c) - 6: Merging b branch head 2 and b branch head 3 (b) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - 0: Adding root node () - -Topological heads: - - $ heads -t - 7: Adding c branch (c) - 3: Adding b branch head 1 (b) - 1: Adding a branch (a) - - $ cd .. -______________ - -"created new head" message tests - - $ hg init newheadmsg - $ cd newheadmsg - -Init: no msg - - $ echo 1 > a - $ hg ci -Am "a0: Initial root" - adding a - $ echo 2 >> a - $ hg ci -m "a1 (HN)" - - $ hg branch b - marked working directory as branch b - $ echo 1 > b - $ hg ci -Am "b2: Initial root for branch b" - adding b - $ echo 2 >> b - $ hg ci -m "b3 (HN)" - -Case NN: msg - - $ hg up -q null - $ hg branch -f b - marked working directory as branch b - $ echo 1 > bb - $ hg ci -Am "b4 (NN): new topo root for branch b" - adding bb - created new head - -Case HN: no msg - - $ echo 2 >> bb - $ hg ci -m "b5 (HN)" - -Case BN: msg - - $ hg branch -f default - marked working directory as branch default - $ echo 1 > aa - $ hg ci -Am "a6 (BN): new branch root" - adding aa - created new head - -Case CN: msg - - $ hg up -q 4 - $ echo 3 >> bbb - $ hg ci -Am "b7 (CN): regular new head" - adding bbb - created new head - -Case BB: msg - - $ hg up -q 4 - $ hg merge -q 3 - $ hg branch -f default - marked working directory as branch default - $ hg ci -m "a8 (BB): weird new branch root" - created new head - -Case CB: msg - - $ hg up -q 4 - $ hg merge -q 1 - $ hg ci -m "b9 (CB): new head from branch merge" - created new head - -Case HB: no msg - - $ hg up -q 7 - $ hg merge -q 6 - $ hg ci -m "b10 (HB): continuing head from branch merge" - -Case CC: msg - - $ hg up -q 4 - $ hg merge -q 2 - $ hg ci -m "b11 (CC): new head from merge" - created new head - -Case CH: no msg - - $ hg up -q 2 - $ hg merge -q 10 - $ hg ci -m "b12 (CH): continuing head from merge" - -Case HH: no msg - - $ hg merge -q 3 - $ hg ci -m "b12 (HH): merging two heads" - !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-backout.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-backout.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-backout.t.err @@ -1,287 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init basic - $ cd basic - -should complain - - $ hg backout - abort: please specify a revision to backout - [255] - $ hg backout -r 0 0 - abort: please specify just one revision - [255] - -basic operation - - $ echo a > a - $ hg commit -d '0 0' -A -m a - adding a - $ echo b >> a - $ hg commit -d '1 0' -m b - - $ hg backout -d '2 0' tip --tool=true - reverting a - changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57 - $ cat a - a - -file that was removed is recreated - - $ cd .. - $ hg init remove - $ cd remove - - $ echo content > a - $ hg commit -d '0 0' -A -m a - adding a - - $ hg rm a - $ hg commit -d '1 0' -m b - - $ hg backout -d '2 0' tip --tool=true - adding a - changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372 - $ cat a - content - -backout of backout is as if nothing happened - - $ hg backout -d '3 0' --merge tip --tool=true - removing a - changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d - $ cat a 2>/dev/null || echo cat: a: No such file or directory - cat: a: No such file or directory - -across branch - - $ cd .. - $ hg init branch - $ cd branch - $ echo a > a - $ hg ci -Am0 - adding a - $ echo b > b - $ hg ci -Am1 - adding b - $ hg co -C 0 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - -should fail - - $ hg backout 1 - abort: cannot backout change on a different branch - [255] - $ echo c > c - $ hg ci -Am2 - adding c - created new head - -should fail - - $ hg backout 1 - abort: cannot backout change on a different branch - [255] - -backout with merge - - $ cd .. - $ hg init merge - $ cd merge - - $ echo line 1 > a - $ echo line 2 >> a - $ hg commit -d '0 0' -A -m a - adding a - -remove line 1 - - $ echo line 2 > a - $ hg commit -d '1 0' -m b - - $ echo line 3 >> a - $ hg commit -d '2 0' -m c - - $ hg backout --merge -d '3 0' 1 --tool=true - reverting a - created new head - changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 - merging with changeset 3:26b8ccb9ad91 - merging a - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg commit -d '4 0' -m d - -check line 1 is back - - $ cat a - line 1 - line 2 - line 3 - -backout should not back out subsequent changesets - - $ hg init onecs - $ cd onecs - $ echo 1 > a - $ hg commit -d '0 0' -A -m a - adding a - $ echo 2 >> a - $ hg commit -d '1 0' -m b - $ echo 1 > b - $ hg commit -d '2 0' -A -m c - adding b - -without --merge - $ hg backout -d '3 0' 1 --tool=true - reverting a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg locate b - b - $ hg update -C tip - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg locate b - b - -with --merge - $ hg backout --merge -d '3 0' 1 --tool=true - reverting a - created new head - changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 - merging with changeset 3:3202beb76721 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg locate b - b - $ hg update -C tip - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg locate b - [1] - - $ cd .. - $ hg init m - $ cd m - $ echo a > a - $ hg commit -d '0 0' -A -m a - adding a - $ echo b > b - $ hg commit -d '1 0' -A -m b - adding b - $ echo c > c - $ hg commit -d '2 0' -A -m b - adding c - $ hg update 1 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo d > d - $ hg commit -d '3 0' -A -m c - adding d - created new head - $ hg merge 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg commit -d '4 0' -A -m d - -backout of merge should fail - - $ hg backout 4 - abort: cannot backout a merge changeset without --parent - [255] - -backout of merge with bad parent should fail - - $ hg backout --parent 0 4 - abort: cb9a9f314b8b is not a parent of b2f3bb92043e - [255] - -backout of non-merge with parent should fail - - $ hg backout --parent 0 3 - abort: cannot use --parent on non-merge changeset - [255] - -backout with valid parent should be ok - - $ hg backout -d '5 0' --parent 2 4 --tool=true - removing d - changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e - - $ hg rollback - rolling back to revision 4 (undo commit) - $ hg update -C - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - - $ hg backout -d '6 0' --parent 3 4 --tool=true - removing c - changeset 5:033590168430 backs out changeset 4:b2f3bb92043e - - $ cd .. - -named branches - - $ hg init named_branches - $ cd named_branches - - $ echo default > default - $ hg ci -d '0 0' -Am default - adding default - $ hg branch branch1 - marked working directory as branch branch1 - $ echo branch1 > file1 - $ hg ci -d '1 0' -Am file1 - adding file1 - $ hg branch branch2 - marked working directory as branch branch2 - $ echo branch2 > file2 - $ hg ci -d '2 0' -Am file2 - adding file2 - -without --merge - $ hg backout -r 1 --tool=true - removing file1 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg branch - branch2 - $ hg status -A - R file1 - C default - C file2 - -with --merge - $ hg update -qC - $ hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true - removing file1 - created new head - changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 - merging with changeset 3:d4e8f6db59fb - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg update -q -C 2 - -on branch2 with branch1 not merged, so file1 should still exist: - - $ hg id - 45bbcd363bf0 (branch2) - $ hg st -A - C default - C file1 - C file2 - -on branch2 with branch1 merged, so file1 should be gone: - - $ hg merge - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -d '4 0' -m 'merge backout of branch1' - $ hg id - 22149cdde76d (branch2) tip - $ hg st -A - C default - C file2 - -on branch1, so no file1 and file2: - - $ hg co -C branch1 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg id - bf1602f437f3 (branch1) - $ hg st -A - C default - C file1 !... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bisect.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bisect.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bisect.t.err @@ -1,419 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init - - -committing changes - - $ count=0 - $ echo > a - $ while test $count -lt 32 ; do - > echo 'a' >> a - > test $count -eq 0 && hg add - > hg ci -m "msg $count" -d "$count 0" - > count=`expr $count + 1` - > done - adding a - - - $ hg log - changeset: 31:58c80a7c8a40 - tag: tip - user: test - date: Thu Jan 01 00:00:31 1970 +0000 - summary: msg 31 - - changeset: 30:ed2d2f24b11c - user: test - date: Thu Jan 01 00:00:30 1970 +0000 - summary: msg 30 - - changeset: 29:b5bd63375ab9 - user: test - date: Thu Jan 01 00:00:29 1970 +0000 - summary: msg 29 - - changeset: 28:8e0c2264c8af - user: test - date: Thu Jan 01 00:00:28 1970 +0000 - summary: msg 28 - - changeset: 27:288867a866e9 - user: test - date: Thu Jan 01 00:00:27 1970 +0000 - summary: msg 27 - - changeset: 26:3efc6fd51aeb - user: test - date: Thu Jan 01 00:00:26 1970 +0000 - summary: msg 26 - - changeset: 25:02a84173a97a - user: test - date: Thu Jan 01 00:00:25 1970 +0000 - summary: msg 25 - - changeset: 24:10e0acd3809e - user: test - date: Thu Jan 01 00:00:24 1970 +0000 - summary: msg 24 - - changeset: 23:5ec79163bff4 - user: test - date: Thu Jan 01 00:00:23 1970 +0000 - summary: msg 23 - - changeset: 22:06c7993750ce - user: test - date: Thu Jan 01 00:00:22 1970 +0000 - summary: msg 22 - - changeset: 21:e5db6aa3fe2a - user: test - date: Thu Jan 01 00:00:21 1970 +0000 - summary: msg 21 - - changeset: 20:7128fb4fdbc9 - user: test - date: Thu Jan 01 00:00:20 1970 +0000 - summary: msg 20 - - changeset: 19:52798545b482 - user: test - date: Thu Jan 01 00:00:19 1970 +0000 - summary: msg 19 - - changeset: 18:86977a90077e - user: test - date: Thu Jan 01 00:00:18 1970 +0000 - summary: msg 18 - - changeset: 17:03515f4a9080 - user: test - date: Thu Jan 01 00:00:17 1970 +0000 - summary: msg 17 - - changeset: 16:a2e6ea4973e9 - user: test - date: Thu Jan 01 00:00:16 1970 +0000 - summary: msg 16 - - changeset: 15:e7fa0811edb0 - user: test - date: Thu Jan 01 00:00:15 1970 +0000 - summary: msg 15 - - changeset: 14:ce8f0998e922 - user: test - date: Thu Jan 01 00:00:14 1970 +0000 - summary: msg 14 - - changeset: 13:9d7d07bc967c - user: test - date: Thu Jan 01 00:00:13 1970 +0000 - summary: msg 13 - - changeset: 12:1941b52820a5 - user: test - date: Thu Jan 01 00:00:12 1970 +0000 - summary: msg 12 - - changeset: 11:7b4cd9578619 - user: test - date: Thu Jan 01 00:00:11 1970 +0000 - summary: msg 11 - - changeset: 10:7c5eff49a6b6 - user: test - date: Thu Jan 01 00:00:10 1970 +0000 - summary: msg 10 - - changeset: 9:eb44510ef29a - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: msg 9 - - changeset: 8:453eb4dba229 - user: test - date: Thu Jan 01 00:00:08 1970 +0000 - summary: msg 8 - - changeset: 7:03750880c6b5 - user: test - date: Thu Jan 01 00:00:07 1970 +0000 - summary: msg 7 - - changeset: 6:a3d5c6fdf0d3 - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: msg 6 - - changeset: 5:7874a09ea728 - user: test - date: Thu Jan 01 00:00:05 1970 +0000 - summary: msg 5 - - changeset: 4:9b2ba8336a65 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: msg 4 - - changeset: 3:b53bea5e2fcb - user: test - date: Thu Jan 01 00:00:03 1970 +0000 - summary: msg 3 - - changeset: 2:db07c04beaca - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: msg 2 - - changeset: 1:5cd978ea5149 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: msg 1 - - changeset: 0:b99c7b9c8e11 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: msg 0 - - - $ hg up -C - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - -bisect test - - $ hg bisect -r - $ hg bisect -b - $ hg bisect -g 1 - Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - -skip - - $ hg bisect -s - Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -b - Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - The first bad revision is: - changeset: 29:b5bd63375ab9 - user: test - date: Thu Jan 01 00:00:29 1970 +0000 - summary: msg 29 - - -mark revsets instead of single revs - - $ hg bisect -r - $ hg bisect -b "0::3" - $ hg bisect -s "13::16" - $ hg bisect -g "26::tip" - Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cat .hg/bisect.state - skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991 - skip ce8f0998e922c179e80819d5066fbe46e2998784 - skip e7fa0811edb063f6319531f0d0a865882138e180 - skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3 - bad b99c7b9c8e11558adef3fad9af211c58d46f325b - bad 5cd978ea51499179507ee7b6f340d2dbaa401185 - bad db07c04beaca44cf24832541e7f4a2346a95275b - bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b - good 3efc6fd51aeb8594398044c6c846ca59ae021203 - good 288867a866e9adb7a29880b66936c874b80f4651 - good 8e0c2264c8af790daf3585ada0669d93dee09c83 - good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8 - good ed2d2f24b11c368fa8aa0da9f4e1db580abade59 - good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96 - -bisect reverse test - - $ hg bisect -r - $ hg bisect -b null - $ hg bisect -g tip - Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - -skip - - $ hg bisect -s - Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -b - Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - The first good revision is: - changeset: 1:5cd978ea5149 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: msg 1 - - - $ hg bisect -r - $ hg bisect -g tip - $ hg bisect -b tip - abort: starting revisions are not directly related - [255] - - $ hg bisect -r - $ hg bisect -g null - $ hg bisect -bU tip - Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) - $ hg id - 5cd978ea5149 - - -Issue1228: hg bisect crashes when you skip the last rev in bisection -Issue1182: hg bisect exception - - $ hg bisect -r - $ hg bisect -b 4 - $ hg bisect -g 0 - Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Due to skipped revisions, the first bad revision could be any of: - changeset: 1:5cd978ea5149 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: msg 1 - - changeset: 2:db07c04beaca - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: msg 2 - - changeset: 3:b53bea5e2fcb - user: test - date: Thu Jan 01 00:00:03 1970 +0000 - summary: msg 3 - - changeset: 4:9b2ba8336a65 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: msg 4 - - - -reproduce non converging bisect, issue1182 - - $ hg bisect -r - $ hg bisect -g 0 - $ hg bisect -b 2 - Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Due to skipped revisions, the first bad revision could be any of: - changeset: 1:5cd978ea5149 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: msg 1 - - changeset: 2:db07c04beaca - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: msg 2 - - - -test no action - - $ hg bisect -r - $ hg bisect - abort: cannot bisect (no known good revisions) - [255] - - -reproduce AssertionError, issue1445 - - $ hg bisect -r - $ hg bisect -b 6 - $ hg bisect -g 0 - Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - The first bad revision is: - changeset: 6:a3d5c6fdf0d3 - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: msg 6 - - - $ set +e - -test invalid command -assuming that the shell returns 127 if command not found ... - - $ hg bisect -r - $ hg bisect --command 'exit 127' - abort: failed to execute exit 127 - [255] - - -test bisecting command - - $ cat > script.py < #!/usr/bin/env python - > import sys - > from mercurial import ui, hg - > repo = hg.repository(ui.ui(), '.') - > if repo['.'].rev() < 6: - > sys.exit(1) - > EOF - $ chmod +x script.py - $ hg bisect -r - $ hg bisect --good tip - $ hg bisect --bad 0 - Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect --command "'`pwd`/script.py' and some parameters" - Changeset 15:e7fa0811edb0: good - Changeset 7:03750880c6b5: good - Changeset 3:b53bea5e2fcb: bad - Changeset 5:7874a09ea728: bad - Changeset 6:a3d5c6fdf0d3: good - The first good revision is: - changeset: 6:a3d5c6fdf0d3 - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: msg 6 - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bookmarks.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bookmarks.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bookmarks.t.err @@ -1,213 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ echo "[extensions]" >> $HGRCPATH - $ echo "bookmarks=" >> $HGRCPATH - - $ hg init - -no bookmarks - - $ hg bookmarks - no bookmarks set - -bookmark rev -1 - - $ hg bookmark X - -list bookmarks - - $ hg bookmarks - * X -1:000000000000 - -list bookmarks with color - - $ hg --config extensions.color= --config color.mode=ansi \ - > bookmarks --color=always -  * X -1:000000000000 - - $ echo a > a - $ hg add a - $ hg commit -m 0 - -bookmark X moved to rev 0 - - $ hg bookmarks - * X 0:f7b1eb17ad24 - -look up bookmark - - $ hg log -r X - changeset: 0:f7b1eb17ad24 - tag: X - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0 - - -second bookmark for rev 0 - - $ hg bookmark X2 - -bookmark rev -1 again - - $ hg bookmark -r null Y - -list bookmarks - - $ hg bookmarks - * X2 0:f7b1eb17ad24 - * X 0:f7b1eb17ad24 - Y -1:000000000000 - - $ echo b > b - $ hg add b - $ hg commit -m 1 - -bookmarks revset - - $ hg log -r 'bookmark()' - changeset: 1:925d80f479bb - tag: X - tag: X2 - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1 - - $ hg log -r 'bookmark(Y)' - $ hg log -r 'bookmark(X2)' - changeset: 1:925d80f479bb - tag: X - tag: X2 - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1 - - $ hg help revsets | grep 'bookmark(' - "bookmark([name])" - -bookmarks X and X2 moved to rev 1, Y at rev -1 - - $ hg bookmarks - * X2 1:925d80f479bb - * X 1:925d80f479bb - Y -1:000000000000 - -bookmark rev 0 again - - $ hg bookmark -r 0 Z - - $ echo c > c - $ hg add c - $ hg commit -m 2 - -bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0 - - $ hg bookmarks - * X2 2:0316ce92851d - * X 2:0316ce92851d - Z 0:f7b1eb17ad24 - Y -1:000000000000 - -rename nonexistent bookmark - - $ hg bookmark -m A B - abort: a bookmark of this name does not exist - [255] - -rename to existent bookmark - - $ hg bookmark -m X Y - abort: a bookmark of the same name already exists - [255] - -force rename to existent bookmark - - $ hg bookmark -f -m X Y - -list bookmarks - - $ hg bookmark - * X2 2:0316ce92851d - * Y 2:0316ce92851d - Z 0:f7b1eb17ad24 - -rename without new name - - $ hg bookmark -m Y - abort: new bookmark name required - [255] - -delete without name - - $ hg bookmark -d - abort: bookmark name required - [255] - -delete nonexistent bookmark - - $ hg bookmark -d A - abort: a bookmark of this name does not exist - [255] - -bookmark name with spaces should be stripped - - $ hg bookmark ' x y ' - -list bookmarks - - $ hg bookmarks - * X2 2:0316ce92851d - * Y 2:0316ce92851d - Z 0:f7b1eb17ad24 - * x y 2:0316ce92851d - -look up stripped bookmark name - - $ hg log -r '"x y"' - changeset: 2:0316ce92851d - tag: X2 - tag: Y - tag: tip - tag: x y - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 2 - - -reject bookmark name with newline - - $ hg bookmark ' - > ' - abort: bookmark name cannot contain newlines - [255] - -bookmark with existing name - - $ hg bookmark Z - abort: a bookmark of the same name already exists - [255] - -force bookmark with existing name - - $ hg bookmark -f Z - -list bookmarks - - $ hg bookmark - * X2 2:0316ce92851d - * Y 2:0316ce92851d - * Z 2:0316ce92851d - * x y 2:0316ce92851d - -revision but no bookmark name - - $ hg bookmark -r . - abort: bookmark name required - [255] - -bookmark name with whitespace only - - $ hg bookmark ' ' - abort: bookmark names cannot consist entirely of whitespace - [255] ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-branch-option.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-branch-option.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-branch-option.t.err @@ -1,126 +1,5 @@ + + ### Abort: timeout after 180 seconds. test branch selection options $ hg init branch - $ cd branch - $ hg branch a - marked working directory as branch a - $ echo a > foo - $ hg ci -d '0 0' -Ama - adding foo - $ echo a2 > foo - $ hg ci -d '0 0' -ma2 - $ hg up 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg branch c - marked working directory as branch c - $ echo c > foo - $ hg ci -d '0 0' -mc - $ hg tag -l z - $ cd .. - $ hg clone -r 0 branch branch2 - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - updating to branch a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd branch2 - $ hg up 0 - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg branch b - marked working directory as branch b - $ echo b > foo - $ hg ci -d '0 0' -mb - $ hg up 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg --encoding utf-8 branch æ - marked working directory as branch æ - $ echo ae1 > foo - $ hg ci -d '0 0' -mae1 - $ hg up 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg --encoding utf-8 branch -f æ - marked working directory as branch æ - $ echo ae2 > foo - $ hg ci -d '0 0' -mae2 - created new head - $ hg up 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg branch -f b - marked working directory as branch b - $ echo b2 > foo - $ hg ci -d '0 0' -mb2 - created new head - -unknown branch and fallback - - $ hg in -qbz - abort: unknown branch 'z'! - [255] - $ hg in -q ../branch#z - 2:f25d57ab0566 - $ hg out -qbz - abort: unknown branch 'z'! - [255] - -in rev c branch a - - $ hg in -qr c ../branch#a - 1:dd6e60a716c6 - 2:f25d57ab0566 - $ hg in -qr c -b a - 1:dd6e60a716c6 - 2:f25d57ab0566 - -out branch . - - $ hg out -q ../branch#. - 1:b84708d77ab7 - 4:65511d0e2b55 - $ hg out -q -b . - 1:b84708d77ab7 - 4:65511d0e2b55 - -out branch . non-ascii - - $ hg --encoding utf-8 up æ - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg --encoding latin1 out -q ../branch#. - 2:df5a44224d4e - 3:4f4a5125ca10 - $ hg --encoding latin1 out -q -b . - 2:df5a44224d4e - 3:4f4a5125ca10 - -clone branch b - - $ cd .. - $ hg clone branch2#b branch3 - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 1 files (+1 heads) - updating to branch b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -q -R branch3 heads b - 2:65511d0e2b55 - 1:b84708d77ab7 - $ hg -q -R branch3 parents - 2:65511d0e2b55 - $ rm -rf branch3 - -clone rev a branch b - - $ hg clone -r a branch2#b branch3 - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 1 files (+1 heads) - updating to branch a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -q -R branch3 heads b - 2:65511d0e2b55 - 1:b84708d77ab7 - $ hg -q -R branch3 parents - 0:5b65ba7c951d - $ rm -rf branch3 ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bisect2.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bisect2.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bisect2.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. # The tests in test-bisect are done on a linear history. Here the # following repository history is used for testing: # @@ -26,404 +28,3 @@ init $ hg init - -committing changes - - $ echo > a - $ echo '0' >> a - $ hg add a - $ hg ci -m "0" -d "0 0" - $ echo '1' >> a - $ hg ci -m "1" -d "1 0" - $ echo '2' >> a - $ hg ci -m "2" -d "2 0" - $ echo '3' >> a - $ hg ci -m "3" -d "3 0" - $ echo '4' >> a - $ hg ci -m "4" -d "4 0" - -create branch - - $ hg up -r 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo '5' >> b - $ hg add b - $ hg ci -m "5" -d "5 0" - created new head - -merge - - $ hg merge - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -m "merge 4,5" -d "6 0" - -create branch - - $ hg up -r 4 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo '7' > c - $ hg add c - $ hg ci -m "7" -d "7 0" - created new head - -create branch - - $ hg up -r 1 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo '8' > d - $ hg add d - $ hg ci -m "8" -d "8 0" - created new head - $ echo '9' >> d - $ hg ci -m "9" -d "9 0" - -merge - - $ hg merge -r 6 - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -m "merge 6,9" -d "10 0" - -create branch - - $ hg up -r 8 - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo '11' > e - $ hg add e - $ hg ci -m "11" -d "11 0" - created new head - $ echo '12' >> e - $ hg ci -m "12" -d "12 0" - $ echo '13' >> e - $ hg ci -m "13" -d "13 0" - -create branch - - $ hg up -r 11 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo '14' > f - $ hg add f - $ hg ci -m "14" -d "14 0" - created new head - -merge - - $ hg up -r 13 -C - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg merge -r 10 - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -m "merge 10,13" -d "15 0" - $ echo '16' >> e - $ hg ci -m "16" -d "16 0" - $ echo '17' >> e - $ hg ci -m "17" -d "17 0" - -create branch - - $ hg up -r 15 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo '18' >> e - $ hg ci -m "18" -d "18 0" - created new head - -log - - $ hg log - changeset: 18:d42e18c7bc9b - tag: tip - parent: 15:857b178a7cf3 - user: test - date: Thu Jan 01 00:00:18 1970 +0000 - summary: 18 - - changeset: 17:228c06deef46 - user: test - date: Thu Jan 01 00:00:17 1970 +0000 - summary: 17 - - changeset: 16:609d82a7ebae - user: test - date: Thu Jan 01 00:00:16 1970 +0000 - summary: 16 - - changeset: 15:857b178a7cf3 - parent: 13:b0a32c86eb31 - parent: 10:429fcd26f52d - user: test - date: Thu Jan 01 00:00:15 1970 +0000 - summary: merge 10,13 - - changeset: 14:faa450606157 - parent: 11:82ca6f06eccd - user: test - date: Thu Jan 01 00:00:14 1970 +0000 - summary: 14 - - changeset: 13:b0a32c86eb31 - user: test - date: Thu Jan 01 00:00:13 1970 +0000 - summary: 13 - - changeset: 12:9f259202bbe7 - user: test - date: Thu Jan 01 00:00:12 1970 +0000 - summary: 12 - - changeset: 11:82ca6f06eccd - parent: 8:dab8161ac8fc - user: test - date: Thu Jan 01 00:00:11 1970 +0000 - summary: 11 - - changeset: 10:429fcd26f52d - parent: 9:3c77083deb4a - parent: 6:a214d5d3811a - user: test - date: Thu Jan 01 00:00:10 1970 +0000 - summary: merge 6,9 - - changeset: 9:3c77083deb4a - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: 9 - - changeset: 8:dab8161ac8fc - parent: 1:4ca5088da217 - user: test - date: Thu Jan 01 00:00:08 1970 +0000 - summary: 8 - - changeset: 7:50c76098bbf2 - parent: 4:5c668c22234f - user: test - date: Thu Jan 01 00:00:07 1970 +0000 - summary: 7 - - changeset: 6:a214d5d3811a - parent: 5:385a529b6670 - parent: 4:5c668c22234f - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: merge 4,5 - - changeset: 5:385a529b6670 - parent: 2:051e12f87bf1 - user: test - date: Thu Jan 01 00:00:05 1970 +0000 - summary: 5 - - changeset: 4:5c668c22234f - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: 4 - - changeset: 3:0950834f0a9c - user: test - date: Thu Jan 01 00:00:03 1970 +0000 - summary: 3 - - changeset: 2:051e12f87bf1 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2 - - changeset: 1:4ca5088da217 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: 1 - - changeset: 0:33b1f9bc8bc5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0 - - -hg up -C - - $ hg up -C - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - -complex bisect test 1 # first bad rev is 9 - - $ hg bisect -r - $ hg bisect -g 0 - $ hg bisect -b 17 # -> update to rev 6 - Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg bisect -g # -> update to rev 13 - Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -s # -> update to rev 10 - Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -b # -> update to rev 8 - Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -g # -> update to rev 9 - Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -b - The first bad revision is: - changeset: 9:3c77083deb4a - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: 9 - - -complex bisect test 2 # first good rev is 13 - - $ hg bisect -r - $ hg bisect -g 18 - $ hg bisect -b 1 # -> update to rev 6 - Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -s # -> update to rev 10 - Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -b # -> update to rev 12 - Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -b # -> update to rev 13 - Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -g - The first good revision is: - changeset: 13:b0a32c86eb31 - user: test - date: Thu Jan 01 00:00:13 1970 +0000 - summary: 13 - - -complex bisect test 3 - -first bad rev is 15 -10,9,13 are skipped an might be the first bad revisions as well - - $ hg bisect -r - $ hg bisect -g 1 - $ hg bisect -b 16 # -> update to rev 6 - Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) - 2 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg bisect -g # -> update to rev 13 - Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -s # -> update to rev 10 - Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -s # -> update to rev 12 - Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -g # -> update to rev 9 - Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -s # -> update to rev 15 - Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -b - Due to skipped revisions, the first bad revision could be any of: - changeset: 9:3c77083deb4a - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: 9 - - changeset: 10:429fcd26f52d - parent: 9:3c77083deb4a - parent: 6:a214d5d3811a - user: test - date: Thu Jan 01 00:00:10 1970 +0000 - summary: merge 6,9 - - changeset: 13:b0a32c86eb31 - user: test - date: Thu Jan 01 00:00:13 1970 +0000 - summary: 13 - - changeset: 15:857b178a7cf3 - parent: 13:b0a32c86eb31 - parent: 10:429fcd26f52d - user: test - date: Thu Jan 01 00:00:15 1970 +0000 - summary: merge 10,13 - - -complex bisect test 4 - -first good revision is 17 -15,16 are skipped an might be the first good revisions as well - - $ hg bisect -r - $ hg bisect -g 17 - $ hg bisect -b 8 # -> update to rev 10 - Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) - 2 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -b # -> update to rev 13 - Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -b # -> update to rev 15 - Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s # -> update to rev 16 - Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -s - Due to skipped revisions, the first good revision could be any of: - changeset: 15:857b178a7cf3 - parent: 13:b0a32c86eb31 - parent: 10:429fcd26f52d - user: test - date: Thu Jan 01 00:00:15 1970 +0000 - summary: merge 10,13 - - changeset: 16:609d82a7ebae - user: test - date: Thu Jan 01 00:00:16 1970 +0000 - summary: 16 - - changeset: 17:228c06deef46 - user: test - date: Thu Jan 01 00:00:17 1970 +0000 - summary: 17 - - -test unrelated revs: - - $ hg bisect --reset - $ hg bisect -b 7 - $ hg bisect -g 14 - abort: starting revisions are not directly related - [255] - $ hg bisect --reset - -end at merge: 17 bad, 11 good (but 9 is first bad) - - $ hg bisect -r - $ hg bisect -b 17 - $ hg bisect -g 11 - Testing changeset 13:b0a32c86eb31 (5 changesets remaining, ~2 tests) - 3 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bisect -g - Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg bisect -b - The first bad revision is: - changeset: 15:857b178a7cf3 - parent: 13:b0a32c86eb31 - parent: 10:429fcd26f52d - user: test - date: Thu Jan 01 00:00:15 1970 +0000 - summary: merge 10,13 - - Not all ancestors of this changeset have been checked. - To check the other ancestors, start from the common ancestor, dab8161ac8fc. - $ hg bisect -g 8 # dab8161ac8fc - Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests) - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg bisect -b - The first bad revision is: - changeset: 9:3c77083deb4a - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: 9 - !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle-type.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle-type.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle-type.t.err @@ -1,101 +1,5 @@ + + ### Abort: timeout after 180 seconds. bundle w/o type option $ hg init t1 - $ hg init t2 - $ cd t1 - $ echo blablablablabla > file.txt - $ hg ci -Ama - adding file.txt - $ hg log | grep summary - summary: a - $ hg bundle ../b1 ../t2 - searching for changes - 1 changesets found - - $ cd ../t2 - $ hg pull ../b1 - pulling from ../b1 - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - $ hg up - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg log | grep summary - summary: a - $ cd .. - -test bundle types - - $ for t in "None" "bzip2" "gzip"; do - > echo % test bundle type $t - > hg init t$t - > cd t1 - > hg bundle -t $t ../b$t ../t$t - > cut -b 1-6 ../b$t | head -n 1 - > cd ../t$t - > hg pull ../b$t - > hg up - > hg log | grep summary - > cd .. - > done - % test bundle type None - searching for changes - 1 changesets found - HG10UN - pulling from ../bNone - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - summary: a - % test bundle type bzip2 - searching for changes - 1 changesets found - HG10BZ - pulling from ../bbzip2 - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - summary: a - % test bundle type gzip - searching for changes - 1 changesets found - HG10GZ - pulling from ../bgzip - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - summary: a - -test garbage file - - $ echo garbage > bgarbage - $ hg init tgarbage - $ cd tgarbage - $ hg pull ../bgarbage - abort: ../bgarbage: not a Mercurial bundle - [255] - $ cd .. - -test invalid bundle type - - $ cd t1 - $ hg bundle -a -t garbage ../bgarbage - 1 changesets found - abort: unknown bundle type specified with --type - [255] - $ cd .. ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bookmarks-strip.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bookmarks-strip.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bookmarks-strip.t.err @@ -1,87 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ echo "[extensions]" >> $HGRCPATH - $ echo "bookmarks=" >> $HGRCPATH - $ echo "mq=" >> $HGRCPATH - - $ hg init - - $ echo qqq>qqq.txt - -add file - - $ hg add - adding qqq.txt - -commit first revision - - $ hg ci -m 1 - -set bookmark - - $ hg book test - - $ echo www>>qqq.txt - -commit second revision - - $ hg ci -m 2 - -set bookmark - - $ hg book test2 - -update to -2 - - $ hg update -r -2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - - $ echo eee>>qqq.txt - -commit new head - - $ hg ci -m 3 - created new head - -bookmarks updated? - - $ hg book - test 1:25e1ee7a0081 - test2 1:25e1ee7a0081 - -strip to revision 1 - - $ hg strip 1 - saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob) - -list bookmarks - - $ hg book - * test 1:8cf31af87a2b - * test2 1:8cf31af87a2b - -immediate rollback and reentrancy issue - - $ echo "mq=!" >> $HGRCPATH - $ hg init repo - $ cd repo - $ echo a > a - $ hg ci -Am adda - adding a - $ echo b > b - $ hg ci -Am addb - adding b - $ hg bookmarks markb - $ hg rollback - rolling back to revision 0 (undo commit) - -are you there? - - $ hg bookmarks - no bookmarks set - -can you be added again? - - $ hg bookmarks markb - $ hg bookmarks - * markb 0:07f494440405 - $ cd .. - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-branches.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-branches.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-branches.t.err @@ -1,398 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init a - $ cd a - $ echo 'root' >root - $ hg add root - $ hg commit -d '0 0' -m "Adding root node" - - $ echo 'a' >a - $ hg add a - $ hg branch a - marked working directory as branch a - $ hg commit -d '1 0' -m "Adding a branch" - - $ hg branch q - marked working directory as branch q - $ echo 'aa' >a - $ hg branch -C - reset working directory to branch a - $ hg commit -d '2 0' -m "Adding to a branch" - - $ hg update -C 0 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo 'b' >b - $ hg add b - $ hg branch b - marked working directory as branch b - $ hg commit -d '2 0' -m "Adding b branch" - - $ echo 'bh1' >bh1 - $ hg add bh1 - $ hg commit -d '3 0' -m "Adding b branch head 1" - - $ hg update -C 2 - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ echo 'bh2' >bh2 - $ hg add bh2 - $ hg commit -d '4 0' -m "Adding b branch head 2" - - $ echo 'c' >c - $ hg add c - $ hg branch c - marked working directory as branch c - $ hg commit -d '5 0' -m "Adding c branch" - - $ hg branch tip - abort: the name 'tip' is reserved - [255] - $ hg branch null - abort: the name 'null' is reserved - [255] - $ hg branch . - abort: the name '.' is reserved - [255] - - $ echo 'd' >d - $ hg add d - $ hg branch 'a branch name much longer than the default justification used by branches' - marked working directory as branch a branch name much longer than the default justification used by branches - $ hg commit -d '6 0' -m "Adding d branch" - - $ hg branches - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - b 4:aee39cd168d0 - c 6:589736a22561 (inactive) - a 5:d8cbc61dbaa6 (inactive) - default 0:19709c5a4e75 (inactive) - -------- - - $ hg branches -a - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - b 4:aee39cd168d0 - ---- Branch a - - $ hg log -b a - changeset: 5:d8cbc61dbaa6 - branch: a - parent: 2:881fe2b92ad0 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: Adding b branch head 2 - - changeset: 2:881fe2b92ad0 - branch: a - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: Adding to a branch - - changeset: 1:dd6b440dd85a - branch: a - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: Adding a branch - - ----- Branch b - - $ hg log -b b - changeset: 4:aee39cd168d0 - branch: b - user: test - date: Thu Jan 01 00:00:03 1970 +0000 - summary: Adding b branch head 1 - - changeset: 3:ac22033332d1 - branch: b - parent: 0:19709c5a4e75 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: Adding b branch - - ----- going to test branch closing - - $ hg branches - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - b 4:aee39cd168d0 - c 6:589736a22561 (inactive) - a 5:d8cbc61dbaa6 (inactive) - default 0:19709c5a4e75 (inactive) - $ hg up -C b - 2 files updated, 0 files merged, 4 files removed, 0 files unresolved - $ echo 'xxx1' >> b - $ hg commit -d '7 0' -m 'adding cset to branch b' - $ hg up -C aee39cd168d0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo 'xxx2' >> b - $ hg commit -d '8 0' -m 'adding head to branch b' - created new head - $ echo 'xxx3' >> b - $ hg commit -d '9 0' -m 'adding another cset to branch b' - $ hg branches - b 10:bfbe841b666e - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - c 6:589736a22561 (inactive) - a 5:d8cbc61dbaa6 (inactive) - default 0:19709c5a4e75 (inactive) - $ hg heads --closed - changeset: 10:bfbe841b666e - branch: b - tag: tip - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: adding another cset to branch b - - changeset: 8:eebb944467c9 - branch: b - parent: 4:aee39cd168d0 - user: test - date: Thu Jan 01 00:00:07 1970 +0000 - summary: adding cset to branch b - - changeset: 7:10ff5895aa57 - branch: a branch name much longer than the default justification used by branches - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: Adding d branch - - changeset: 6:589736a22561 - branch: c - user: test - date: Thu Jan 01 00:00:05 1970 +0000 - summary: Adding c branch - - changeset: 5:d8cbc61dbaa6 - branch: a - parent: 2:881fe2b92ad0 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: Adding b branch head 2 - - changeset: 0:19709c5a4e75 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Adding root node - - $ hg heads - changeset: 10:bfbe841b666e - branch: b - tag: tip - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: adding another cset to branch b - - changeset: 8:eebb944467c9 - branch: b - parent: 4:aee39cd168d0 - user: test - date: Thu Jan 01 00:00:07 1970 +0000 - summary: adding cset to branch b - - changeset: 7:10ff5895aa57 - branch: a branch name much longer than the default justification used by branches - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: Adding d branch - - changeset: 6:589736a22561 - branch: c - user: test - date: Thu Jan 01 00:00:05 1970 +0000 - summary: Adding c branch - - changeset: 5:d8cbc61dbaa6 - branch: a - parent: 2:881fe2b92ad0 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: Adding b branch head 2 - - changeset: 0:19709c5a4e75 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Adding root node - - $ hg commit -d '9 0' --close-branch -m 'prune bad branch' - $ hg branches -a - b 8:eebb944467c9 - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - $ hg up -C b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg commit -d '9 0' --close-branch -m 'close this part branch too' - ---- b branch should be inactive - - $ hg branches - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - c 6:589736a22561 (inactive) - a 5:d8cbc61dbaa6 (inactive) - default 0:19709c5a4e75 (inactive) - $ hg branches -c - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - b 12:2da6583810df (closed) - c 6:589736a22561 (inactive) - a 5:d8cbc61dbaa6 (inactive) - default 0:19709c5a4e75 (inactive) - $ hg branches -a - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - $ hg heads b - no open branch heads found on branches b - [1] - $ hg heads --closed b - changeset: 12:2da6583810df - branch: b - tag: tip - parent: 8:eebb944467c9 - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: close this part branch too - - changeset: 11:c84627f3c15d - branch: b - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: prune bad branch - - $ echo 'xxx4' >> b - $ hg commit -d '9 0' -m 'reopen branch with a change' - reopening closed branch head 12 - ---- branch b is back in action - - $ hg branches -a - b 13:6ac12926b8c3 - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - ----- test heads listings - - $ hg heads - changeset: 13:6ac12926b8c3 - branch: b - tag: tip - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: reopen branch with a change - - changeset: 7:10ff5895aa57 - branch: a branch name much longer than the default justification used by branches - user: test - date: Thu Jan 01 00:00:06 1970 +0000 - summary: Adding d branch - - changeset: 6:589736a22561 - branch: c - user: test - date: Thu Jan 01 00:00:05 1970 +0000 - summary: Adding c branch - - changeset: 5:d8cbc61dbaa6 - branch: a - parent: 2:881fe2b92ad0 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: Adding b branch head 2 - - changeset: 0:19709c5a4e75 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Adding root node - - -branch default - - $ hg heads default - changeset: 0:19709c5a4e75 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Adding root node - - -branch a - - $ hg heads a - changeset: 5:d8cbc61dbaa6 - branch: a - parent: 2:881fe2b92ad0 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: Adding b branch head 2 - - $ hg heads --active a - no open branch heads found on branches a - [1] - -branch b - - $ hg heads b - changeset: 13:6ac12926b8c3 - branch: b - tag: tip - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: reopen branch with a change - - $ hg heads --closed b - changeset: 13:6ac12926b8c3 - branch: b - tag: tip - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: reopen branch with a change - - changeset: 11:c84627f3c15d - branch: b - user: test - date: Thu Jan 01 00:00:09 1970 +0000 - summary: prune bad branch - -default branch colors: - - $ echo "[extensions]" >> $HGRCPATH - $ echo "color =" >> $HGRCPATH - - $ hg up -C c - 3 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg commit -d '9 0' --close-branch -m 'reclosing this branch' - $ hg up -C b - 2 files updated, 0 files merged, 3 files removed, 0 files unresolved - $ hg branches --color=always - b  13:6ac12926b8c3 - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - a  5:d8cbc61dbaa6 (inactive) - default  0:19709c5a4e75 (inactive) - -default closed branch color: - - $ hg branches --color=always --closed - b  13:6ac12926b8c3 - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - c  14:717d2e6fabe1 (closed) - a  5:d8cbc61dbaa6 (inactive) - default  0:19709c5a4e75 (inactive) - - $ echo "[extensions]" >> $HGRCPATH - $ echo "color =" >> $HGRCPATH - $ echo "[color]" >> $HGRCPATH - $ echo "branches.active = green" >> $HGRCPATH - $ echo "branches.closed = blue" >> $HGRCPATH - $ echo "branches.current = red" >> $HGRCPATH - $ echo "branches.inactive = magenta" >> $HGRCPATH - $ echo "log.changeset = cyan" >> $HGRCPATH - -custom branch colors: - - $ hg branches --color=always - b  13:6ac12926b8c3 - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - a  5:d8cbc61dbaa6 (inactive) - default  0:19709c5a4e75 (inactive) - -custom closed branch color: - - $ hg branches --color=always --closed - b  13:6ac12926b8c3 - a branch name much longer than the default justification used by branches 7:10ff5895aa57 - c  14:717d2e6fabe1 (closed) - a  5:d8cbc61dbaa6 (inactive) - default  0:19709c5a4e75 (inactive) !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle-r.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle-r.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle-r.t.err @@ -1,372 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init test - $ cd test - $ echo "0" >> afile - $ hg add afile - $ hg commit -m "0.0" - $ echo "1" >> afile - $ hg commit -m "0.1" - $ echo "2" >> afile - $ hg commit -m "0.2" - $ echo "3" >> afile - $ hg commit -m "0.3" - $ hg update -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo "1" >> afile - $ hg commit -m "1.1" - created new head - $ echo "2" >> afile - $ hg commit -m "1.2" - $ echo "a line" > fred - $ echo "3" >> afile - $ hg add fred - $ hg commit -m "1.3" - $ hg mv afile adifferentfile - $ hg commit -m "1.3m" - $ hg update -C 3 - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg mv afile anotherfile - $ hg commit -m "0.3m" - $ hg debugindex .hg/store/data/afile.i - rev offset length base linkrev nodeid p1 p2 - 0 0 3 0 0 362fef284ce2 000000000000 000000000000 - 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 - 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 - 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 - $ hg debugindex .hg/store/data/adifferentfile.i - rev offset length base linkrev nodeid p1 p2 - 0 0 75 0 7 2565f3199a74 000000000000 000000000000 - $ hg debugindex .hg/store/data/anotherfile.i - rev offset length base linkrev nodeid p1 p2 - 0 0 75 0 8 2565f3199a74 000000000000 000000000000 - $ hg debugindex .hg/store/data/fred.i - rev offset length base linkrev nodeid p1 p2 - 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 - $ hg debugindex .hg/store/00manifest.i - rev offset length base linkrev nodeid p1 p2 - 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 - 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 - 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 - 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 - 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 - 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 - 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 9 changesets, 7 total revisions - $ cd .. - $ for i in 0 1 2 3 4 5 6 7 8; do - > mkdir test-"$i" - > hg --cwd test-"$i" init - > hg -R test bundle -r "$i" test-"$i".hg test-"$i" - > cd test-"$i" - > hg unbundle ../test-"$i".hg - > hg verify - > hg tip -q - > cd .. - > done - searching for changes - 1 changesets found - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 1 changesets, 1 total revisions - 0:f9ee2f85a263 - searching for changes - 2 changesets found - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 1 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 2 changesets, 2 total revisions - 1:34c2bf6b0626 - searching for changes - 3 changesets found - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 1 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 3 changesets, 3 total revisions - 2:e38ba6f5b7e0 - searching for changes - 4 changesets found - adding changesets - adding manifests - adding file changes - added 4 changesets with 4 changes to 1 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 4 changesets, 4 total revisions - 3:eebf5a27f8ca - searching for changes - 2 changesets found - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 1 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 2 changesets, 2 total revisions - 1:095197eb4973 - searching for changes - 3 changesets found - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 1 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 3 changesets, 3 total revisions - 2:1bb50a9436a7 - searching for changes - 4 changesets found - adding changesets - adding manifests - adding file changes - added 4 changesets with 5 changes to 2 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 4 changesets, 5 total revisions - 3:7373c1169842 - searching for changes - 5 changesets found - adding changesets - adding manifests - adding file changes - added 5 changesets with 6 changes to 3 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 3 files, 5 changesets, 6 total revisions - 4:a6a34bfa0076 - searching for changes - 5 changesets found - adding changesets - adding manifests - adding file changes - added 5 changesets with 5 changes to 2 files - (run 'hg update' to get a working copy) - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 5 changesets, 5 total revisions - 4:aa35859c02ea - $ cd test-8 - $ hg pull ../test-7 - pulling from ../test-7 - searching for changes - adding changesets - adding manifests - adding file changes - added 4 changesets with 2 changes to 3 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 9 changesets, 7 total revisions - $ hg rollback - rolling back to revision 4 (undo pull) - $ cd .. - -should fail - - $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3 - abort: --base is incompatible with specifying a destination - [255] - $ hg -R test bundle -r tip test-bundle-branch1.hg - abort: repository default-push not found! - [255] - - $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg - 2 changesets found - $ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg - 4 changesets found - $ hg -R test bundle --base 2 test-bundle-all.hg - 6 changesets found - $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg - 1 changesets found - -empty bundle - - $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg - no changes found - [1] - -issue76 msg2163 - - $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg - 1 changesets found - -Issue1910: 'hg bundle --base $head' does not exclude $head from -result - - $ hg -R test bundle --base 7 test-bundle-cset-7.hg - 4 changesets found - - $ hg clone test-2 test-9 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd test-9 - -revision 2 - - $ hg tip -q - 2:e38ba6f5b7e0 - $ hg unbundle ../test-bundle-should-fail.hg - adding changesets - transaction abort! - rollback completed - abort: 00changelog.i@eebf5a27f8ca: unknown parent! - [255] - -revision 2 - - $ hg tip -q - 2:e38ba6f5b7e0 - $ hg unbundle ../test-bundle-all.hg - adding changesets - adding manifests - adding file changes - added 6 changesets with 4 changes to 4 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -revision 8 - - $ hg tip -q - 8:aa35859c02ea - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 9 changesets, 7 total revisions - $ hg rollback - rolling back to revision 2 (undo unbundle) - -revision 2 - - $ hg tip -q - 2:e38ba6f5b7e0 - $ hg unbundle ../test-bundle-branch1.hg - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 2 files - (run 'hg update' to get a working copy) - -revision 4 - - $ hg tip -q - 4:aa35859c02ea - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 5 changesets, 5 total revisions - $ hg rollback - rolling back to revision 2 (undo unbundle) - $ hg unbundle ../test-bundle-branch2.hg - adding changesets - adding manifests - adding file changes - added 4 changesets with 3 changes to 3 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -revision 6 - - $ hg tip -q - 6:a6a34bfa0076 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 3 files, 7 changesets, 6 total revisions - $ hg rollback - rolling back to revision 2 (undo unbundle) - $ hg unbundle ../test-bundle-cset-7.hg - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 2 files - (run 'hg update' to get a working copy) - -revision 4 - - $ hg tip -q - 4:aa35859c02ea - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 5 changesets, 5 total revisions - - $ cd ../test - $ hg merge 7 - note: possible conflict - afile was renamed multiple times to: - anotherfile - adifferentfile - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -m merge - $ cd .. - $ hg -R test bundle --base 2 test-bundle-head.hg - 7 changesets found - $ hg clone test-2 test-10 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd test-10 - $ hg unbundle ../test-bundle-head.hg - adding changesets - adding manifests - adding file changes - added 7 changesets with 4 changes to 4 files - (run 'hg update' to get a working copy) - -revision 9 - - $ hg tip -q - 9:905597b0d5d4 - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 10 changesets, 7 total revisions !s. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-bundle.t.err @@ -1,561 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ cp "$TESTDIR"/printenv.py . - -Setting up test - - $ hg init test - $ cd test - $ echo 0 > afile - $ hg add afile - $ hg commit -m "0.0" - $ echo 1 >> afile - $ hg commit -m "0.1" - $ echo 2 >> afile - $ hg commit -m "0.2" - $ echo 3 >> afile - $ hg commit -m "0.3" - $ hg update -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo 1 >> afile - $ hg commit -m "1.1" - created new head - $ echo 2 >> afile - $ hg commit -m "1.2" - $ echo "a line" > fred - $ echo 3 >> afile - $ hg add fred - $ hg commit -m "1.3" - $ hg mv afile adifferentfile - $ hg commit -m "1.3m" - $ hg update -C 3 - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg mv afile anotherfile - $ hg commit -m "0.3m" - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 9 changesets, 7 total revisions - $ cd .. - $ hg init empty - -Bundle --all - - $ hg -R test bundle --all all.hg - 9 changesets found - -Bundle test to full.hg - - $ hg -R test bundle full.hg empty - searching for changes - 9 changesets found - -Unbundle full.hg in test - - $ hg -R test unbundle full.hg - adding changesets - adding manifests - adding file changes - added 0 changesets with 0 changes to 4 files - (run 'hg update' to get a working copy) - -Verify empty - - $ hg -R empty heads - [1] - $ hg -R empty verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 0 files, 0 changesets, 0 total revisions - -Pull full.hg into test (using --cwd) - - $ hg --cwd test pull ../full.hg - pulling from ../full.hg - searching for changes - no changes found - -Pull full.hg into empty (using --cwd) - - $ hg --cwd empty pull ../full.hg - pulling from ../full.hg - requesting all changes - adding changesets - adding manifests - adding file changes - added 9 changesets with 7 changes to 4 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -Rollback empty - - $ hg -R empty rollback - rolling back to revision -1 (undo pull) - -Pull full.hg into empty again (using --cwd) - - $ hg --cwd empty pull ../full.hg - pulling from ../full.hg - requesting all changes - adding changesets - adding manifests - adding file changes - added 9 changesets with 7 changes to 4 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -Pull full.hg into test (using -R) - - $ hg -R test pull full.hg - pulling from full.hg - searching for changes - no changes found - -Pull full.hg into empty (using -R) - - $ hg -R empty pull full.hg - pulling from full.hg - searching for changes - no changes found - -Rollback empty - - $ hg -R empty rollback - rolling back to revision -1 (undo pull) - -Pull full.hg into empty again (using -R) - - $ hg -R empty pull full.hg - pulling from full.hg - requesting all changes - adding changesets - adding manifests - adding file changes - added 9 changesets with 7 changes to 4 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -Log -R full.hg in fresh empty - - $ rm -r empty - $ hg init empty - $ cd empty - $ hg -R bundle://../full.hg log - changeset: 8:aa35859c02ea - tag: tip - parent: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3m - - changeset: 7:a6a34bfa0076 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3m - - changeset: 6:7373c1169842 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3 - - changeset: 5:1bb50a9436a7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.2 - - changeset: 4:095197eb4973 - parent: 0:f9ee2f85a263 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.1 - - changeset: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3 - - changeset: 2:e38ba6f5b7e0 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.2 - - changeset: 1:34c2bf6b0626 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.1 - - changeset: 0:f9ee2f85a263 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.0 - - -Pull ../full.hg into empty (with hook) - - $ echo '[hooks]' >> .hg/hgrc - $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc - -doesn't work (yet ?) - -hg -R bundle://../full.hg verify - - $ hg pull bundle://../full.hg - changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg - pulling from bundle://../full.hg - requesting all changes - adding changesets - adding manifests - adding file changes - added 9 changesets with 7 changes to 4 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -Rollback empty - - $ hg rollback - rolling back to revision -1 (undo pull) - $ cd .. - -Log -R bundle:empty+full.hg - - $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" - 8 7 6 5 4 3 2 1 0 - -Pull full.hg into empty again (using -R; with hook) - - $ hg -R empty pull full.hg - changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg - pulling from full.hg - requesting all changes - adding changesets - adding manifests - adding file changes - added 9 changesets with 7 changes to 4 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - -Create partial clones - - $ rm -r empty - $ hg init empty - $ hg clone -r 3 test partial - adding changesets - adding manifests - adding file changes - added 4 changesets with 4 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone partial partial2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd partial - -Log -R full.hg in partial - - $ hg -R bundle://../full.hg log - changeset: 8:aa35859c02ea - tag: tip - parent: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3m - - changeset: 7:a6a34bfa0076 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3m - - changeset: 6:7373c1169842 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3 - - changeset: 5:1bb50a9436a7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.2 - - changeset: 4:095197eb4973 - parent: 0:f9ee2f85a263 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.1 - - changeset: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3 - - changeset: 2:e38ba6f5b7e0 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.2 - - changeset: 1:34c2bf6b0626 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.1 - - changeset: 0:f9ee2f85a263 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.0 - - -Incoming full.hg in partial - - $ hg incoming bundle://../full.hg - comparing with bundle://../full.hg - searching for changes - changeset: 4:095197eb4973 - parent: 0:f9ee2f85a263 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.1 - - changeset: 5:1bb50a9436a7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.2 - - changeset: 6:7373c1169842 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3 - - changeset: 7:a6a34bfa0076 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3m - - changeset: 8:aa35859c02ea - tag: tip - parent: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3m - - -Outgoing -R full.hg vs partial2 in partial - - $ hg -R bundle://../full.hg outgoing ../partial2 - comparing with ../partial2 - searching for changes - changeset: 4:095197eb4973 - parent: 0:f9ee2f85a263 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.1 - - changeset: 5:1bb50a9436a7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.2 - - changeset: 6:7373c1169842 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3 - - changeset: 7:a6a34bfa0076 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3m - - changeset: 8:aa35859c02ea - tag: tip - parent: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3m - - -Outgoing -R does-not-exist.hg vs partial2 in partial - - $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 - abort: No such file or directory: ../does-not-exist.hg - [255] - $ cd .. - -Direct clone from bundle (all-history) - - $ hg clone full.hg full-clone - requesting all changes - adding changesets - adding manifests - adding file changes - added 9 changesets with 7 changes to 4 files (+1 heads) - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R full-clone heads - changeset: 8:aa35859c02ea - tag: tip - parent: 3:eebf5a27f8ca - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0.3m - - changeset: 7:a6a34bfa0076 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 1.3m - - $ rm -r full-clone - -test for http://mercurial.selenic.com/bts/issue216 - -Unbundle incremental bundles into fresh empty in one go - - $ rm -r empty - $ hg init empty - $ hg -R test bundle --base null -r 0 ../0.hg - 1 changesets found - $ hg -R test bundle --base 0 -r 1 ../1.hg - 1 changesets found - $ hg -R empty unbundle -u ../0.hg ../1.hg - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - -test for 540d1059c802 - -test for 540d1059c802 - - $ hg init orig - $ cd orig - $ echo foo > foo - $ hg add foo - $ hg ci -m 'add foo' - - $ hg clone . ../copy - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg tag foo - - $ cd ../copy - $ echo >> foo - $ hg ci -m 'change foo' - $ hg bundle ../bundle.hg ../orig - searching for changes - 1 changesets found - - $ cd ../orig - $ hg incoming ../bundle.hg - comparing with ../bundle.hg - searching for changes - changeset: 2:ed1b79f46b9a - tag: tip - parent: 0:bbd179dfa0a7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: change foo - - $ cd .. - -test for http://mercurial.selenic.com/bts/issue1144 - -test that verify bundle does not traceback - -partial history bundle, fails w/ unkown parent - - $ hg -R bundle.hg verify - abort: 00changelog.i@bbd179dfa0a7: unknown parent! - [255] - -full history bundle, refuses to verify non-local repo - - $ hg -R all.hg verify - abort: cannot verify bundle or remote repos - [255] - -but, regular verify must continue to work - - $ hg -R orig verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 2 changesets, 2 total revisions - -diff against bundle - - $ hg init b - $ cd b - $ hg -R ../all.hg diff -r tip - diff -r aa35859c02ea anotherfile - --- a/anotherfile Thu Jan 01 00:00:00 1970 +0000 - +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 - @@ -1,4 +0,0 @@ - -0 - -1 - -2 - -3 - $ cd .. - -bundle single branch - - $ hg init branchy - $ cd branchy - $ echo a >a - $ hg ci -Ama - adding a - $ echo b >b - $ hg ci -Amb - adding b - $ echo b1 >b1 - $ hg ci -Amb1 - adding b1 - $ hg up 0 - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ echo c >c - $ hg ci -Amc - adding c - created new head - $ echo c1 >c1 - $ hg ci -Amc1 - adding c1 - $ hg clone -q .#tip part - -== bundling via incoming - - $ hg in -R part --bundle incoming.hg --template "{node}\n" . - comparing with . - searching for changes - d2ae7f538514cd87c17547b0de4cea71fe1af9fb - 5ece8e77363e2b5269e27c66828b72da29e4341a - -== bundling - - $ hg bundle bundle.hg part --debug - searching for changes - common changesets up to c0025332f9ed - 2 changesets found - list of changesets: - d2ae7f538514cd87c17547b0de4cea71fe1af9fb - 5ece8e77363e2b5269e27c66828b72da29e4341a - bundling changes: 0 chunks - bundling changes: 1 chunks - bundling changes: 2 chunks - bundling changes: 3 chunks - bundling changes: 4 chunks - bundling changes: 5 chunks - bundling changes: 6 chunks - bundling manifests: 0 chunks - bundling manifests: 1 chunks - bundling manifests: 2 chunks - bundling manifests: 3 chunks - bundling manifests: 4 chunks - bundling manifests: 5 chunks - bundling manifests: 6 chunks - bundling files: b 0 chunks - bundling files: b 1 chunks - bundling files: b 2 chunks - bundling files: b 3 chunks - bundling files: b1 4 chunks - bundling files: b1 5 chunks - bundling files: b1 6 chunks - bundling files: b1 7 chunks - !s. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-children.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-children.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-children.t.err @@ -1,123 +1,8 @@ + + ### Abort: timeout after 180 seconds. test children command $ cat <> $HGRCPATH > [extensions] > children = > EOF - -init - $ hg init t - $ cd t - -no working directory - $ hg children - -setup - $ echo 0 > file0 - $ hg ci -qAm 0 -d '0 0' - - $ echo 1 > file1 - $ hg ci -qAm 1 -d '1 0' - - $ echo 2 >> file0 - $ hg ci -qAm 2 -d '2 0' - - $ hg co null - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ echo 3 > file3 - $ hg ci -qAm 3 -d '3 0' - -hg children at revision 3 (tip) - $ hg children - - $ hg co null - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - -hg children at nullrev (should be 0 and 3) - $ hg children - changeset: 0:4df8521a7374 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0 - - changeset: 3:e2962852269d - tag: tip - parent: -1:000000000000 - user: test - date: Thu Jan 01 00:00:03 1970 +0000 - summary: 3 - - $ hg co 1 - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -hg children at revision 1 (should be 2) - $ hg children - changeset: 2:8f5eea5023c2 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2 - - $ hg co 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - -hg children at revision 2 (other head) - $ hg children - - $ for i in null 0 1 2 3; do - > echo "hg children -r $i" - > hg children -r $i - > done - hg children -r null - changeset: 0:4df8521a7374 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: 0 - - changeset: 3:e2962852269d - tag: tip - parent: -1:000000000000 - user: test - date: Thu Jan 01 00:00:03 1970 +0000 - summary: 3 - - hg children -r 0 - changeset: 1:708c093edef0 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: 1 - - hg children -r 1 - changeset: 2:8f5eea5023c2 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2 - - hg children -r 2 - hg children -r 3 - -hg children -r 0 file0 (should be 2) - $ hg children -r 0 file0 - changeset: 2:8f5eea5023c2 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2 - - -hg children -r 1 file0 (should be 2) - $ hg children -r 1 file0 - changeset: 2:8f5eea5023c2 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2 - - - $ hg co 0 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - -hg children file0 at revision 0 (should be 2) - $ hg children file0 - changeset: 2:8f5eea5023c2 - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2 - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-churn.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-churn.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-churn.t.err @@ -1,141 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ echo "[extensions]" >> $HGRCPATH - $ echo "churn=" >> $HGRCPATH - -create test repository - - $ hg init repo - $ cd repo - $ echo a > a - $ hg ci -Am adda -u user1 -d 6:00 - adding a - $ echo b >> a - $ echo b > b - $ hg ci -m changeba -u user2 -d 9:00 a - $ hg ci -Am addb -u user2 -d 9:30 - adding b - $ echo c >> a - $ echo c >> b - $ echo c > c - $ hg ci -m changeca -u user3 -d 12:00 a - $ hg ci -m changecb -u user3 -d 12:15 b - $ hg ci -Am addc -u user3 -d 12:30 - adding c - $ mkdir -p d/e - $ echo abc > d/e/f1.txt - $ hg ci -Am "add d/e/f1.txt" -u user1 -d 12:45 d/e/f1.txt - $ mkdir -p d/g - $ echo def > d/g/f2.txt - $ hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt - - -churn separate directories - - $ cd d - $ hg churn e - user1 1 *************************************************************** - -churn all - - $ hg churn - user3 3 *************************************************************** - user1 3 *************************************************************** - user2 2 ****************************************** - -churn excluding one dir - - $ hg churn -X e - user3 3 *************************************************************** - user2 2 ****************************************** - user1 2 ****************************************** - -churn up to rev 2 - - $ hg churn -r :2 - user2 2 *************************************************************** - user1 1 ******************************** - $ cd .. - -churn with aliases - - $ cat > ../aliases < user1 alias1 - > user3 alias3 - > not-an-alias - > EOF - -churn with .hgchurn - - $ mv ../aliases .hgchurn - $ hg churn - skipping malformed alias: not-an-alias - alias3 3 ************************************************************** - alias1 3 ************************************************************** - user2 2 ***************************************** - $ rm .hgchurn - -churn with column specifier - - $ COLUMNS=40 hg churn - user3 3 *********************** - user1 3 *********************** - user2 2 *************** - -churn by hour - - $ hg churn -f '%H' -s - 06 1 ***************** - 09 2 ********************************* - 12 4 ****************************************************************** - 13 1 ***************** - - -churn with separated added/removed lines - - $ hg rm d/g/f2.txt - $ hg ci -Am "removed d/g/f2.txt" -u user1 -d 14:00 d/g/f2.txt - $ hg churn --diffstat - user1 +3/-1 +++++++++++++++++++++++++++++++++++++++++-------------- - user3 +3/-0 +++++++++++++++++++++++++++++++++++++++++ - user2 +2/-0 +++++++++++++++++++++++++++ - -churn --diffstat with color - - $ hg --config extensions.color= churn --config color.mode=ansi \ - > --diffstat --color=always - user1 +3/-1 +++++++++++++++++++++++++++++++++++++++++-------------- - user3 +3/-0 +++++++++++++++++++++++++++++++++++++++++ - user2 +2/-0 +++++++++++++++++++++++++++ - - -changeset number churn - - $ hg churn -c - user1 4 *************************************************************** - user3 3 *********************************************** - user2 2 ******************************** - - $ echo 'with space = no-space' >> ../aliases - $ echo a >> a - $ hg commit -m a -u 'with space' -d 15:00 - -churn with space in alias - - $ hg churn --aliases ../aliases -r tip - no-space 1 ************************************************************ - - $ cd .. - - -Issue833: ZeroDivisionError - - $ hg init issue-833 - $ cd issue-833 - $ touch foo - $ hg ci -Am foo - adding foo - -this was failing with a ZeroDivisionError - - $ hg churn - test 0 - $ cd .. !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-pull-corruption.t output changed --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-pull-corruption.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-pull-corruption.t.err @@ -28,10 +28,8 @@ $ sleep 1 $ hg pull ../source 2>/dev/null + waiting for lock on repository $TESTTMP/corrupted held by 'sheevaplug:29341' pulling from ../source - transaction abort! - rollback completed - abort: pretxncommit hook exited with status 1 searching for changes adding changesets adding manifests @@ -42,6 +40,9 @@ see what happened $ wait + transaction abort! + rollback completed + abort: pretxncommit hook exited with status 1 $ hg verify checking changesets checking manifests ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-update-order.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-update-order.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-update-order.t.err @@ -1,103 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init - $ echo foo > bar - $ hg commit -Am default - adding bar - $ hg up -r null - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg branch mine - marked working directory as branch mine - $ echo hello > world - $ hg commit -Am hello - adding world - $ hg up -r null - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg branch other - marked working directory as branch other - $ echo good > bye - $ hg commit -Am other - adding bye - $ hg up -r mine - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - - $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other - abort: cannot specify both --noupdate and --updaterev - [255] - - $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - $ rm -rf ../b - - $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - updating to branch mine - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - - $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - - $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - updating to branch mine - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - - $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - updating to branch other - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - -Test -r mine ... mine is ignored: - - $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - updating to branch other - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - - $ hg clone .#other ../b -b default -b mine - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 3 files (+2 heads) - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - - $ hg clone .#other ../b - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - updating to branch other - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b - - $ hg clone -U . ../c -r 1 -r 2 > /dev/null - $ hg clone ../c ../b - updating to branch other - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf ../b ../c - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-r.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-r.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone-r.t.err @@ -1,220 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init test - $ cd test - - $ echo 0 >> afile - $ hg add afile - $ hg commit -m "0.0" - - $ echo 1 >> afile - $ hg commit -m "0.1" - - $ echo 2 >> afile - $ hg commit -m "0.2" - - $ echo 3 >> afile - $ hg commit -m "0.3" - - $ hg update -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - - $ echo 1 >> afile - $ hg commit -m "1.1" - created new head - - $ echo 2 >> afile - $ hg commit -m "1.2" - - $ echo a line > fred - $ echo 3 >> afile - $ hg add fred - $ hg commit -m "1.3" - $ hg mv afile adifferentfile - $ hg commit -m "1.3m" - - $ hg update -C 3 - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - - $ hg mv afile anotherfile - $ hg commit -m "0.3m" - - $ hg debugindex -f 1 .hg/store/data/afile.i - rev flag offset length size base link p1 p2 nodeid - 0 0000 0 3 2 0 0 -1 -1 362fef284ce2 - 1 0000 3 5 4 1 1 0 -1 125144f7e028 - 2 0000 8 7 6 2 2 1 -1 4c982badb186 - 3 0000 15 9 8 3 3 2 -1 19b1fc555737 - - $ hg debugindex .hg/store/data/adifferentfile.i - rev offset length base linkrev nodeid p1 p2 - 0 0 75 0 7 2565f3199a74 000000000000 000000000000 - - $ hg debugindex .hg/store/data/anotherfile.i - rev offset length base linkrev nodeid p1 p2 - 0 0 75 0 8 2565f3199a74 000000000000 000000000000 - - $ hg debugindex .hg/store/data/fred.i - rev offset length base linkrev nodeid p1 p2 - 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 - - $ hg debugindex .hg/store/00manifest.i - rev offset length base linkrev nodeid p1 p2 - 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 - 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 - 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 - 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 - 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 - 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 - 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 - - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 9 changesets, 7 total revisions - - $ cd .. - - $ for i in 0 1 2 3 4 5 6 7 8; do - > echo - > echo ---- hg clone -r "$i" test test-"$i" - > hg clone -r "$i" test test-"$i" - > cd test-"$i" - > hg verify - > cd .. - > done - - ---- hg clone -r 0 test test-0 - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 1 changesets, 1 total revisions - - ---- hg clone -r 1 test test-1 - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 2 changesets, 2 total revisions - - ---- hg clone -r 2 test test-2 - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 3 changesets, 3 total revisions - - ---- hg clone -r 3 test test-3 - adding changesets - adding manifests - adding file changes - added 4 changesets with 4 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 4 changesets, 4 total revisions - - ---- hg clone -r 4 test test-4 - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 2 changesets, 2 total revisions - - ---- hg clone -r 5 test test-5 - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 1 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 1 files, 3 changesets, 3 total revisions - - ---- hg clone -r 6 test test-6 - adding changesets - adding manifests - adding file changes - added 4 changesets with 5 changes to 2 files - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 4 changesets, 5 total revisions - - ---- hg clone -r 7 test test-7 - adding changesets - adding manifests - adding file changes - added 5 changesets with 6 changes to 3 files - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 3 files, 5 changesets, 6 total revisions - - ---- hg clone -r 8 test test-8 - adding changesets - adding manifests - adding file changes - added 5 changesets with 5 changes to 2 files - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 5 changesets, 5 total revisions - - $ cd test-8 - $ hg pull ../test-7 - pulling from ../test-7 - searching for changes - adding changesets - adding manifests - adding file changes - added 4 changesets with 2 changes to 3 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 4 files, 9 changesets, 7 total revisions - $ cd .. - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-clone.t.err @@ -1,448 +1,5 @@ + + ### Abort: timeout after 180 seconds. Prepare repo a: $ mkdir a - $ cd a - $ hg init - $ echo a > a - $ hg add a - $ hg commit -m test - $ echo first line > b - $ hg add b - -Create a non-inlined filelog: - - $ python -c 'for x in range(10000): print x' >> data1 - $ for j in 0 1 2 3 4 5 6 7 8 9; do - > cat data1 >> b - > hg commit -m test - > done - -List files in store/data (should show a 'b.d'): - - $ for i in .hg/store/data/*; do - > echo $i - > done - .hg/store/data/a.i - .hg/store/data/b.d - .hg/store/data/b.i - -Default operation: - - $ hg clone . ../b - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd ../b - $ cat a - a - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 11 changesets, 11 total revisions - -No update, with debug option: - - $ hg --debug clone -U . ../c - linked 8 files - $ cd ../c - $ cat a 2>/dev/null || echo "a not present" - a not present - $ hg verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 11 changesets, 11 total revisions - -Default destination: - - $ mkdir ../d - $ cd ../d - $ hg clone ../a - destination directory: a - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd a - $ hg cat a - a - $ cd ../.. - -Check that we drop the 'file:' from the path before writing the .hgrc: - - $ hg clone file:a e - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ grep 'file:' e/.hg/hgrc - [1] - -Check that path aliases are expanded: - - $ hg clone -q -U --config 'paths.foobar=a#0' foobar f - $ hg -R f showconfig paths.default - $TESTTMP/a#0 - -Use --pull: - - $ hg clone --pull a g - requesting all changes - adding changesets - adding manifests - adding file changes - added 11 changesets with 11 changes to 2 files - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R g verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 2 files, 11 changesets, 11 total revisions - -Clone to '.': - - $ mkdir h - $ cd h - $ hg clone ../a . - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd .. - - -*** Tests for option -u *** - -Adding some more history to repo a: - - $ cd a - $ hg tag ref1 - $ echo the quick brown fox >a - $ hg ci -m "hacked default" - $ hg up ref1 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg branch stable - marked working directory as branch stable - $ echo some text >a - $ hg ci -m "starting branch stable" - $ hg tag ref2 - $ echo some more text >a - $ hg ci -m "another change for branch stable" - $ hg up ref2 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg parents - changeset: 13:e8ece76546a6 - branch: stable - tag: ref2 - parent: 10:a7949464abda - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: starting branch stable - - -Repo a has two heads: - - $ hg heads - changeset: 15:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 12:f21241060d6a - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: hacked default - - - $ cd .. - - -Testing --noupdate with --updaterev (must abort): - - $ hg clone --noupdate --updaterev 1 a ua - abort: cannot specify both --noupdate and --updaterev - [255] - - -Testing clone -u: - - $ hg clone -u . a ua - updating to branch stable - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has both heads: - - $ hg -R ua heads - changeset: 15:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 12:f21241060d6a - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: hacked default - - -Same revision checked out in repo a and ua: - - $ hg -R a parents --template "{node|short}\n" - e8ece76546a6 - $ hg -R ua parents --template "{node|short}\n" - e8ece76546a6 - - $ rm -r ua - - -Testing clone --pull -u: - - $ hg clone --pull -u . a ua - requesting all changes - adding changesets - adding manifests - adding file changes - added 16 changesets with 16 changes to 3 files (+1 heads) - updating to branch stable - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has both heads: - - $ hg -R ua heads - changeset: 15:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 12:f21241060d6a - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: hacked default - - -Same revision checked out in repo a and ua: - - $ hg -R a parents --template "{node|short}\n" - e8ece76546a6 - $ hg -R ua parents --template "{node|short}\n" - e8ece76546a6 - - $ rm -r ua - - -Testing clone -u : - - $ hg clone -u stable a ua - updating to branch stable - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has both heads: - - $ hg -R ua heads - changeset: 15:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 12:f21241060d6a - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: hacked default - - -Branch 'stable' is checked out: - - $ hg -R ua parents - changeset: 15:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - - $ rm -r ua - - -Testing default checkout: - - $ hg clone a ua - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has both heads: - - $ hg -R ua heads - changeset: 15:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 12:f21241060d6a - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: hacked default - - -Branch 'default' is checked out: - - $ hg -R ua parents - changeset: 12:f21241060d6a - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: hacked default - - - $ rm -r ua - - -Testing #: - - $ hg clone -u . a#stable ua - adding changesets - adding manifests - adding file changes - added 14 changesets with 14 changes to 3 files - updating to branch stable - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): - - $ hg -R ua heads - changeset: 13:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 10:a7949464abda - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: test - - -Same revision checked out in repo a and ua: - - $ hg -R a parents --template "{node|short}\n" - e8ece76546a6 - $ hg -R ua parents --template "{node|short}\n" - e8ece76546a6 - - $ rm -r ua - - -Testing -u -r : - - $ hg clone -u . -r stable a ua - adding changesets - adding manifests - adding file changes - added 14 changesets with 14 changes to 3 files - updating to branch stable - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): - - $ hg -R ua heads - changeset: 13:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 10:a7949464abda - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: test - - -Same revision checked out in repo a and ua: - - $ hg -R a parents --template "{node|short}\n" - e8ece76546a6 - $ hg -R ua parents --template "{node|short}\n" - e8ece76546a6 - - $ rm -r ua - - -Testing -r : - - $ hg clone -r stable a ua - adding changesets - adding manifests - adding file changes - added 14 changesets with 14 changes to 3 files - updating to branch stable - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - -Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): - - $ hg -R ua heads - changeset: 13:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - changeset: 10:a7949464abda - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: test - - -Branch 'stable' is checked out: - - $ hg -R ua parents - changeset: 13:0aae7cf88f0d - branch: stable - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: another change for branch stable - - - $ rm -r ua - - -Issue2267: Error in 1.6 hg.py: TypeError: 'NoneType' object is not -iterable in addbranchrevs() - - $ cat < simpleclone.py - > from mercurial import ui, hg - > myui = ui.ui() - > repo = hg.repository(myui, 'a') - > hg.clone(myui, repo, dest="ua") - > EOF - - $ python simpleclone.py - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - - $ rm -r ua - - $ cat < branchclone.py - > from mercurial import ui, hg - > myui = ui.ui() - > repo = hg.repository(myui, 'a') - > hg.clone(myui, repo, dest="ua", branch=["stable",]) - > EOF - - $ python branchclone.py - adding changesets - adding manifests - adding file changes - added 14 changesets with 14 changes to 3 files - updating to branch stable - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -r ua !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-command-template.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-command-template.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-command-template.t.err @@ -1,1333 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init a - $ cd a - $ echo a > a - $ hg add a - $ echo line 1 > b - $ echo line 2 >> b - $ hg commit -l b -d '1000000 0' -u 'User Name ' - - $ hg add b - $ echo other 1 > c - $ echo other 2 >> c - $ echo >> c - $ echo other 3 >> c - $ hg commit -l c -d '1100000 0' -u 'A. N. Other ' - - $ hg add c - $ hg commit -m 'no person' -d '1200000 0' -u 'other@place' - $ echo c >> c - $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person' - - $ echo foo > .hg/branch - $ hg commit -m 'new branch' -d '1400000 0' -u 'person' - - $ hg co -q 3 - $ echo other 4 >> d - $ hg add d - $ hg commit -m 'new head' -d '1500000 0' -u 'person' - - $ hg merge -q foo - $ hg commit -m 'merge' -d '1500001 0' -u 'person' - -Second branch starting at nullrev: - - $ hg update null - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved - $ echo second > second - $ hg add second - $ hg commit -m second -d '1000000 0' -u 'User Name ' - created new head - - $ echo third > third - $ hg add third - $ hg mv second fourth - $ hg commit -m third -d "2020-01-01 10:01" - -Make sure user/global hgrc does not affect tests - - $ echo '[ui]' > .hg/hgrc - $ echo 'logtemplate =' >> .hg/hgrc - $ echo 'style =' >> .hg/hgrc - -Default style is like normal output: - - $ hg log > log.out - $ hg log --style default > style.out - $ cmp log.out style.out || diff -u log.out style.out - - $ hg log -v > log.out - $ hg log -v --style default > style.out - $ cmp log.out style.out || diff -u log.out style.out - - $ hg log --debug > log.out - $ hg log --debug --style default > style.out - $ cmp log.out style.out || diff -u log.out style.out - -Revision with no copies (used to print a traceback): - - $ hg tip -v --template '\n' - - -Compact style works: - - $ hg log --style compact - 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test - third - - 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user - second - - 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person - merge - - 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person - new head - - 4 32a18f097fcc 1970-01-17 04:53 +0000 person - new branch - - 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person - no user, no domain - - 2 97054abb4ab8 1970-01-14 21:20 +0000 other - no person - - 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other - other 1 - - 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user - line 1 - - - $ hg log -v --style compact - 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test - third - - 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name - second - - 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person - merge - - 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person - new head - - 4 32a18f097fcc 1970-01-17 04:53 +0000 person - new branch - - 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person - no user, no domain - - 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place - no person - - 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other - other 1 - other 2 - - other 3 - - 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name - line 1 - line 2 - - - $ hg log --debug --style compact - 8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test - third - - 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name - second - - 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person - merge - - 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person - new head - - 4:3,-1 32a18f097fcc 1970-01-17 04:53 +0000 person - new branch - - 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person - no user, no domain - - 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place - no person - - 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other - other 1 - other 2 - - other 3 - - 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name - line 1 - line 2 - - -Test xml styles: - - $ hg log --style xml - - - - tip - test - 2020-01-01T10:01:00+00:00 - third - - - - User Name - 1970-01-12T13:46:40+00:00 - second - - - - - person - 1970-01-18T08:40:01+00:00 - merge - - - - person - 1970-01-18T08:40:00+00:00 - new head - - - foo - person - 1970-01-17T04:53:20+00:00 - new branch - - - person - 1970-01-16T01:06:40+00:00 - no user, no domain - - - other - 1970-01-14T21:20:00+00:00 - no person - - - A. N. Other - 1970-01-13T17:33:20+00:00 - other 1 - other 2 - - other 3 - - - User Name - 1970-01-12T13:46:40+00:00 - line 1 - line 2 - - - - $ hg log -v --style xml - - - - tip - test - 2020-01-01T10:01:00+00:00 - third - - fourth - third - second - - - fourth - - - - - User Name - 1970-01-12T13:46:40+00:00 - second - - second - - - - - - person - 1970-01-18T08:40:01+00:00 - merge - - - - - - person - 1970-01-18T08:40:00+00:00 - new head - - d - - - - foo - person - 1970-01-17T04:53:20+00:00 - new branch - - - - - person - 1970-01-16T01:06:40+00:00 - no user, no domain - - c - - - - other - 1970-01-14T21:20:00+00:00 - no person - - c - - - - A. N. Other - 1970-01-13T17:33:20+00:00 - other 1 - other 2 - - other 3 - - b - - - - User Name - 1970-01-12T13:46:40+00:00 - line 1 - line 2 - - a - - - - - $ hg log --debug --style xml - - - - tip - - - test - 2020-01-01T10:01:00+00:00 - third - - fourth - third - second - - - fourth - - default - - - - - User Name - 1970-01-12T13:46:40+00:00 - second - - second - - default - - - - - person - 1970-01-18T08:40:01+00:00 - merge - - - default - - - - - person - 1970-01-18T08:40:00+00:00 - new head - - d - - default - - - foo - - - person - 1970-01-17T04:53:20+00:00 - new branch - - - foo - - - - - person - 1970-01-16T01:06:40+00:00 - no user, no domain - - c - - default - - - - - other - 1970-01-14T21:20:00+00:00 - no person - - c - - default - - - - - A. N. Other - 1970-01-13T17:33:20+00:00 - other 1 - other 2 - - other 3 - - b - - default - - - - - User Name - 1970-01-12T13:46:40+00:00 - line 1 - line 2 - - a - - default - - - - -Error if style not readable: - - $ touch q - $ chmod 0 q - $ hg log --style ./q - abort: Permission denied: ./q - [255] - -Error if no style: - - $ hg log --style notexist - abort: style not found: notexist - [255] - -Error if style missing key: - - $ echo 'q = q' > t - $ hg log --style ./t - abort: ./t: no key named 'changeset' - [255] - -Error if include fails: - - $ echo 'changeset = q' >> t - $ hg log --style ./t - abort: template file ./q: Permission denied - [255] - -Include works: - - $ rm q - $ echo '{rev}' > q - $ hg log --style ./t - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 0 - -ui.style works: - - $ echo '[ui]' > .hg/hgrc - $ echo 'style = t' >> .hg/hgrc - $ hg log - 8 - 7 - 6 - 5 - 4 - 3 - 2 - 1 - 0 - - -Issue338: - - $ hg log --style=changelog > changelog - - $ cat changelog - 2020-01-01 test - - * fourth, second, third: - third - [95c24699272e] [tip] - - 1970-01-12 User Name - - * second: - second - [29114dbae42b] - - 1970-01-18 person - - * merge - [c7b487c6c50e] - - * d: - new head - [13207e5a10d9] - - 1970-01-17 person - - * new branch - [32a18f097fcc] - - 1970-01-16 person - - * c: - no user, no domain - [10e46f2dcbf4] - - 1970-01-14 other - - * c: - no person - [97054abb4ab8] - - 1970-01-13 A. N. Other - - * b: - other 1 other 2 - - other 3 - [b608e9d1a3f0] - - 1970-01-12 User Name - - * a: - line 1 line 2 - [1e4e1b8f71e0] - - -Issue2130: xml output for 'hg heads' is malformed - - $ hg heads --style changelog - 2020-01-01 test - - * fourth, second, third: - third - [95c24699272e] [tip] - - 1970-01-18 person - - * merge - [c7b487c6c50e] - - 1970-01-17 person - - * new branch - [32a18f097fcc] - - -Keys work: - - $ for key in author branches date desc file_adds file_dels file_mods \ - > file_copies file_copies_switch files \ - > manifest node parents rev tags diffstat extras; do - > for mode in '' --verbose --debug; do - > hg log $mode --template "$key$mode: {$key}\n" - > done - > done - author: test - author: User Name - author: person - author: person - author: person - author: person - author: other@place - author: A. N. Other - author: User Name - author--verbose: test - author--verbose: User Name - author--verbose: person - author--verbose: person - author--verbose: person - author--verbose: person - author--verbose: other@place - author--verbose: A. N. Other - author--verbose: User Name - author--debug: test - author--debug: User Name - author--debug: person - author--debug: person - author--debug: person - author--debug: person - author--debug: other@place - author--debug: A. N. Other - author--debug: User Name - branches: - branches: - branches: - branches: - branches: foo - branches: - branches: - branches: - branches: - branches--verbose: - branches--verbose: - branches--verbose: - branches--verbose: - branches--verbose: foo - branches--verbose: - branches--verbose: - branches--verbose: - branches--verbose: - branches--debug: - branches--debug: - branches--debug: - branches--debug: - branches--debug: foo - branches--debug: - branches--debug: - branches--debug: - branches--debug: - date: 1577872860.00 - date: 1000000.00 - date: 1500001.00 - date: 1500000.00 - date: 1400000.00 - date: 1300000.00 - date: 1200000.00 - date: 1100000.00 - date: 1000000.00 - date--verbose: 1577872860.00 - date--verbose: 1000000.00 - date--verbose: 1500001.00 - date--verbose: 1500000.00 - date--verbose: 1400000.00 - date--verbose: 1300000.00 - date--verbose: 1200000.00 - date--verbose: 1100000.00 - date--verbose: 1000000.00 - date--debug: 1577872860.00 - date--debug: 1000000.00 - date--debug: 1500001.00 - date--debug: 1500000.00 - date--debug: 1400000.00 - date--debug: 1300000.00 - date--debug: 1200000.00 - date--debug: 1100000.00 - date--debug: 1000000.00 - desc: third - desc: second - desc: merge - desc: new head - desc: new branch - desc: no user, no domain - desc: no person - desc: other 1 - other 2 - - other 3 - desc: line 1 - line 2 - desc--verbose: third - desc--verbose: second - desc--verbose: merge - desc--verbose: new head - desc--verbose: new branch - desc--verbose: no user, no domain - desc--verbose: no person - desc--verbose: other 1 - other 2 - - other 3 - desc--verbose: line 1 - line 2 - desc--debug: third - desc--debug: second - desc--debug: merge - desc--debug: new head - desc--debug: new branch - desc--debug: no user, no domain - desc--debug: no person - desc--debug: other 1 - other 2 - - other 3 - desc--debug: line 1 - line 2 - file_adds: fourth third - file_adds: second - file_adds: - file_adds: d - file_adds: - file_adds: - file_adds: c - file_adds: b - file_adds: a - file_adds--verbose: fourth third - file_adds--verbose: second - file_adds--verbose: - file_adds--verbose: d - file_adds--verbose: - file_adds--verbose: - file_adds--verbose: c - file_adds--verbose: b - file_adds--verbose: a - file_adds--debug: fourth third - file_adds--debug: second - file_adds--debug: - file_adds--debug: d - file_adds--debug: - file_adds--debug: - file_adds--debug: c - file_adds--debug: b - file_adds--debug: a - file_dels: second - file_dels: - file_dels: - file_dels: - file_dels: - file_dels: - file_dels: - file_dels: - file_dels: - file_dels--verbose: second - file_dels--verbose: - file_dels--verbose: - file_dels--verbose: - file_dels--verbose: - file_dels--verbose: - file_dels--verbose: - file_dels--verbose: - file_dels--verbose: - file_dels--debug: second - file_dels--debug: - file_dels--debug: - file_dels--debug: - file_dels--debug: - file_dels--debug: - file_dels--debug: - file_dels--debug: - file_dels--debug: - file_mods: - file_mods: - file_mods: - file_mods: - file_mods: - file_mods: c - file_mods: - file_mods: - file_mods: - file_mods--verbose: - file_mods--verbose: - file_mods--verbose: - file_mods--verbose: - file_mods--verbose: - file_mods--verbose: c - file_mods--verbose: - file_mods--verbose: - file_mods--verbose: - file_mods--debug: - file_mods--debug: - file_mods--debug: - file_mods--debug: - file_mods--debug: - file_mods--debug: c - file_mods--debug: - file_mods--debug: - file_mods--debug: - file_copies: fourth (second) - file_copies: - file_copies: - file_copies: - file_copies: - file_copies: - file_copies: - file_copies: - file_copies: - file_copies--verbose: fourth (second) - file_copies--verbose: - file_copies--verbose: - file_copies--verbose: - file_copies--verbose: - file_copies--verbose: - file_copies--verbose: - file_copies--verbose: - file_copies--verbose: - file_copies--debug: fourth (second) - file_copies--debug: - file_copies--debug: - file_copies--debug: - file_copies--debug: - file_copies--debug: - file_copies--debug: - file_copies--debug: - file_copies--debug: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--verbose: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - file_copies_switch--debug: - files: fourth second third - files: second - files: - files: d - files: - files: c - files: c - files: b - files: a - files--verbose: fourth second third - files--verbose: second - files--verbose: - files--verbose: d - files--verbose: - files--verbose: c - files--verbose: c - files--verbose: b - files--verbose: a - files--debug: fourth second third - files--debug: second - files--debug: - files--debug: d - files--debug: - files--debug: c - files--debug: c - files--debug: b - files--debug: a - manifest: 8:94961b75a2da - manifest: 7:f2dbc354b94e - manifest: 6:91015e9dbdd7 - manifest: 5:4dc3def4f9b4 - manifest: 4:90ae8dda64e1 - manifest: 3:cb5a1327723b - manifest: 2:6e0e82995c35 - manifest: 1:4e8d705b1e53 - manifest: 0:a0c8bcbbb45c - manifest--verbose: 8:94961b75a2da - manifest--verbose: 7:f2dbc354b94e - manifest--verbose: 6:91015e9dbdd7 - manifest--verbose: 5:4dc3def4f9b4 - manifest--verbose: 4:90ae8dda64e1 - manifest--verbose: 3:cb5a1327723b - manifest--verbose: 2:6e0e82995c35 - manifest--verbose: 1:4e8d705b1e53 - manifest--verbose: 0:a0c8bcbbb45c - manifest--debug: 8:94961b75a2da554b4df6fb599e5bfc7d48de0c64 - manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf - manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf - manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 - manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363 - manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc - manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 - manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 - manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 - node: 95c24699272ef57d062b8bccc32c878bf841784a - node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 - node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f - node: 13207e5a10d9fd28ec424934298e176197f2c67f - node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 - node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 - node: 97054abb4ab824450e9164180baf491ae0078465 - node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 - node: 1e4e1b8f71e05681d422154f5421e385fec3454f - node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a - node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 - node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f - node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f - node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 - node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 - node--verbose: 97054abb4ab824450e9164180baf491ae0078465 - node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 - node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f - node--debug: 95c24699272ef57d062b8bccc32c878bf841784a - node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 - node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f - node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f - node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 - node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 - node--debug: 97054abb4ab824450e9164180baf491ae0078465 - node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 - node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f - parents: - parents: -1:000000000000 - parents: 5:13207e5a10d9 4:32a18f097fcc - parents: 3:10e46f2dcbf4 - parents: - parents: - parents: - parents: - parents: - parents--verbose: - parents--verbose: -1:000000000000 - parents--verbose: 5:13207e5a10d9 4:32a18f097fcc - parents--verbose: 3:10e46f2dcbf4 - parents--verbose: - parents--verbose: - parents--verbose: - parents--verbose: - parents--verbose: - parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 - parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 - parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 - parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 - parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 - parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 - parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 - parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 - parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 - rev: 8 - rev: 7 - rev: 6 - rev: 5 - rev: 4 - rev: 3 - rev: 2 - rev: 1 - rev: 0 - rev--verbose: 8 - rev--verbose: 7 - rev--verbose: 6 - rev--verbose: 5 - rev--verbose: 4 - rev--verbose: 3 - rev--verbose: 2 - rev--verbose: 1 - rev--verbose: 0 - rev--debug: 8 - rev--debug: 7 - rev--debug: 6 - rev--debug: 5 - rev--debug: 4 - rev--debug: 3 - rev--debug: 2 - rev--debug: 1 - rev--debug: 0 - tags: tip - tags: - tags: - tags: - tags: - tags: - tags: - tags: - tags: - tags--verbose: tip - tags--verbose: - tags--verbose: - tags--verbose: - tags--verbose: - tags--verbose: - tags--verbose: - tags--verbose: - tags--verbose: - tags--debug: tip - tags--debug: - tags--debug: - tags--debug: - tags--debug: - tags--debug: - tags--debug: - tags--debug: - tags--debug: - diffstat: 3: +2/-1 - diffstat: 1: +1/-0 - diffstat: 0: +0/-0 - diffstat: 1: +1/-0 - diffstat: 0: +0/-0 - diffstat: 1: +1/-0 - diffstat: 1: +4/-0 - diffstat: 1: +2/-0 - diffstat: 1: +1/-0 - diffstat--verbose: 3: +2/-1 - diffstat--verbose: 1: +1/-0 - diffstat--verbose: 0: +0/-0 - diffstat--verbose: 1: +1/-0 - diffstat--verbose: 0: +0/-0 - diffstat--verbose: 1: +1/-0 - diffstat--verbose: 1: +4/-0 - diffstat--verbose: 1: +2/-0 - diffstat--verbose: 1: +1/-0 - diffstat--debug: 3: +2/-1 - diffstat--debug: 1: +1/-0 - diffstat--debug: 0: +0/-0 - diffstat--debug: 1: +1/-0 - diffstat--debug: 0: +0/-0 - diffstat--debug: 1: +1/-0 - diffstat--debug: 1: +4/-0 - diffstat--debug: 1: +2/-0 - diffstat--debug: 1: +1/-0 - extras: branch=default - extras: branch=default - extras: branch=default - extras: branch=default - extras: branch=foo - extras: branch=default - extras: branch=default - extras: branch=default - extras: branch=default - extras--verbose: branch=default - extras--verbose: branch=default - extras--verbose: branch=default - extras--verbose: branch=default - extras--verbose: branch=foo - extras--verbose: branch=default - extras--verbose: branch=default - extras--verbose: branch=default - extras--verbose: branch=default - extras--debug: branch=default - extras--debug: branch=default - extras--debug: branch=default - extras--debug: branch=default - extras--debug: branch=foo - extras--debug: branch=default - extras--debug: branch=default - extras--debug: branch=default - extras--debug: branch=default - - -Filters work: - - $ hg log --template '{author|domain}\n' - - hostname - - - - - place - place - hostname - - $ hg log --template '{author|person}\n' - test - User Name - person - person - person - person - other - A. N. Other - User Name - - $ hg log --template '{author|user}\n' - test - user - person - person - person - person - other - other - user - - $ hg log --template '{date|age}\n' > /dev/null || exit 1 - - $ hg log -l1 --template '{date|age}\n' - in the future - $ hg log --template '{date|date}\n' - Wed Jan 01 10:01:00 2020 +0000 - Mon Jan 12 13:46:40 1970 +0000 - Sun Jan 18 08:40:01 1970 +0000 - Sun Jan 18 08:40:00 1970 +0000 - Sat Jan 17 04:53:20 1970 +0000 - Fri Jan 16 01:06:40 1970 +0000 - Wed Jan 14 21:20:00 1970 +0000 - Tue Jan 13 17:33:20 1970 +0000 - Mon Jan 12 13:46:40 1970 +0000 - - $ hg log --template '{date|isodate}\n' - 2020-01-01 10:01 +0000 - 1970-01-12 13:46 +0000 - 1970-01-18 08:40 +0000 - 1970-01-18 08:40 +0000 - 1970-01-17 04:53 +0000 - 1970-01-16 01:06 +0000 - 1970-01-14 21:20 +0000 - 1970-01-13 17:33 +0000 - 1970-01-12 13:46 +0000 - - $ hg log --template '{date|isodatesec}\n' - 2020-01-01 10:01:00 +0000 - 1970-01-12 13:46:40 +0000 - 1970-01-18 08:40:01 +0000 - 1970-01-18 08:40:00 +0000 - 1970-01-17 04:53:20 +0000 - 1970-01-16 01:06:40 +0000 - 1970-01-14 21:20:00 +0000 - 1970-01-13 17:33:20 +0000 - 1970-01-12 13:46:40 +0000 - - $ hg log --template '{date|rfc822date}\n' - Wed, 01 Jan 2020 10:01:00 +0000 - Mon, 12 Jan 1970 13:46:40 +0000 - Sun, 18 Jan 1970 08:40:01 +0000 - Sun, 18 Jan 1970 08:40:00 +0000 - Sat, 17 Jan 1970 04:53:20 +0000 - Fri, 16 Jan 1970 01:06:40 +0000 - Wed, 14 Jan 1970 21:20:00 +0000 - Tue, 13 Jan 1970 17:33:20 +0000 - Mon, 12 Jan 1970 13:46:40 +0000 - - $ hg log --template '{desc|firstline}\n' - third - second - merge - new head - new branch - no user, no domain - no person - other 1 - line 1 - - $ hg log --template '{node|short}\n' - 95c24699272e - 29114dbae42b - c7b487c6c50e - 13207e5a10d9 - 32a18f097fcc - 10e46f2dcbf4 - 97054abb4ab8 - b608e9d1a3f0 - 1e4e1b8f71e0 - - $ hg log --template '\n' - - - - - - - - - - - $ hg log --template '{rev}: {children}\n' - 8: - 7: 8:95c24699272e - 6: - 5: 6:c7b487c6c50e - 4: 6:c7b487c6c50e - 3: 4:32a18f097fcc 5:13207e5a10d9 - 2: 3:10e46f2dcbf4 - 1: 2:97054abb4ab8 - 0: 1:b608e9d1a3f0 - -Formatnode filter works: - - $ hg -q log -r 0 --template '{node|formatnode}\n' - 1e4e1b8f71e0 - - $ hg log -r 0 --template '{node|formatnode}\n' - 1e4e1b8f71e0 - - $ hg -v log -r 0 --template '{node|formatnode}\n' - 1e4e1b8f71e0 - - $ hg --debug log -r 0 --template '{node|formatnode}\n' - 1e4e1b8f71e05681d422154f5421e385fec3454f - -Error on syntax: - - $ echo 'x = "f' >> t - $ hg log - abort: t:3: unmatched quotes - [255] - - $ cd .. - - -latesttag: - - $ hg init latesttag - $ cd latesttag - - $ echo a > file - $ hg ci -Am a -d '0 0' - adding file - - $ echo b >> file - $ hg ci -m b -d '1 0' - - $ echo c >> head1 - $ hg ci -Am h1c -d '2 0' - adding head1 - - $ hg update -q 1 - $ echo d >> head2 - $ hg ci -Am h2d -d '3 0' - adding head2 - created new head - - $ echo e >> head2 - $ hg ci -m h2e -d '4 0' - - $ hg merge -q - $ hg ci -m merge -d '5 0' - -No tag set: - - $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' - 5: null+5 - 4: null+4 - 3: null+3 - 2: null+3 - 1: null+2 - 0: null+1 - -One common tag: longuest path wins: - - $ hg tag -r 1 -m t1 -d '6 0' t1 - $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' - 6: t1+4 - 5: t1+3 - 4: t1+2 - 3: t1+1 - 2: t1+1 - 1: t1+0 - 0: null+1 - -One ancestor tag: more recent wins: - - $ hg tag -r 2 -m t2 -d '7 0' t2 - $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' - 7: t2+3 - 6: t2+2 - 5: t2+1 - 4: t1+2 - 3: t1+1 - 2: t2+0 - 1: t1+0 - 0: null+1 - -Two branch tags: more recent wins: - - $ hg tag -r 3 -m t3 -d '8 0' t3 - $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' - 8: t3+5 - 7: t3+4 - 6: t3+3 - 5: t3+2 - 4: t3+1 - 3: t3+0 - 2: t2+0 - 1: t1+0 - 0: null+1 - -Merged tag overrides: - - $ hg tag -r 5 -m t5 -d '9 0' t5 - $ hg tag -r 3 -m at3 -d '10 0' at3 - $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' - 10: t5+5 - 9: t5+4 - 8: t5+3 - 7: t5+2 - 6: t5+1 - 5: t5+0 - 4: at3:t3+1 - 3: at3:t3+0 - 2: t2+0 - 1: t1+0 - 0: null+1 - - $ cd .. - - -Style path expansion: issue1948 - ui.style option doesn't work on OSX -if it is a relative path - - $ mkdir -p home/styles - - $ cat > home/styles/teststyle < changeset = 'test {rev}:{node|short}\n' - > EOF - - $ HOME=`pwd`/home; export HOME - - $ cat > latesttag/.hg/hgrc < [ui] - > style = ~/styles/teststyle - > EOF - - $ hg -R latesttag tip - test 10:dee8f28249af - -Test recursive showlist template (issue1989): - - $ cat > style1989 < changeset = '{file_mods}{manifest}{extras}' - > file_mod = 'M|{author|person}\n' - > manifest = '{rev},{author}\n' - > extra = '{key}: {author}\n' - > EOF - - $ hg -R latesttag log -r tip --style=style1989 - M|test - 10,test - branch: test - !..s.s.s.s ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-commit.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-commit.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-commit.t.err @@ -1,269 +1,5 @@ + + ### Abort: timeout after 180 seconds. commit date test $ hg init test - $ cd test - $ echo foo > foo - $ hg add foo - $ HGEDITOR=true hg commit -m "" - abort: empty commit message - [255] - $ hg commit -d '0 0' -m commit-1 - $ echo foo >> foo - $ hg commit -d '1 4444444' -m commit-3 - abort: impossible time zone offset: 4444444 - [255] - $ hg commit -d '1 15.1' -m commit-4 - abort: invalid date: '1\t15.1' - [255] - $ hg commit -d 'foo bar' -m commit-5 - abort: invalid date: 'foo bar' - [255] - $ hg commit -d ' 1 4444' -m commit-6 - $ hg commit -d '111111111111 0' -m commit-7 - abort: date exceeds 32 bits: 111111111111 - [255] - -commit added file that has been deleted - - $ echo bar > bar - $ hg add bar - $ rm bar - $ hg commit -m commit-8 - nothing changed - [1] - $ hg commit -m commit-8-2 bar - abort: bar: file not found! - [255] - - $ hg -q revert -a --no-backup - - $ mkdir dir - $ echo boo > dir/file - $ hg add - adding dir/file - $ hg -v commit -m commit-9 dir - dir/file - committed changeset 2:d2a76177cb42 - - $ echo > dir.file - $ hg add - adding dir.file - $ hg commit -m commit-10 dir dir.file - abort: dir: no match under directory! - [255] - - $ echo >> dir/file - $ mkdir bleh - $ mkdir dir2 - $ cd bleh - $ hg commit -m commit-11 . - abort: bleh: no match under directory! - [255] - $ hg commit -m commit-12 ../dir ../dir2 - abort: dir2: no match under directory! - [255] - $ hg -v commit -m commit-13 ../dir - dir/file - committed changeset 3:1cd62a2d8db5 - $ cd .. - - $ hg commit -m commit-14 does-not-exist - abort: does-not-exist: No such file or directory - [255] - $ ln -s foo baz - $ hg commit -m commit-15 baz - abort: baz: file not tracked! - [255] - $ touch quux - $ hg commit -m commit-16 quux - abort: quux: file not tracked! - [255] - $ echo >> dir/file - $ hg -v commit -m commit-17 dir/file - dir/file - committed changeset 4:49176991390e - -An empty date was interpreted as epoch origin - - $ echo foo >> foo - $ hg commit -d '' -m commit-no-date - $ hg tip --template '{date|isodate}\n' | grep '1970' - [1] - $ cd .. - - -partial subdir commit test - - $ hg init test2 - $ cd test2 - $ mkdir foo - $ echo foo > foo/foo - $ mkdir bar - $ echo bar > bar/bar - $ hg add - adding bar/bar - adding foo/foo - $ hg ci -m commit-subdir-1 foo - $ hg ci -m commit-subdir-2 bar - -subdir log 1 - - $ hg log -v foo - changeset: 0:f97e73a25882 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - files: foo/foo - description: - commit-subdir-1 - - - -subdir log 2 - - $ hg log -v bar - changeset: 1:aa809156d50d - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - files: bar/bar - description: - commit-subdir-2 - - - -full log - - $ hg log -v - changeset: 1:aa809156d50d - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - files: bar/bar - description: - commit-subdir-2 - - - changeset: 0:f97e73a25882 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - files: foo/foo - description: - commit-subdir-1 - - - $ cd .. - - -dot and subdir commit test - - $ hg init test3 - $ cd test3 - $ mkdir foo - $ echo foo content > foo/plain-file - $ hg add foo/plain-file - $ hg ci -m commit-foo-subdir foo - $ echo modified foo content > foo/plain-file - $ hg ci -m commit-foo-dot . - -full log - - $ hg log -v - changeset: 1:95b38e3a5b2e - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - files: foo/plain-file - description: - commit-foo-dot - - - changeset: 0:65d4e9386227 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - files: foo/plain-file - description: - commit-foo-subdir - - - -subdir log - - $ cd foo - $ hg log . - changeset: 1:95b38e3a5b2e - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: commit-foo-dot - - changeset: 0:65d4e9386227 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: commit-foo-subdir - - $ cd .. - $ cd .. - -Issue1049: Hg permits partial commit of merge without warning - - $ cd .. - $ hg init issue1049 - $ cd issue1049 - $ echo a > a - $ hg ci -Ama - adding a - $ echo a >> a - $ hg ci -mb - $ hg up 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo b >> a - $ hg ci -mc - created new head - $ HGMERGE=true hg merge - merging a - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - -should fail because we are specifying a file name - - $ hg ci -mmerge a - abort: cannot partially commit a merge (do not specify files or patterns) - [255] - -should fail because we are specifying a pattern - - $ hg ci -mmerge -I a - abort: cannot partially commit a merge (do not specify files or patterns) - [255] - -should succeed - - $ hg ci -mmerge - $ cd .. - - -test commit message content - - $ hg init commitmsg - $ cd commitmsg - $ echo changed > changed - $ echo removed > removed - $ hg ci -qAm init - - $ hg rm removed - $ echo changed >> changed - $ echo added > added - $ hg add added - $ HGEDITOR=cat hg ci -A - - - HG: Enter commit message. Lines beginning with 'HG:' are removed. - HG: Leave message empty to abort commit. - HG: -- - HG: user: test - HG: branch 'default' - HG: added added - HG: changed changed - HG: removed removed - abort: empty commit message - [255] ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-datesort.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-datesort.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-datesort.t.err @@ -1,117 +1,8 @@ + + ### Abort: timeout after 180 seconds. $ cat >> $HGRCPATH < [extensions] > convert= > graphlog= > EOF - $ hg init t - $ cd t - $ echo a >> a - $ hg ci -Am a0 -d '1 0' - adding a - $ hg branch brancha - marked working directory as branch brancha - $ echo a >> a - $ hg ci -m a1 -d '2 0' - $ echo a >> a - $ hg ci -m a2 -d '3 0' - $ echo a >> a - $ hg ci -m a3 -d '4 0' - $ hg up -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg branch branchb - marked working directory as branch branchb - $ echo b >> b - $ hg ci -Am b0 -d '6 0' - adding b - $ hg up -C brancha - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo a >> a - $ hg ci -m a4 -d '5 0' - $ echo a >> a - $ hg ci -m a5 -d '7 0' - $ echo a >> a - $ hg ci -m a6 -d '8 0' - $ hg up -C branchb - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo b >> b - $ hg ci -m b1 -d '9 0' - $ cd .. - -convert with datesort - - $ hg convert --datesort t t-datesort - initializing destination t-datesort repository - scanning source... - sorting... - converting... - 8 a0 - 7 a1 - 6 a2 - 5 a3 - 4 a4 - 3 b0 - 2 a5 - 1 a6 - 0 b1 - -graph converted repo - - $ hg -R t-datesort glog --template '{rev} "{desc}"\n' - o 8 "b1" - | - | o 7 "a6" - | | - | o 6 "a5" - | | - o | 5 "b0" - | | - | o 4 "a4" - | | - | o 3 "a3" - | | - | o 2 "a2" - | | - | o 1 "a1" - |/ - o 0 "a0" - - -convert with datesort (default mode) - - $ hg convert t t-sourcesort - initializing destination t-sourcesort repository - scanning source... - sorting... - converting... - 8 a0 - 7 a1 - 6 a2 - 5 a3 - 4 b0 - 3 a4 - 2 a5 - 1 a6 - 0 b1 - -graph converted repo - - $ hg -R t-sourcesort glog --template '{rev} "{desc}"\n' - o 8 "b1" - | - | o 7 "a6" - | | - | o 6 "a5" - | | - | o 5 "a4" - | | - o | 4 "b0" - | | - | o 3 "a3" - | | - | o 2 "a2" - | | - | o 1 "a1" - |/ - o 0 "a0" - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-filemap.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-filemap.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-filemap.t.err @@ -1,284 +1,4 @@ + + ### Abort: timeout after 180 seconds. $ HGMERGE=true; export HGMERGE - $ echo '[extensions]' >> $HGRCPATH - $ echo 'graphlog =' >> $HGRCPATH - $ echo 'convert =' >> $HGRCPATH - $ glog() - > { - > hg glog --template '{rev} "{desc}" files: {files}\n' "$@" - > } - $ hg init source - $ cd source - $ echo foo > foo - $ echo baz > baz - $ mkdir -p dir/subdir - $ echo dir/file >> dir/file - $ echo dir/file2 >> dir/file2 - $ echo dir/subdir/file3 >> dir/subdir/file3 - $ echo dir/subdir/file4 >> dir/subdir/file4 - $ hg ci -d '0 0' -qAm '0: add foo baz dir/' - $ echo bar > bar - $ echo quux > quux - $ hg copy foo copied - $ hg ci -d '1 0' -qAm '1: add bar quux; copy foo to copied' - $ echo >> foo - $ hg ci -d '2 0' -m '2: change foo' - $ hg up -qC 1 - $ echo >> bar - $ echo >> quux - $ hg ci -d '3 0' -m '3: change bar quux' - created new head - $ hg up -qC 2 - $ hg merge -qr 3 - $ echo >> bar - $ echo >> baz - $ hg ci -d '4 0' -m '4: first merge; change bar baz' - $ echo >> bar - $ echo 1 >> baz - $ echo >> quux - $ hg ci -d '5 0' -m '5: change bar baz quux' - $ hg up -qC 4 - $ echo >> foo - $ echo 2 >> baz - $ hg ci -d '6 0' -m '6: change foo baz' - created new head - $ hg up -qC 5 - $ hg merge -qr 6 - $ echo >> bar - $ hg ci -d '7 0' -m '7: second merge; change bar' - $ echo >> foo - $ hg ci -m '8: change foo' - $ glog - @ 8 "8: change foo" files: foo - | - o 7 "7: second merge; change bar" files: bar baz - |\ - | o 6 "6: change foo baz" files: baz foo - | | - o | 5 "5: change bar baz quux" files: bar baz quux - |/ - o 4 "4: first merge; change bar baz" files: bar baz - |\ - | o 3 "3: change bar quux" files: bar quux - | | - o | 2 "2: change foo" files: foo - |/ - o 1 "1: add bar quux; copy foo to copied" files: bar copied quux - | - o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo - - -final file versions in this repo: - - $ hg manifest --debug - 9463f52fe115e377cf2878d4fc548117211063f2 644 bar - 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz - 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied - 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file - 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 - 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3 - 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4 - 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo - bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux - $ hg debugrename copied - copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd - $ echo - - $ cd .. - $ splitrepo() - > { - > msg="$1" - > files="$2" - > opts=$3 - > echo "% $files: $msg" - > prefix=`echo "$files" | sed -e 's/ /-/g'` - > fmap="$prefix.fmap" - > repo="$prefix.repo" - > for i in $files; do - > echo "include $i" >> "$fmap" - > done - > hg -q convert $opts --filemap "$fmap" --datesort source "$repo" - > hg up -q -R "$repo" - > glog -R "$repo" - > hg -R "$repo" manifest --debug - > } - $ splitrepo 'skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd' foo - % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd - @ 3 "8: change foo" files: foo - | - o 2 "6: change foo baz" files: foo - | - o 1 "2: change foo" files: foo - | - o 0 "0: add foo baz dir/" files: foo - - 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo - $ splitrepo 'merges are not merges anymore' bar - % bar: merges are not merges anymore - @ 4 "7: second merge; change bar" files: bar - | - o 3 "5: change bar baz quux" files: bar - | - o 2 "4: first merge; change bar baz" files: bar - | - o 1 "3: change bar quux" files: bar - | - o 0 "1: add bar quux; copy foo to copied" files: bar - - 9463f52fe115e377cf2878d4fc548117211063f2 644 bar - $ splitrepo '1st merge is not a merge anymore; 2nd still is' baz - % baz: 1st merge is not a merge anymore; 2nd still is - @ 4 "7: second merge; change bar" files: baz - |\ - | o 3 "6: change foo baz" files: baz - | | - o | 2 "5: change bar baz quux" files: baz - |/ - o 1 "4: first merge; change bar baz" files: baz - | - o 0 "0: add foo baz dir/" files: baz - - 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz - $ splitrepo 'we add additional merges when they are interesting' 'foo quux' - % foo quux: we add additional merges when they are interesting - @ 8 "8: change foo" files: foo - | - o 7 "7: second merge; change bar" files: - |\ - | o 6 "6: change foo baz" files: foo - | | - o | 5 "5: change bar baz quux" files: quux - |/ - o 4 "4: first merge; change bar baz" files: - |\ - | o 3 "3: change bar quux" files: quux - | | - o | 2 "2: change foo" files: foo - |/ - o 1 "1: add bar quux; copy foo to copied" files: quux - | - o 0 "0: add foo baz dir/" files: foo - - 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo - bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux - $ splitrepo 'partial conversion' 'bar quux' '-r 3' - % bar quux: partial conversion - @ 1 "3: change bar quux" files: bar quux - | - o 0 "1: add bar quux; copy foo to copied" files: bar quux - - b79105bedc55102f394e90a789c9c380117c1b4a 644 bar - db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux - $ splitrepo 'complete the partial conversion' 'bar quux' - % bar quux: complete the partial conversion - @ 4 "7: second merge; change bar" files: bar - | - o 3 "5: change bar baz quux" files: bar quux - | - o 2 "4: first merge; change bar baz" files: bar - | - o 1 "3: change bar quux" files: bar quux - | - o 0 "1: add bar quux; copy foo to copied" files: bar quux - - 9463f52fe115e377cf2878d4fc548117211063f2 644 bar - bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux - $ rm -r foo.repo - $ splitrepo 'partial conversion' 'foo' '-r 3' - % foo: partial conversion - @ 0 "0: add foo baz dir/" files: foo - - 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo - $ splitrepo 'complete the partial conversion' 'foo' - % foo: complete the partial conversion - @ 3 "8: change foo" files: foo - | - o 2 "6: change foo baz" files: foo - | - o 1 "2: change foo" files: foo - | - o 0 "0: add foo baz dir/" files: foo - - 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo - $ splitrepo 'copied file; source not included in new repo' copied - % copied: copied file; source not included in new repo - @ 0 "1: add bar quux; copy foo to copied" files: copied - - 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied - $ hg --cwd copied.repo debugrename copied - copied not renamed - $ splitrepo 'copied file; source included in new repo' 'foo copied' - % foo copied: copied file; source included in new repo - @ 4 "8: change foo" files: foo - | - o 3 "6: change foo baz" files: foo - | - o 2 "2: change foo" files: foo - | - o 1 "1: add bar quux; copy foo to copied" files: copied - | - o 0 "0: add foo baz dir/" files: foo - - 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied - 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo - $ hg --cwd foo-copied.repo debugrename copied - copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd - $ cat > renames.fmap < include dir - > exclude dir/file2 - > rename dir dir2 - > include foo - > include copied - > rename foo foo2 - > rename copied copied2 - > exclude dir/subdir - > include dir/subdir/file3 - > EOF - $ hg -q convert --filemap renames.fmap --datesort source renames.repo - $ hg up -q -R renames.repo - $ glog -R renames.repo - @ 4 "8: change foo" files: foo2 - | - o 3 "6: change foo baz" files: foo2 - | - o 2 "2: change foo" files: foo2 - | - o 1 "1: add bar quux; copy foo to copied" files: copied2 - | - o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2 - - $ hg -R renames.repo manifest --debug - d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 - 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file - 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 - 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 - $ hg --cwd renames.repo debugrename copied2 - copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd - -copied: - - $ hg --cwd source cat copied - foo - -copied2: - - $ hg --cwd renames.repo cat copied2 - foo - -filemap errors - - $ cat > errors.fmap < include dir/ # beware that comments changes error line numbers! - > exclude /dir - > rename dir//dir /dir//dir/ "out of sync" - > include - > EOF - $ hg -q convert --filemap errors.fmap source errors.repo - errors.fmap:1: superfluous / in exclude 'dir/' - errors.fmap:3: superfluous / in include '/dir' - errors.fmap:3: superfluous / in rename '/dir' - errors.fmap:3: superfluous / in exclude 'dir//dir' - errors.fmap:4: unknown directive 'out of sync' - errors.fmap:5: path to exclude is missing - abort: errors in filemap - [255] !s.s ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-clonebranches.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-clonebranches.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-clonebranches.t.err @@ -1,84 +1,4 @@ + + ### Abort: timeout after 180 seconds. $ echo "[extensions]" >> $HGRCPATH - $ echo "convert = " >> $HGRCPATH - $ echo "[convert]" >> $HGRCPATH - $ echo "hg.tagsbranch=0" >> $HGRCPATH - $ hg init source - $ cd source - $ echo a > a - $ hg ci -qAm adda - -Add a merge with one parent in the same branch - - $ echo a >> a - $ hg ci -qAm changea - $ hg up -qC 0 - $ hg branch branch0 - marked working directory as branch branch0 - $ echo b > b - $ hg ci -qAm addb - $ hg up -qC - $ hg merge default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -qm mergeab - $ hg tag -ql mergeab - $ cd .. - -Miss perl... sometimes - - $ cat > filter.py < import sys, re - > - > r = re.compile(r'^(?:\d+|pulling from)') - > sys.stdout.writelines([l for l in sys.stdin if r.search(l)]) - > EOF - -convert - - $ hg convert -v --config convert.hg.clonebranches=1 source dest | - > python filter.py - 3 adda - 2 changea - 1 addb - pulling from default into branch0 - 1 changesets found - 0 mergeab - pulling from default into branch0 - 1 changesets found - -Add a merge with both parents and child in different branches - - $ cd source - $ hg branch branch1 - marked working directory as branch branch1 - $ echo a > file1 - $ hg ci -qAm c1 - $ hg up -qC mergeab - $ hg branch branch2 - marked working directory as branch branch2 - $ echo a > file2 - $ hg ci -qAm c2 - $ hg merge branch1 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg branch branch3 - marked working directory as branch branch3 - $ hg ci -qAm c3 - $ cd .. - -incremental conversion - - $ hg convert -v --config convert.hg.clonebranches=1 source dest | - > python filter.py - 2 c1 - pulling from branch0 into branch1 - 4 changesets found - 1 c2 - pulling from branch0 into branch2 - 4 changesets found - 0 c3 - pulling from branch2 into branch3 - 5 changesets found - pulling from branch1 into branch3 - 1 changesets found !s ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-startrev.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-startrev.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-startrev.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. $ cat > $HGRCPATH < [extensions] @@ -6,149 +8,3 @@ > [convert] > hg.saverev = yes > EOF - - $ glog() - > { - > hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n' - > } - - $ hg init source - $ cd source - - $ echo a > a - $ echo b > b - $ hg ci -d '0 0' -qAm '0: add a b' - $ echo c > c - $ hg ci -d '1 0' -qAm '1: add c' - $ hg copy a e - $ echo b >> b - $ hg ci -d '2 0' -qAm '2: copy e from a, change b' - $ hg up -C 0 - 1 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ echo a >> a - $ hg ci -d '3 0' -qAm '3: change a' - $ hg merge - merging a and e to e - 2 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg copy b d - $ hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b' - $ echo a >> a - $ hg ci -d '5 0' -qAm '5: change a' - $ cd .. - -Convert from null revision - - $ hg convert --config convert.hg.startrev=null source empty - initializing destination empty repository - scanning source... - sorting... - converting... - - $ glog empty - -Convert from zero revision - - $ hg convert --config convert.hg.startrev=0 source full - initializing destination full repository - scanning source... - sorting... - converting... - 5 0: add a b - 4 1: add c - 3 2: copy e from a, change b - 2 3: change a - 1 4: merge 2 and 3, copy d from b - 0 5: change a - - $ glog full - o 5 "5: change a" files: a - | - o 4 "4: merge 2 and 3, copy d from b" files: d e - |\ - | o 3 "3: change a" files: a - | | - o | 2 "2: copy e from a, change b" files: b e - | | - o | 1 "1: add c" files: c - |/ - o 0 "0: add a b" files: a b - -Convert from merge parent - - $ hg convert --config convert.hg.startrev=1 source conv1 - initializing destination conv1 repository - scanning source... - sorting... - converting... - 3 1: add c - 2 2: copy e from a, change b - 1 4: merge 2 and 3, copy d from b - 0 5: change a - - $ glog conv1 - o 3 "5: change a" files: a - | - o 2 "4: merge 2 and 3, copy d from b" files: a d e - | - o 1 "2: copy e from a, change b" files: b e - | - o 0 "1: add c" files: a b c - - $ cd conv1 - -Check copy preservation - - $ hg log --follow --copies e - changeset: 2:79818a521a40 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: 4: merge 2 and 3, copy d from b - - changeset: 1:3e6201832cce - user: test - date: Thu Jan 01 00:00:02 1970 +0000 - summary: 2: copy e from a, change b - -Check copy removal on missing parent - - $ hg log --follow --copies d - changeset: 2:79818a521a40 - user: test - date: Thu Jan 01 00:00:04 1970 +0000 - summary: 4: merge 2 and 3, copy d from b - - $ hg cat -r tip a b - a - a - a - b - b - $ hg -q verify - $ cd .. - -Convert from merge - - $ hg convert --config convert.hg.startrev=4 source conv4 - initializing destination conv4 repository - scanning source... - sorting... - converting... - 1 4: merge 2 and 3, copy d from b - 0 5: change a - $ glog conv4 - o 1 "5: change a" files: a - | - o 0 "4: merge 2 and 3, copy d from b" files: a b c d e - - $ cd conv4 - $ hg up -C - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg cat -r tip a b - a - a - a - b - b - $ hg -q verify - $ cd .. !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. $ cat >> $HGRCPATH < [extensions] @@ -5,383 +7,3 @@ > [convert] > hg.saverev=False > EOF - $ hg help convert - hg convert [OPTION]... SOURCE [DEST [REVMAP]] - - convert a foreign SCM repository to a Mercurial one. - - Accepted source formats [identifiers]: - - - Mercurial [hg] - - CVS [cvs] - - Darcs [darcs] - - git [git] - - Subversion [svn] - - Monotone [mtn] - - GNU Arch [gnuarch] - - Bazaar [bzr] - - Perforce [p4] - - Accepted destination formats [identifiers]: - - - Mercurial [hg] - - Subversion [svn] (history on branches is not preserved) - - If no revision is given, all revisions will be converted. Otherwise, - convert will only import up to the named revision (given in a format - understood by the source). - - If no destination directory name is specified, it defaults to the basename - of the source with "-hg" appended. If the destination repository doesn't - exist, it will be created. - - By default, all sources except Mercurial will use --branchsort. Mercurial - uses --sourcesort to preserve original revision numbers order. Sort modes - have the following effects: - - --branchsort convert from parent to child revision when possible, which - means branches are usually converted one after the other. It - generates more compact repositories. - --datesort sort revisions by date. Converted repositories have good- - looking changelogs but are often an order of magnitude - larger than the same ones generated by --branchsort. - --sourcesort try to preserve source revisions order, only supported by - Mercurial sources. - - If isn't given, it will be put in a default location - (/.hg/shamap by default). The is a simple text file that - maps each source commit ID to the destination ID for that revision, like - so: - - - - If the file doesn't exist, it's automatically created. It's updated on - each commit copied, so "hg convert" can be interrupted and can be run - repeatedly to copy new commits. - - The authormap is a simple text file that maps each source commit author to - a destination commit author. It is handy for source SCMs that use unix - logins to identify authors (eg: CVS). One line per author mapping and the - line format is: - - source author = destination author - - Empty lines and lines starting with a "#" are ignored. - - The filemap is a file that allows filtering and remapping of files and - directories. Each line can contain one of the following directives: - - include path/to/file-or-dir - - exclude path/to/file-or-dir - - rename path/to/source path/to/destination - - Comment lines start with "#". A specified path matches if it equals the - full relative name of a file or one of its parent directories. The - "include" or "exclude" directive with the longest matching path applies, - so line order does not matter. - - The "include" directive causes a file, or all files under a directory, to - be included in the destination repository, and the exclusion of all other - files and directories not explicitly included. The "exclude" directive - causes files or directories to be omitted. The "rename" directive renames - a file or directory if it is converted. To rename from a subdirectory into - the root of the repository, use "." as the path to rename to. - - The splicemap is a file that allows insertion of synthetic history, - letting you specify the parents of a revision. This is useful if you want - to e.g. give a Subversion merge two parents, or graft two disconnected - series of history together. Each entry contains a key, followed by a - space, followed by one or two comma-separated values: - - key parent1, parent2 - - The key is the revision ID in the source revision control system whose - parents should be modified (same format as a key in .hg/shamap). The - values are the revision IDs (in either the source or destination revision - control system) that should be used as the new parents for that node. For - example, if you have merged "release-1.0" into "trunk", then you should - specify the revision on "trunk" as the first parent and the one on the - "release-1.0" branch as the second. - - The branchmap is a file that allows you to rename a branch when it is - being brought in from whatever external repository. When used in - conjunction with a splicemap, it allows for a powerful combination to help - fix even the most badly mismanaged repositories and turn them into nicely - structured Mercurial repositories. The branchmap contains lines of the - form: - - original_branch_name new_branch_name - - where "original_branch_name" is the name of the branch in the source - repository, and "new_branch_name" is the name of the branch is the - destination repository. No whitespace is allowed in the branch names. This - can be used to (for instance) move code in one repository from "default" - to a named branch. - - Mercurial Source - '''''''''''''''' - - --config convert.hg.ignoreerrors=False (boolean) - ignore integrity errors when reading. Use it to fix Mercurial - repositories with missing revlogs, by converting from and to - Mercurial. - - --config convert.hg.saverev=False (boolean) - store original revision ID in changeset (forces target IDs to change) - - --config convert.hg.startrev=0 (hg revision identifier) - convert start revision and its descendants - - CVS Source - '''''''''' - - CVS source will use a sandbox (i.e. a checked-out copy) from CVS to - indicate the starting point of what will be converted. Direct access to - the repository files is not needed, unless of course the repository is - :local:. The conversion uses the top level directory in the sandbox to - find the CVS repository, and then uses CVS rlog commands to find files to - convert. This means that unless a filemap is given, all files under the - starting directory will be converted, and that any directory - reorganization in the CVS sandbox is ignored. - - The options shown are the defaults. - - --config convert.cvsps.cache=True (boolean) - Set to False to disable remote log caching, for testing and debugging - purposes. - - --config convert.cvsps.fuzz=60 (integer) - Specify the maximum time (in seconds) that is allowed between commits - with identical user and log message in a single changeset. When very - large files were checked in as part of a changeset then the default - may not be long enough. - - --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}' - Specify a regular expression to which commit log messages are matched. - If a match occurs, then the conversion process will insert a dummy - revision merging the branch on which this log message occurs to the - branch indicated in the regex. - - --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}' - Specify a regular expression to which commit log messages are matched. - If a match occurs, then the conversion process will add the most - recent revision on the branch indicated in the regex as the second - parent of the changeset. - - --config hook.cvslog - Specify a Python function to be called at the end of gathering the CVS - log. The function is passed a list with the log entries, and can - modify the entries in-place, or add or delete them. - - --config hook.cvschangesets - Specify a Python function to be called after the changesets are - calculated from the the CVS log. The function is passed a list with - the changeset entries, and can modify the changesets in-place, or add - or delete them. - - An additional "debugcvsps" Mercurial command allows the builtin changeset - merging code to be run without doing a conversion. Its parameters and - output are similar to that of cvsps 2.1. Please see the command help for - more details. - - Subversion Source - ''''''''''''''''' - - Subversion source detects classical trunk/branches/tags layouts. By - default, the supplied "svn://repo/path/" source URL is converted as a - single branch. If "svn://repo/path/trunk" exists it replaces the default - branch. If "svn://repo/path/branches" exists, its subdirectories are - listed as possible branches. If "svn://repo/path/tags" exists, it is - looked for tags referencing converted branches. Default "trunk", - "branches" and "tags" values can be overridden with following options. Set - them to paths relative to the source URL, or leave them blank to disable - auto detection. - - --config convert.svn.branches=branches (directory name) - specify the directory containing branches - - --config convert.svn.tags=tags (directory name) - specify the directory containing tags - - --config convert.svn.trunk=trunk (directory name) - specify the name of the trunk branch - - Source history can be retrieved starting at a specific revision, instead - of being integrally converted. Only single branch conversions are - supported. - - --config convert.svn.startrev=0 (svn revision number) - specify start Subversion revision. - - Perforce Source - ''''''''''''''' - - The Perforce (P4) importer can be given a p4 depot path or a client - specification as source. It will convert all files in the source to a flat - Mercurial repository, ignoring labels, branches and integrations. Note - that when a depot path is given you then usually should specify a target - directory, because otherwise the target may be named ...-hg. - - It is possible to limit the amount of source history to be converted by - specifying an initial Perforce revision. - - --config convert.p4.startrev=0 (perforce changelist number) - specify initial Perforce revision. - - Mercurial Destination - ''''''''''''''''''''' - - --config convert.hg.clonebranches=False (boolean) - dispatch source branches in separate clones. - - --config convert.hg.tagsbranch=default (branch name) - tag revisions branch name - - --config convert.hg.usebranchnames=True (boolean) - preserve branch names - - options: - - -s --source-type TYPE source repository type - -d --dest-type TYPE destination repository type - -r --rev REV import up to target revision REV - -A --authormap FILE remap usernames using this file - --filemap FILE remap file names using contents of file - --splicemap FILE splice synthesized history into place - --branchmap FILE change branch names while converting - --branchsort try to sort changesets by branches - --datesort try to sort changesets by date - --sourcesort preserve source changesets order - - use "hg -v help convert" to show global options - $ hg init a - $ cd a - $ echo a > a - $ hg ci -d'0 0' -Ama - adding a - $ hg cp a b - $ hg ci -d'1 0' -mb - $ hg rm a - $ hg ci -d'2 0' -mc - $ hg mv b a - $ hg ci -d'3 0' -md - $ echo a >> a - $ hg ci -d'4 0' -me - $ cd .. - $ hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded' - assuming destination a-hg - initializing destination a-hg repository - scanning source... - sorting... - converting... - 4 a - 3 b - 2 c - 1 d - 0 e - $ hg --cwd a-hg pull ../a - pulling from ../a - searching for changes - no changes found - $ touch bogusfile - -should fail - - $ hg convert a bogusfile - initializing destination bogusfile repository - abort: cannot create new bundle repository - [255] - $ mkdir bogusdir - $ chmod 000 bogusdir - -should fail - - $ hg convert a bogusdir - abort: Permission denied: bogusdir - [255] - -should succeed - - $ chmod 700 bogusdir - $ hg convert a bogusdir - initializing destination bogusdir repository - scanning source... - sorting... - converting... - 4 a - 3 b - 2 c - 1 d - 0 e - -test pre and post conversion actions - - $ echo 'include b' > filemap - $ hg convert --debug --filemap filemap a partialb | \ - > grep 'run hg' - run hg source pre-conversion action - run hg sink pre-conversion action - run hg sink post-conversion action - run hg source post-conversion action - -converting empty dir should fail "nicely - - $ mkdir emptydir - -override $PATH to ensure p4 not visible; use $PYTHON in case we're -running from a devel copy, not a temp installation - - $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg convert emptydir - assuming destination emptydir-hg - initializing destination emptydir-hg repository - emptydir does not look like a CVS checkout - emptydir does not look like a Git repository - emptydir does not look like a Subversion repository - emptydir is not a local Mercurial repository - emptydir does not look like a darcs repository - emptydir does not look like a monotone repository - emptydir does not look like a GNU Arch repository - emptydir does not look like a Bazaar repository - cannot find required "p4" tool - abort: emptydir: missing or unsupported repository - [255] - -convert with imaginary source type - - $ hg convert --source-type foo a a-foo - initializing destination a-foo repository - abort: foo: invalid source repository type - [255] - -convert with imaginary sink type - - $ hg convert --dest-type foo a a-foo - abort: foo: invalid destination repository type - [255] - -testing: convert must not produce duplicate entries in fncache - - $ hg convert a b - initializing destination b repository - scanning source... - sorting... - converting... - 4 a - 3 b - 2 c - 1 d - 0 e - -contents of fncache file: - - $ cat b/.hg/store/fncache - data/a.i - data/b.i - -test bogus URL - - $ hg convert -q bzr+ssh://foobar@selenic.com/baz baz - abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository - [255] ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-source.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-source.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-source.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. $ cat >> $HGRCPATH < [extensions] @@ -5,134 +7,3 @@ > [convert] > hg.saverev=False > EOF - $ hg init orig - $ cd orig - $ echo foo > foo - $ echo bar > bar - $ hg ci -qAm 'add foo bar' -d '0 0' - $ echo >> foo - $ hg ci -m 'change foo' -d '1 0' - $ hg up -qC 0 - $ hg copy --after --force foo bar - $ hg copy foo baz - $ hg ci -m 'make bar and baz copies of foo' -d '2 0' - created new head - $ hg merge - merging baz and foo to baz - 1 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -m 'merge local copy' -d '3 0' - $ hg up -C 1 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg merge 2 - merging foo and baz to baz - 1 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg ci -m 'merge remote copy' -d '4 0' - created new head - $ chmod +x baz - $ hg ci -m 'mark baz executable' -d '5 0' - $ hg branch foo - marked working directory as branch foo - $ hg ci -m 'branch foo' -d '6 0' - $ hg ci --close-branch -m 'close' -d '7 0' - $ cd .. - $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' - initializing destination new repository - scanning source... - sorting... - converting... - 7 add foo bar - 6 change foo - 5 make bar and baz copies of foo - 4 merge local copy - 3 merge remote copy - 2 mark baz executable - 1 branch foo - 0 close - $ cd new - $ hg out ../orig - comparing with ../orig - searching for changes - no changes found - [1] - $ cd .. - -check shamap LF and CRLF handling - - $ cat > rewrite.py < import sys - > # Interlace LF and CRLF - > lines = [(l.rstrip() + ((i % 2) and '\n' or '\r\n')) - > for i, l in enumerate(file(sys.argv[1]))] - > file(sys.argv[1], 'wb').write(''.join(lines)) - > EOF - $ python rewrite.py new/.hg/shamap - $ cd orig - $ hg up -qC 1 - $ echo foo >> foo - $ hg ci -qm 'change foo again' - $ hg up -qC 2 - $ echo foo >> foo - $ hg ci -qm 'change foo again again' - $ cd .. - $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' - scanning source... - sorting... - converting... - 1 change foo again again - 0 change foo again - -init broken repository - - $ hg init broken - $ cd broken - $ echo a >> a - $ echo b >> b - $ hg ci -qAm init - $ echo a >> a - $ echo b >> b - $ hg copy b c - $ hg ci -qAm changeall - $ hg up -qC 0 - $ echo bc >> b - $ hg ci -m changebagain - created new head - $ HGMERGE=internal:local hg -q merge - $ hg ci -m merge - $ hg mv b d - $ hg ci -m moveb - -break it - - $ rm .hg/store/data/b.* - $ cd .. - $ hg --config convert.hg.ignoreerrors=True convert broken fixed - initializing destination fixed repository - scanning source... - sorting... - converting... - 4 init - ignoring: data/b.i@1e88685f5dde: no match found - 3 changeall - 2 changebagain - 1 merge - 0 moveb - $ hg -R fixed verify - checking changesets - checking manifests - crosschecking files in changesets and manifests - checking files - 3 files, 5 changesets, 5 total revisions - -manifest -r 0 - - $ hg -R fixed manifest -r 0 - a - -manifest -r tip - - $ hg -R fixed manifest -r tip - a - c - d ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-sink.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-sink.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-convert-hg-sink.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. $ cat >> $HGRCPATH < [extensions] @@ -5,120 +7,3 @@ > [convert] > hg.saverev=False > EOF - $ hg init orig - $ cd orig - $ echo foo > foo - $ echo bar > bar - $ hg ci -qAm 'add foo and bar' - $ hg rm foo - $ hg ci -m 'remove foo' - $ mkdir foo - $ echo file > foo/file - $ hg ci -qAm 'add foo/file' - $ hg tag some-tag - $ hg log - changeset: 3:593cbf6fb2b4 - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Added tag some-tag for changeset ad681a868e44 - - changeset: 2:ad681a868e44 - tag: some-tag - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add foo/file - - changeset: 1:cbba8ecc03b7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: remove foo - - changeset: 0:327daa9251fa - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add foo and bar - - $ cd .. - $ hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' - initializing destination new repository - scanning source... - sorting... - converting... - 3 add foo and bar - 2 remove foo - 1 add foo/file - 0 Added tag some-tag for changeset ad681a868e44 - $ cd new - $ hg out ../orig - comparing with ../orig - searching for changes - no changes found - [1] - -dirstate should be empty: - - $ hg debugstate - $ hg parents -q - $ hg up -C - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg copy bar baz - -put something in the dirstate: - - $ hg debugstate > debugstate - $ grep baz debugstate - a 0 -1 unset baz - copy: bar -> baz - -add a new revision in the original repo - - $ cd ../orig - $ echo baz > baz - $ hg ci -qAm 'add baz' - $ cd .. - $ hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' - scanning source... - sorting... - converting... - 0 add baz - $ cd new - $ hg out ../orig - comparing with ../orig - searching for changes - no changes found - [1] - -dirstate should be the same (no output below): - - $ hg debugstate > new-debugstate - $ diff debugstate new-debugstate - -no copies - - $ hg up -C - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg debugrename baz - baz not renamed - $ cd .. - -test tag rewriting - - $ cat > filemap < exclude foo - > EOF - $ hg convert --filemap filemap orig new-filemap 2>&1 | grep -v 'subversion python bindings could not be loaded' - initializing destination new-filemap repository - scanning source... - sorting... - converting... - 4 add foo and bar - 3 remove foo - 2 add foo/file - 1 Added tag some-tag for changeset ad681a868e44 - 0 add baz - $ cd new-filemap - $ hg tags - tip 2:6f4fd1df87fb - some-tag 0:ba8636729451 - $ cd .. !s.... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-copy2.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-copy2.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-copy2.t.err @@ -1,102 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init - $ echo foo > foo -should fail - foo is not managed - $ hg mv foo bar - foo: not copying - file is not managed - abort: no files to copy - [255] - $ hg st -A - ? foo - $ hg add foo -dry-run; print a warning that this is not a real copy; foo is added - $ hg mv --dry-run foo bar - foo has not been committed yet, so no copy data will be stored for bar. - $ hg st -A - A foo -should print a warning that this is not a real copy; bar is added - $ hg mv foo bar - foo has not been committed yet, so no copy data will be stored for bar. - $ hg st -A - A bar -should print a warning that this is not a real copy; foo is added - $ hg cp bar foo - bar has not been committed yet, so no copy data will be stored for foo. - $ hg rm -f bar - $ rm bar - $ hg st -A - A foo - $ hg commit -m1 - -copy --after to a nonexistant target filename - $ hg cp -A foo dummy - foo: not recording copy - dummy does not exist - -dry-run; should show that foo is clean - $ hg copy --dry-run foo bar - $ hg st -A - C foo -should show copy - $ hg copy foo bar - $ hg st -C - A bar - foo - -shouldn't show copy - $ hg commit -m2 - $ hg st -C - -should match - $ hg debugindex .hg/store/data/foo.i - rev offset length base linkrev nodeid p1 p2 - 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 - $ hg debugrename bar - bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd - - $ echo bleah > foo - $ echo quux > bar - $ hg commit -m3 - -should not be renamed - $ hg debugrename bar - bar not renamed - - $ hg copy -f foo bar -should show copy - $ hg st -C - M bar - foo - $ hg commit -m3 - -should show no parents for tip - $ hg debugindex .hg/store/data/bar.i - rev offset length base linkrev nodeid p1 p2 - 0 0 69 0 1 7711d36246cc 000000000000 000000000000 - 1 69 6 1 2 bdf70a2b8d03 7711d36246cc 000000000000 - 2 75 81 1 3 b2558327ea8d 000000000000 000000000000 -should match - $ hg debugindex .hg/store/data/foo.i - rev offset length base linkrev nodeid p1 p2 - 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 - 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 - $ hg debugrename bar - bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 - -should show no copies - $ hg st -C - -copy --after on an added file - $ cp bar baz - $ hg add baz - $ hg cp -A bar baz - $ hg st -C - A baz - bar - -foo was clean: - $ hg st -AC foo - C foo -but it's considered modified after a copy --after --force - $ hg copy -Af bar foo - $ hg st -AC foo - M foo - bar !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-debugbuilddag.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-debugbuilddag.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-debugbuilddag.t.err @@ -1,321 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ echo "[extensions]" >> $HGRCPATH - $ echo "graphlog=" >> $HGRCPATH - -overwritten and appended files - - $ rm -rf repo - $ hg init repo - $ cd repo - $ hg debugbuilddag '+2:f +3:p2 @temp > $HGRCPATH - $ echo 'ndiff = diff --nodates' >> $HGRCPATH - - $ hg init - $ printf 'hello world\ngoodbye world\n' >foo - $ hg ci -Amfoo -ufoo - adding foo - - -Test added blank lines: - - $ printf '\nhello world\n\ngoodbye world\n\n' >foo - ->>> two diffs showing three added lines <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - + - hello world - + - goodbye world - + - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - + - hello world - + - goodbye world - + - ->>> no diffs <<< - - $ hg ndiff -B - $ hg ndiff -Bb - - -Test added horizontal space first on a line(): - - $ printf '\t hello world\ngoodbye world\n' >foo - ->>> four diffs showing added space first on the first line <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - + hello world - goodbye world - - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - + hello world - goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - + hello world - goodbye world - - $ hg ndiff -Bb - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - + hello world - goodbye world - - -Test added horizontal space last on a line: - - $ printf 'hello world\t \ngoodbye world\n' >foo - ->>> two diffs showing space appended to the first line <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - +hello world - goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - +hello world - goodbye world - ->>> no diffs <<< - - $ hg ndiff -b - $ hg ndiff -Bb - - -Test added horizontal space in the middle of a word: - - $ printf 'hello world\ngood bye world\n' >foo - ->>> four diffs showing space inserted into "goodbye" <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - hello world - -goodbye world - +good bye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - hello world - -goodbye world - +good bye world - - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - hello world - -goodbye world - +good bye world - - $ hg ndiff -Bb - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - hello world - -goodbye world - +good bye world - - -Test increased horizontal whitespace amount: - - $ printf 'hello world\ngoodbye\t\t \tworld\n' >foo - ->>> two diffs showing changed whitespace amount in the last line <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - hello world - -goodbye world - +goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - hello world - -goodbye world - +goodbye world - ->>> no diffs <<< - - $ hg ndiff -b - $ hg ndiff -Bb - - -Test added blank line with horizontal whitespace: - - $ printf 'hello world\n \t\ngoodbye world\n' >foo - ->>> three diffs showing added blank line with horizontal space <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - hello world - + - goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - hello world - + - goodbye world - - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - hello world - + - goodbye world - ->>> no diffs <<< - - $ hg ndiff -Bb - - -Test added blank line with other whitespace: - - $ printf 'hello world\n \t\ngoodbye world \n' >foo - ->>> three diffs showing added blank line with other space <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - -hello world - -goodbye world - +hello world - + - +goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - -hello world - -goodbye world - +hello world - + - +goodbye world - - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - hello world - + - goodbye world - ->>> no diffs <<< - - $ hg ndiff -Bb - - -Test whitespace changes: - - $ printf 'helloworld\ngoodbye\tworld \n' >foo - ->>> four diffs showing changed whitespace <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - -goodbye world - +helloworld - +goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - -goodbye world - +helloworld - +goodbye world - - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - +helloworld - goodbye world - - $ hg ndiff -Bb - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,2 @@ - -hello world - +helloworld - goodbye world - ->>> no diffs <<< - - $ hg ndiff -w - - -Test whitespace changes and blank lines: - - $ printf 'helloworld\n\n\n\ngoodbye\tworld \n' >foo - ->>> five diffs showing changed whitespace <<< - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - -hello world - -goodbye world - +helloworld - + - + - + - +goodbye world - - $ hg ndiff -B - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - -hello world - -goodbye world - +helloworld - + - + - + - +goodbye world - - $ hg ndiff -b - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - -hello world - +helloworld - + - + - + - goodbye world - - $ hg ndiff -Bb - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - -hello world - +helloworld - + - + - + - goodbye world - - $ hg ndiff -w - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,5 @@ - hello world - + - + - + - goodbye world - ->>> no diffs <<< - - $ hg ndiff -wB - - -Test \r (carriage return) as used in "DOS" line endings: - - $ printf 'hello world\r\n\r\ngoodbye\rworld\n' >foo - - $ hg ndiff - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - -hello world - -goodbye world - +hello world - + - +goodbye world -world - -No completely blank lines to ignore: - - $ hg ndiff --ignore-blank-lines - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - -hello world - -goodbye world - +hello world - + - +goodbye world -world - -Only new line noticed: - - $ hg ndiff --ignore-space-change - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - hello world - + - goodbye world - - $ hg ndiff --ignore-all-space - diff -r 540c40a65b78 foo - --- a/foo - +++ b/foo - @@ -1,2 +1,3 @@ - hello world - + - goodbye world - -New line not noticed when space change ignored: - - $ hg ndiff --ignore-blank-lines --ignore-all-space !........... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-dirstate-race.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-dirstate-race.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-dirstate-race.t.err @@ -1,33 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init - $ echo a > a - $ hg add a - $ hg commit -m test - -Do we ever miss a sub-second change?: - - $ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do - > hg co -qC 0 - > echo b > a - > hg st - > done - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - M a - !.......... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-eol.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-eol.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-eol.t.err @@ -1,385 +1,8 @@ + + ### Abort: timeout after 180 seconds. Test EOL extension $ cat > $HGRCPATH < [diff] > git = True > EOF - -Set up helpers - - $ cat > switch-eol.py < import sys - > try: - > import os, msvcrt - > msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) - > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - > except ImportError: - > pass - > (old, new) = sys.argv[1] == 'LF' and ('\n', '\r\n') or ('\r\n', '\n') - > print "%% switching encoding from %r to %r" % (old, new) - > for path in sys.argv[2:]: - > data = file(path, 'rb').read() - > data = data.replace(old, new) - > file(path, 'wb').write(data) - > EOF - - $ seteol () { - > if [ $1 = "LF" ]; then - > EOL='\n' - > else - > EOL='\r\n' - > fi - > } - - $ makerepo () { - > seteol $1 - > echo "% setup $1 repository" - > hg init repo - > cd repo - > cat > .hgeol < [repository] - > native = $1 - > [patterns] - > mixed.txt = BIN - > **.txt = native - > EOF - > printf "first${EOL}second${EOL}third${EOL}" > a.txt - > hg commit --addremove -m 'checkin' - > echo - > cd .. - > } - - $ dotest () { - > seteol $1 - > echo "% hg clone repo repo-$1" - > hg clone --noupdate repo repo-$1 - > cd repo-$1 - > cat > .hg/hgrc < [extensions] - > eol = - > [eol] - > native = $1 - > EOF - > hg update - > echo '% printrepr.py a.txt' - > python $TESTDIR/printrepr.py < a.txt - > echo '% hg cat a.txt' - > hg cat a.txt | python $TESTDIR/printrepr.py - > printf "fourth${EOL}" >> a.txt - > echo '% printrepr.py a.txt' - > python $TESTDIR/printrepr.py < a.txt - > hg diff | python $TESTDIR/printrepr.py - > python ../switch-eol.py $1 a.txt - > echo '% hg diff only reports a single changed line:' - > hg diff | python $TESTDIR/printrepr.py - > echo "% reverting back to $1 format" - > hg revert a.txt - > python $TESTDIR/printrepr.py < a.txt - > printf "first\r\nsecond\n" > mixed.txt - > hg add mixed.txt - > echo "% hg commit of inconsistent .txt file marked as binary (should work)" - > hg commit -m 'binary file' - > echo "% hg commit of inconsistent .txt file marked as native (should fail)" - > printf "first\nsecond\r\nthird\nfourth\r\n" > a.txt - > hg commit -m 'inconsistent file' - > echo "% hg commit --config eol.only-consistent=False (should work)" - > hg commit --config eol.only-consistent=False -m 'inconsistent file' - > echo "% hg commit of binary .txt file marked as native (binary files always okay)" - > printf "first${EOL}\0${EOL}third${EOL}" > a.txt - > hg commit -m 'binary file' - > cd .. - > rm -r repo-$1 - > } - - $ makemixedrepo () { - > echo - > echo "# setup $1 repository" - > hg init mixed - > cd mixed - > printf "foo\r\nbar\r\nbaz\r\n" > win.txt - > printf "foo\nbar\nbaz\n" > unix.txt - > #printf "foo\r\nbar\nbaz\r\n" > mixed.txt - > hg commit --addremove -m 'created mixed files' - > echo "# setting repository-native EOLs to $1" - > cat > .hgeol < [repository] - > native = $1 - > [patterns] - > **.txt = native - > EOF - > hg commit --addremove -m 'added .hgeol' - > cd .. - > } - - $ testmixed () { - > echo - > echo "% hg clone mixed mixed-$1" - > hg clone mixed mixed-$1 - > cd mixed-$1 - > echo '% hg status (eol extension not yet activated)' - > hg status - > cat > .hg/hgrc < [extensions] - > eol = - > [eol] - > native = $1 - > EOF - > echo '% hg status (eol activated)' - > hg status - > echo '% hg commit' - > hg commit -m 'synchronized EOLs' - > echo '% hg status' - > hg status - > cd .. - > rm -r mixed-$1 - > } - -Basic tests - - $ makerepo LF - % setup LF repository - adding .hgeol - adding a.txt - - $ dotest LF - % hg clone repo repo-LF - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py a.txt - first - second - third - % hg cat a.txt - first - second - third - % printrepr.py a.txt - first - second - third - fourth - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first - second - third - +fourth - % switching encoding from '\n' to '\r\n' - % hg diff only reports a single changed line: - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first - second - third - +fourth - % reverting back to LF format - first - second - third - % hg commit of inconsistent .txt file marked as binary (should work) - % hg commit of inconsistent .txt file marked as native (should fail) - abort: inconsistent newline style in a.txt - - % hg commit --config eol.only-consistent=False (should work) - % hg commit of binary .txt file marked as native (binary files always okay) - $ dotest CRLF - % hg clone repo repo-CRLF - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py a.txt - first\r - second\r - third\r - % hg cat a.txt - first - second - third - % printrepr.py a.txt - first\r - second\r - third\r - fourth\r - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first - second - third - +fourth - % switching encoding from '\r\n' to '\n' - % hg diff only reports a single changed line: - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first - second - third - +fourth - % reverting back to CRLF format - first\r - second\r - third\r - % hg commit of inconsistent .txt file marked as binary (should work) - % hg commit of inconsistent .txt file marked as native (should fail) - abort: inconsistent newline style in a.txt - - % hg commit --config eol.only-consistent=False (should work) - % hg commit of binary .txt file marked as native (binary files always okay) - $ rm -r repo - $ makerepo CRLF - % setup CRLF repository - adding .hgeol - adding a.txt - - $ dotest LF - % hg clone repo repo-LF - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py a.txt - first - second - third - % hg cat a.txt - first\r - second\r - third\r - % printrepr.py a.txt - first - second - third - fourth - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first\r - second\r - third\r - +fourth\r - % switching encoding from '\n' to '\r\n' - % hg diff only reports a single changed line: - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first\r - second\r - third\r - +fourth\r - % reverting back to LF format - first - second - third - % hg commit of inconsistent .txt file marked as binary (should work) - % hg commit of inconsistent .txt file marked as native (should fail) - abort: inconsistent newline style in a.txt - - % hg commit --config eol.only-consistent=False (should work) - % hg commit of binary .txt file marked as native (binary files always okay) - $ dotest CRLF - % hg clone repo repo-CRLF - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py a.txt - first\r - second\r - third\r - % hg cat a.txt - first\r - second\r - third\r - % printrepr.py a.txt - first\r - second\r - third\r - fourth\r - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first\r - second\r - third\r - +fourth\r - % switching encoding from '\r\n' to '\n' - % hg diff only reports a single changed line: - diff --git a/a.txt b/a.txt - --- a/a.txt - +++ b/a.txt - @@ -1,3 +1,4 @@ - first\r - second\r - third\r - +fourth\r - % reverting back to CRLF format - first\r - second\r - third\r - % hg commit of inconsistent .txt file marked as binary (should work) - % hg commit of inconsistent .txt file marked as native (should fail) - abort: inconsistent newline style in a.txt - - % hg commit --config eol.only-consistent=False (should work) - % hg commit of binary .txt file marked as native (binary files always okay) - $ rm -r repo - -Mixed tests - - $ makemixedrepo LF - - # setup LF repository - adding unix.txt - adding win.txt - # setting repository-native EOLs to LF - adding .hgeol - $ testmixed LF - - % hg clone mixed mixed-LF - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - % hg status (eol extension not yet activated) - % hg status (eol activated) - M win.txt - % hg commit - % hg status - $ testmixed CRLF - - % hg clone mixed mixed-CRLF - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - % hg status (eol extension not yet activated) - % hg status (eol activated) - M win.txt - % hg commit - % hg status - $ rm -r mixed - $ makemixedrepo CRLF - - # setup CRLF repository - adding unix.txt - adding win.txt - # setting repository-native EOLs to CRLF - adding .hgeol - $ testmixed LF - - % hg clone mixed mixed-LF - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - % hg status (eol extension not yet activated) - % hg status (eol activated) - M unix.txt - % hg commit - % hg status - $ testmixed CRLF - - % hg clone mixed mixed-CRLF - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - % hg status (eol extension not yet activated) - % hg status (eol activated) - M unix.txt - % hg commit - % hg status - $ rm -r mixed !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-encoding.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-encoding.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-encoding.t.err @@ -1,245 +1,5 @@ + + ### Abort: timeout after 180 seconds. Test character encoding $ hg init t - $ cd t - -we need a repo with some legacy latin-1 changesets - - $ hg unbundle $TESTDIR/legacy-encoding.hg - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 1 files - (run 'hg update' to get a working copy) - $ hg co - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ python << EOF - > f = file('latin-1', 'w'); f.write("latin-1 e' encoded: \xe9"); f.close() - > f = file('utf-8', 'w'); f.write("utf-8 e' encoded: \xc3\xa9"); f.close() - > f = file('latin-1-tag', 'w'); f.write("\xe9"); f.close() - > EOF - -should fail with encoding error - - $ echo "plain old ascii" > a - $ hg st - M a - ? latin-1 - ? latin-1-tag - ? utf-8 - $ HGENCODING=ascii hg ci -l latin-1 - transaction abort! - rollback completed - abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! - [255] - -these should work - - $ echo "latin-1" > a - $ HGENCODING=latin-1 hg ci -l latin-1 - $ echo "utf-8" > a - $ HGENCODING=utf-8 hg ci -l utf-8 - $ HGENCODING=latin-1 hg tag `cat latin-1-tag` - $ HGENCODING=latin-1 hg branch `cat latin-1-tag` - marked working directory as branch é - $ HGENCODING=latin-1 hg ci -m 'latin1 branch' - $ rm .hg/branch - -hg log (ascii) - - $ hg --encoding ascii log - changeset: 5:093c6077d1c8 - branch: ? - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin1 branch - - changeset: 4:94db611b4196 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Added tag ? for changeset ca661e7520de - - changeset: 3:ca661e7520de - tag: ? - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: utf-8 e' encoded: ? - - changeset: 2:650c6f3d55dd - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin-1 e' encoded: ? - - changeset: 1:0e5b7e3f9c4a - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' - - changeset: 0:1e78a93102a3 - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: latin-1 e': ? = u'\xe9' - - -hg log (latin-1) - - $ hg --encoding latin-1 log - changeset: 5:093c6077d1c8 - branch: é - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin1 branch - - changeset: 4:94db611b4196 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Added tag é for changeset ca661e7520de - - changeset: 3:ca661e7520de - tag: é - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: utf-8 e' encoded: é - - changeset: 2:650c6f3d55dd - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin-1 e' encoded: é - - changeset: 1:0e5b7e3f9c4a - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' - - changeset: 0:1e78a93102a3 - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: latin-1 e': é = u'\xe9' - - -hg log (utf-8) - - $ hg --encoding utf-8 log - changeset: 5:093c6077d1c8 - branch: é - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin1 branch - - changeset: 4:94db611b4196 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Added tag é for changeset ca661e7520de - - changeset: 3:ca661e7520de - tag: é - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: utf-8 e' encoded: é - - changeset: 2:650c6f3d55dd - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin-1 e' encoded: é - - changeset: 1:0e5b7e3f9c4a - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' - - changeset: 0:1e78a93102a3 - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: latin-1 e': é = u'\xe9' - - -hg tags (ascii) - - $ HGENCODING=ascii hg tags - tip 5:093c6077d1c8 - ? 3:ca661e7520de - -hg tags (latin-1) - - $ HGENCODING=latin-1 hg tags - tip 5:093c6077d1c8 - é 3:ca661e7520de - -hg tags (utf-8) - - $ HGENCODING=utf-8 hg tags - tip 5:093c6077d1c8 - é 3:ca661e7520de - -hg branches (ascii) - - $ HGENCODING=ascii hg branches - ? 5:093c6077d1c8 - default 4:94db611b4196 (inactive) - -hg branches (latin-1) - - $ HGENCODING=latin-1 hg branches - é 5:093c6077d1c8 - default 4:94db611b4196 (inactive) - -hg branches (utf-8) - - $ HGENCODING=utf-8 hg branches - é 5:093c6077d1c8 - default 4:94db611b4196 (inactive) - $ echo '[ui]' >> .hg/hgrc - $ echo 'fallbackencoding = koi8-r' >> .hg/hgrc - -hg log (utf-8) - - $ HGENCODING=utf-8 hg log - changeset: 5:093c6077d1c8 - branch: é - tag: tip - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin1 branch - - changeset: 4:94db611b4196 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: Added tag é for changeset ca661e7520de - - changeset: 3:ca661e7520de - tag: é - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: utf-8 e' encoded: é - - changeset: 2:650c6f3d55dd - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: latin-1 e' encoded: é - - changeset: 1:0e5b7e3f9c4a - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c' - - changeset: 0:1e78a93102a3 - user: test - date: Mon Jan 12 13:46:40 1970 +0000 - summary: latin-1 e': И = u'\xe9' - - -hg log (dolphin) - - $ HGENCODING=dolphin hg log - abort: unknown encoding: dolphin, please check your locale settings - [255] - $ HGENCODING=ascii hg branch `cat latin-1-tag` - abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! - [255] - $ cp latin-1-tag .hg/branch - $ HGENCODING=latin-1 hg ci -m 'should fail' - abort: branch name not in UTF-8! - [255] ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-extdiff.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-extdiff.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-extdiff.t.err @@ -1,170 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ echo "[extensions]" >> $HGRCPATH - $ echo "extdiff=" >> $HGRCPATH - - $ hg init a - $ cd a - $ echo a > a - $ echo b > b - $ hg add - adding a - adding b - -Should diff cloned directories: - - $ hg extdiff -o -r $opt - Only in a: a - Only in a: b - [1] - - $ echo "[extdiff]" >> $HGRCPATH - $ echo "cmd.falabala=echo" >> $HGRCPATH - $ echo "opts.falabala=diffing" >> $HGRCPATH - - $ hg falabala - diffing a.000000000000 a - [1] - - $ hg help falabala - hg falabala [OPTION]... [FILE]... - - use 'echo' to diff repository (or selected files) - - Show differences between revisions for the specified files, using the - 'echo' program. - - When two revision arguments are given, then changes are shown between - those revisions. If only one revision is specified then that revision is - compared to the working directory, and, when no revisions are specified, - the working directory files are compared to its parent. - - options: - - -o --option OPT [+] pass option to comparison program - -r --rev REV [+] revision - -c --change REV change made by revision - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - - [+] marked option can be specified multiple times - - use "hg -v help falabala" to show global options - - $ hg ci -d '0 0' -mtest1 - - $ echo b >> a - $ hg ci -d '1 0' -mtest2 - -Should diff cloned files directly: - - $ hg falabala -r 0:1 - diffing a.8a5febb7f867/a a.34eed99112ab/a - [1] - -Test diff during merge: - - $ hg update -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo c >> c - $ hg add c - $ hg ci -m "new branch" -d '1 0' - created new head - $ hg merge 1 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - -Should diff cloned file against wc file: - - $ hg falabala - diffing a.2a13a4d2da36/a $TESTTMP/a/a - [1] - - -Test --change option: - - $ hg ci -d '2 0' -mtest3 - $ hg falabala -c 1 - diffing a.8a5febb7f867/a a.34eed99112ab/a - [1] - -Check diff are made from the first parent: - - $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" - diffing a.2a13a4d2da36/a a.46c0e4daeb72/a - diff-like tools yield a non-zero exit code - -Test extdiff of multiple files in tmp dir: - - $ hg update -C 0 > /dev/null - $ echo changed > a - $ echo changed > b - $ chmod +x b - -Diff in working directory, before: - - $ hg diff --git - diff --git a/a b/a - --- a/a - +++ b/a - @@ -1,1 +1,1 @@ - -a - +changed - diff --git a/b b/b - old mode 100644 - new mode 100755 - --- a/b - +++ b/b - @@ -1,1 +1,1 @@ - -b - +changed - - -Edit with extdiff -p: - -Prepare custom diff/edit tool: - - $ cat > 'diff tool.py' << EOT - > #!/usr/bin/env python - > import time - > time.sleep(1) # avoid unchanged-timestamp problems - > file('a/a', 'ab').write('edited\n') - > file('a/b', 'ab').write('edited\n') - > EOT - - $ chmod +x 'diff tool.py' - -will change to /tmp/extdiff.TMP and populate directories a.TMP and a -and start tool - - $ hg extdiff -p "`pwd`/diff tool.py" - [1] - -Diff in working directory, after: - - $ hg diff --git - diff --git a/a b/a - --- a/a - +++ b/a - @@ -1,1 +1,2 @@ - -a - +changed - +edited - diff --git a/b b/b - old mode 100644 - new mode 100755 - --- a/b - +++ b/b - @@ -1,1 +1,2 @@ - -b - +changed - +edited - -Test extdiff with --option: - - $ hg extdiff -p echo -o this -c 1 - this a.8a5febb7f867/a a.34eed99112ab/a - [1] - - $ hg falabala -o this -c 1 - diffing this a.8a5febb7f867/a a.34eed99112ab/a - [1] - !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-export.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-export.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-export.t.err @@ -1,110 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init repo - $ cd repo - $ touch foo - $ hg add foo - $ for i in 0 1 2 3 4 5 6 7 8 9 10 11; do - > echo "foo-$i" >> foo - > hg ci -m "foo-$i" - > done - - $ for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do - > echo - > echo "# foo-$out.patch" - > hg export -v -o "foo-$out.patch" 2:tip - > done - - # foo-%nof%N.patch - exporting patches: - foo-01of10.patch - foo-02of10.patch - foo-03of10.patch - foo-04of10.patch - foo-05of10.patch - foo-06of10.patch - foo-07of10.patch - foo-08of10.patch - foo-09of10.patch - foo-10of10.patch - - # foo-%%%H.patch - exporting patches: - foo-%617188a1c80f869a7b66c85134da88a6fb145f67.patch - foo-%dd41a5ff707a5225204105611ba49cc5c229d55f.patch - foo-%f95a5410f8664b6e1490a4af654e4b7d41a7b321.patch - foo-%4346bcfde53b4d9042489078bcfa9c3e28201db2.patch - foo-%afda8c3a009cc99449a05ad8aa4655648c4ecd34.patch - foo-%35284ce2b6b99c9d2ac66268fe99e68e1974e1aa.patch - foo-%9688c41894e6931305fa7165a37f6568050b4e9b.patch - foo-%747d3c68f8ec44bb35816bfcd59aeb50b9654c2f.patch - foo-%5f17a83f5fbd9414006a5e563eab4c8a00729efd.patch - foo-%f3acbafac161ec68f1598af38f794f28847ca5d3.patch - - # foo-%b-%R.patch - exporting patches: - foo-repo-2.patch - foo-repo-3.patch - foo-repo-4.patch - foo-repo-5.patch - foo-repo-6.patch - foo-repo-7.patch - foo-repo-8.patch - foo-repo-9.patch - foo-repo-10.patch - foo-repo-11.patch - - # foo-%h.patch - exporting patches: - foo-617188a1c80f.patch - foo-dd41a5ff707a.patch - foo-f95a5410f866.patch - foo-4346bcfde53b.patch - foo-afda8c3a009c.patch - foo-35284ce2b6b9.patch - foo-9688c41894e6.patch - foo-747d3c68f8ec.patch - foo-5f17a83f5fbd.patch - foo-f3acbafac161.patch - - # foo-%r.patch - exporting patches: - foo-02.patch - foo-03.patch - foo-04.patch - foo-05.patch - foo-06.patch - foo-07.patch - foo-08.patch - foo-09.patch - foo-10.patch - foo-11.patch - -Exporting 4 changesets to a file: - - $ hg export -o export_internal 1 2 3 4 - $ grep HG export_internal | wc -l - \s*4 (re) - -Exporting 4 changesets to a file: - - $ hg export 1 2 3 4 | grep HG | wc -l - \s*4 (re) - -Exporting revision -2 to a file: - - $ hg export -- -2 - # HG changeset patch - # User test - # Date 0 0 - # Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd - # Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f - foo-10 - - diff -r 747d3c68f8ec -r 5f17a83f5fbd foo - --- a/foo Thu Jan 01 00:00:00 1970 +0000 - +++ b/foo Thu Jan 01 00:00:00 1970 +0000 - @@ -8,3 +8,4 @@ - foo-7 - foo-8 - foo-9 - +foo-10 - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-eol-patch.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-eol-patch.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-eol-patch.t.err @@ -1,400 +1,8 @@ + + ### Abort: timeout after 180 seconds. Test EOL patching $ cat > $HGRCPATH < [diff] > git = 1 > EOF - -Set up helpers - - $ seteol () { - > if [ $1 = "LF" ]; then - > EOL='\n' - > else - > EOL='\r\n' - > fi - > } - - $ makerepo () { - > seteol $1 - > echo - > echo "# ==== setup $1 repository ====" - > echo '% hg init' - > hg init repo - > cd repo - > cat > .hgeol < [repository] - > native = $1 - > [patterns] - > unix.txt = LF - > win.txt = CRLF - > **.txt = native - > EOF - > printf "first\r\nsecond\r\nthird\r\n" > win.txt - > printf "first\nsecond\nthird\n" > unix.txt - > printf "first${EOL}second${EOL}third${EOL}" > native.txt - > hg commit --addremove -m 'checkin' - > cd .. - > } - - $ dotest () { - > seteol $1 - > echo - > echo "% hg clone repo repo-$1" - > hg clone --noupdate repo repo-$1 - > cd repo-$1 - > cat > .hg/hgrc < [extensions] - > eol = - > [eol] - > native = $1 - > EOF - > hg update - > echo '% printrepr.py native.txt' - > python $TESTDIR/printrepr.py < native.txt - > echo '% printrepr.py unix.txt' - > python $TESTDIR/printrepr.py < unix.txt - > echo '% printrepr.py win.txt' - > python $TESTDIR/printrepr.py < win.txt - > printf "first${EOL}third${EOL}" > native.txt - > printf "first\r\nthird\r\n" > win.txt - > printf "first\nthird\n" > unix.txt - > echo '% hg diff' - > hg diff > p - > python $TESTDIR/printrepr.py < p - > echo '% hg revert' - > hg revert --all - > echo '% hg import' - > hg import -m 'patch' p - > echo '% printrepr.py native.txt' - > python $TESTDIR/printrepr.py < native.txt - > echo '% printrepr.py unix.txt' - > python $TESTDIR/printrepr.py < unix.txt - > echo '% printrepr.py win.txt' - > python $TESTDIR/printrepr.py < win.txt - > echo '% hg diff -c tip' - > hg diff -c tip | python $TESTDIR/printrepr.py - > cd .. - > rm -r repo-$1 - > } - -Run tests - - $ makerepo LF - - # ==== setup LF repository ==== - % hg init - adding .hgeol - adding native.txt - adding unix.txt - adding win.txt - $ dotest LF - - % hg clone repo repo-LF - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py native.txt - first - second - third - % printrepr.py unix.txt - first - second - third - % printrepr.py win.txt - first\r - second\r - third\r - % hg diff - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - % hg revert - reverting native.txt - reverting unix.txt - reverting win.txt - % hg import - applying p - % printrepr.py native.txt - first - third - % printrepr.py unix.txt - first - third - % printrepr.py win.txt - first\r - third\r - % hg diff -c tip - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - $ dotest CRLF - - % hg clone repo repo-CRLF - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py native.txt - first\r - second\r - third\r - % printrepr.py unix.txt - first - second - third - % printrepr.py win.txt - first\r - second\r - third\r - % hg diff - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - % hg revert - reverting native.txt - reverting unix.txt - reverting win.txt - % hg import - applying p - % printrepr.py native.txt - first\r - third\r - % printrepr.py unix.txt - first - third - % printrepr.py win.txt - first\r - third\r - % hg diff -c tip - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - $ rm -r repo - $ makerepo CRLF - - # ==== setup CRLF repository ==== - % hg init - adding .hgeol - adding native.txt - adding unix.txt - adding win.txt - $ dotest LF - - % hg clone repo repo-LF - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py native.txt - first - second - third - % printrepr.py unix.txt - first - second - third - % printrepr.py win.txt - first\r - second\r - third\r - % hg diff - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - % hg revert - reverting native.txt - reverting unix.txt - reverting win.txt - % hg import - applying p - % printrepr.py native.txt - first - third - % printrepr.py unix.txt - first - third - % printrepr.py win.txt - first\r - third\r - % hg diff -c tip - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - $ dotest CRLF - - % hg clone repo repo-CRLF - 4 files updated, 0 files merged, 0 files removed, 0 files unresolved - % printrepr.py native.txt - first\r - second\r - third\r - % printrepr.py unix.txt - first - second - third - % printrepr.py win.txt - first\r - second\r - third\r - % hg diff - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - % hg revert - reverting native.txt - reverting unix.txt - reverting win.txt - % hg import - applying p - % printrepr.py native.txt - first\r - third\r - % printrepr.py unix.txt - first - third - % printrepr.py win.txt - first\r - third\r - % hg diff -c tip - diff --git a/native.txt b/native.txt - --- a/native.txt - +++ b/native.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - diff --git a/unix.txt b/unix.txt - --- a/unix.txt - +++ b/unix.txt - @@ -1,3 +1,2 @@ - first - -second - third - diff --git a/win.txt b/win.txt - --- a/win.txt - +++ b/win.txt - @@ -1,3 +1,2 @@ - first\r - -second\r - third\r - $ rm -r repo !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-flags.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-flags.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-flags.t.err @@ -1,149 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ umask 027 - $ mkdir test1 - $ cd test1 - - $ hg init - $ touch a b - $ hg add a b - $ hg ci -m "added a b" - - $ cd .. - $ hg clone test1 test3 - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ mkdir test2 - $ cd test2 - - $ hg init - $ hg pull ../test1 - pulling from ../test1 - requesting all changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 2 changes to 2 files - (run 'hg update' to get a working copy) - $ hg co - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ chmod +x a - $ hg ci -m "chmod +x a" - -the changelog should mention file a: - - $ hg tip --template '{files}\n' - a - - $ cd ../test1 - $ echo 123 >>a - $ hg ci -m "a updated" - - $ hg pull ../test2 - pulling from ../test2 - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 0 changes to 0 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg heads - changeset: 2:7f4313b42a34 - tag: tip - parent: 0:22a449e20da5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: chmod +x a - - changeset: 1:c6ecefc45368 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a updated - - $ hg history - changeset: 2:7f4313b42a34 - tag: tip - parent: 0:22a449e20da5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: chmod +x a - - changeset: 1:c6ecefc45368 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a updated - - changeset: 0:22a449e20da5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: added a b - - - $ hg -v merge - resolving manifests - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - - $ cd ../test3 - $ echo 123 >>b - $ hg ci -m "b updated" - - $ hg pull ../test2 - pulling from ../test2 - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 0 changes to 0 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg heads - changeset: 2:7f4313b42a34 - tag: tip - parent: 0:22a449e20da5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: chmod +x a - - changeset: 1:dc57ead75f79 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: b updated - - $ hg history - changeset: 2:7f4313b42a34 - tag: tip - parent: 0:22a449e20da5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: chmod +x a - - changeset: 1:dc57ead75f79 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: b updated - - changeset: 0:22a449e20da5 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: added a b - - - $ hg -v merge - resolving manifests - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - - $ ls -l ../test[123]/a > foo - $ cut -b 1-10 < foo - -rwxr-x--- - -rwxr-x--- - -rwxr-x--- - - $ hg debugindex .hg/store/data/a.i - rev offset length base linkrev nodeid p1 p2 - 0 0 0 0 0 b80de5d13875 000000000000 000000000000 - $ hg debugindex ../test2/.hg/store/data/a.i - rev offset length base linkrev nodeid p1 p2 - 0 0 0 0 0 b80de5d13875 000000000000 000000000000 - $ hg debugindex ../test1/.hg/store/data/a.i - rev offset length base linkrev nodeid p1 p2 - 0 0 0 0 0 b80de5d13875 000000000000 000000000000 - 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000 ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-fetch.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-fetch.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-fetch.t.err @@ -1,418 +1,5 @@ + + ### Abort: timeout after 180 seconds. adjust to non-default HGPORT, e.g. with run-tests.py -j $ echo "[extensions]" >> $HGRCPATH - $ echo "fetch=" >> $HGRCPATH - -test fetch with default branches only - - $ hg init a - $ echo a > a/a - $ hg --cwd a commit -d '1 0' -Ama - adding a - $ hg clone a b - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone a c - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo b > a/b - $ hg --cwd a commit -d '2 0' -Amb - adding b - $ hg --cwd a parents -q - 1:97d72e5f12c7 - -should pull one change - - $ hg --cwd b fetch ../a - pulling from ../a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg --cwd b parents -q - 1:97d72e5f12c7 - $ echo c > c/c - $ hg --cwd c commit -d '3 0' -Amc - adding c - $ hg clone c d - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone c e - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -We cannot use the default commit message if fetching from a local -repo, because the path of the repo will be included in the commit -message, making every commit appear different. -should merge c into a - - $ hg --cwd c fetch -d '4 0' -m 'automated merge' ../a - pulling from ../a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:97d72e5f12c7 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 1:5e056962225c - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 3:cd3a41621cf0 merges remote changes with local - $ ls c - a - b - c - $ netstat -tnap 2>/dev/null | grep $HGPORT | grep LISTEN - [1] - $ hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid - $ cat a/hg.pid >> "$DAEMON_PIDS" - -fetch over http, no auth - - $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ - pulling from http://localhost:$HGPORT/ - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:97d72e5f12c7 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 1:5e056962225c - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 3:* merges remote changes with local (glob) - $ hg --cwd d tip --template '{desc}\n' - Automated merge with http://localhost:$HGPORT/ - -fetch over http with auth (should be hidden in desc) - - $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ - pulling from http://user:***@localhost:$HGPORT/ - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:97d72e5f12c7 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 1:5e056962225c - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 3:* merges remote changes with local (glob) - $ hg --cwd e tip --template '{desc}\n' - Automated merge with http://localhost:$HGPORT/ - $ hg clone a f - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone a g - updating to branch default - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo f > f/f - $ hg --cwd f ci -d '6 0' -Amf - adding f - $ echo g > g/g - $ hg --cwd g ci -d '6 0' -Amg - adding g - $ hg clone -q f h - $ hg clone -q g i - -should merge f into g - - $ hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f - pulling from ../f - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - merging with 3:cc6a3744834d - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 4:55aa4f32ec59 merges remote changes with local - $ rm i/g - -should abort, because i is modified - - $ hg --cwd i fetch ../h - abort: working directory is missing some files - [255] - -test fetch with named branches - - $ hg init nbase - $ echo base > nbase/a - $ hg -R nbase ci -d '1 0' -Am base - adding a - $ hg -R nbase branch a - marked working directory as branch a - $ echo a > nbase/a - $ hg -R nbase ci -d '2 0' -m a - $ hg -R nbase up -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R nbase branch b - marked working directory as branch b - $ echo b > nbase/b - $ hg -R nbase ci -Ad '3 0' -m b - adding b - $ echo - - -pull in change on foreign branch - - $ hg clone nbase n1 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone nbase n2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n1 up -C a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo aa > n1/a - $ hg -R n1 ci -d '4 0' -m a1 - $ hg -R n2 up -C b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 - pulling from n1 - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - -parent should be 2 (no automatic update) - - $ hg -R n2 parents --template '{rev}\n' - 2 - $ rm -fr n1 n2 - $ echo - - -pull in changes on both foreign and local branches - - $ hg clone nbase n1 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone nbase n2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n1 up -C a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo aa > n1/a - $ hg -R n1 ci -d '4 0' -m a1 - $ hg -R n1 up -C b - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo bb > n1/b - $ hg -R n1 ci -d '5 0' -m b1 - $ hg -R n2 up -C b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 - pulling from n1 - searching for changes - adding changesets - adding manifests - adding file changes - added 2 changesets with 2 changes to 2 files - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - -parent should be 4 (fast forward) - - $ hg -R n2 parents --template '{rev}\n' - 4 - $ rm -fr n1 n2 - $ echo - - -pull changes on foreign (2 new heads) and local (1 new head) branches -with a local change - - $ hg clone nbase n1 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone nbase n2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n1 up -C a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo a1 > n1/a - $ hg -R n1 ci -d '4 0' -m a1 - $ hg -R n1 up -C b - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo bb > n1/b - $ hg -R n1 ci -d '5 0' -m b1 - $ hg -R n1 up -C 1 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo a2 > n1/a - $ hg -R n1 ci -d '6 0' -m a2 - created new head - $ hg -R n2 up -C b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo change >> n2/c - $ hg -R n2 ci -Ad '7 0' -m local - adding c - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 - pulling from n1 - searching for changes - adding changesets - adding manifests - adding file changes - added 3 changesets with 3 changes to 2 files (+2 heads) - updating to 5:708c6cce3d26 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 3:d83427717b1f - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 7:48f1a33f52af merges remote changes with local - -parent should be 7 (new merge changeset) - - $ hg -R n2 parents --template '{rev}\n' - 7 - $ rm -fr n1 n2 - -pull in changes on foreign (merge of local branch) and local (2 new -heads) with a local change - - $ hg clone nbase n1 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg clone nbase n2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n1 up -C a - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n1 merge b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg -R n1 ci -d '4 0' -m merge - $ hg -R n1 up -C 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo c > n1/a - $ hg -R n1 ci -d '5 0' -m c - $ hg -R n1 up -C 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo cc > n1/a - $ hg -R n1 ci -d '6 0' -m cc - created new head - $ hg -R n2 up -C b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo change >> n2/b - $ hg -R n2 ci -Ad '7 0' -m local - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 - pulling from n1 - searching for changes - adding changesets - adding manifests - adding file changes - added 3 changesets with 2 changes to 1 files (+2 heads) - not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) - [1] - -parent should be 3 (fetch did not merge anything) - - $ hg -R n2 parents --template '{rev}\n' - 3 - $ rm -fr n1 n2 - -pull in change on different branch than dirstate - - $ hg init n1 - $ echo a > n1/a - $ hg -R n1 ci -Am initial - adding a - $ hg clone n1 n2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo b > n1/a - $ hg -R n1 ci -m next - $ hg -R n2 branch topic - marked working directory as branch topic - $ hg -R n2 fetch -d '0 0' -m merge n1 - abort: working dir not at branch tip (use "hg update" to check out branch tip) - [255] - -parent should be 0 (fetch did not update or merge anything) - - $ hg -R n2 parents --template '{rev}\n' - 0 - $ rm -fr n1 n2 - -test fetch with inactive branches - - $ hg init ib1 - $ echo a > ib1/a - $ hg --cwd ib1 ci -Am base - adding a - $ hg --cwd ib1 branch second - marked working directory as branch second - $ echo b > ib1/b - $ hg --cwd ib1 ci -Am onsecond - adding b - $ hg --cwd ib1 branch -f default - marked working directory as branch default - $ echo c > ib1/c - $ hg --cwd ib1 ci -Am newdefault - adding c - created new head - $ hg clone ib1 ib2 - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - -fetch should succeed - - $ hg --cwd ib2 fetch ../ib1 - pulling from ../ib1 - searching for changes - no changes found - $ rm -fr ib1 ib2 - -test issue1726 - - $ hg init i1726r1 - $ echo a > i1726r1/a - $ hg --cwd i1726r1 ci -Am base - adding a - $ hg clone i1726r1 i1726r2 - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo b > i1726r1/a - $ hg --cwd i1726r1 ci -m second - $ echo c > i1726r2/a - $ hg --cwd i1726r2 ci -m third - $ HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 - pulling from ../i1726r1 - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:7837755a2789 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - merging with 1:d1f0c6c48ebd - merging a - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - new changeset 3:* merges remote changes with local (glob) - $ hg --cwd i1726r2 heads default --template '{rev}\n' - 3 - $ echo - - -test issue2047 - - $ hg -q init i2047a - $ cd i2047a - $ echo a > a - $ hg -q ci -Am a - $ hg -q branch stable - $ echo b > b - $ hg -q ci -Am b - $ cd .. - $ hg -q clone -r 0 i2047a i2047b - $ cd i2047b - $ hg fetch ../i2047a - pulling from ../i2047a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - $ "$TESTDIR/killdaemons.py" !.. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-gendoc.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-gendoc.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-gendoc.t.err @@ -1,54 +1,5 @@ + + ### Abort: timeout after 180 seconds. Test document extraction $ "$TESTDIR/hghave" docutils || exit 80 - $ HGENCODING=UTF-8 - $ export HGENCODING - $ for PO in C $TESTDIR/../i18n/*.po; do - > LOCALE=`basename $PO .po` - > echo - > echo "% extracting documentation from $LOCALE" - > echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt - > echo "" >> gendoc-$LOCALE.txt - > LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt 2> /dev/null || exit - > - > # We call runrst without adding "--halt warning" to make it report - > # all errors instead of stopping on the first one. - > echo "checking for parse errors" - > python $TESTDIR/../doc/runrst html gendoc-$LOCALE.txt /dev/null - > done - - % extracting documentation from C - checking for parse errors - - % extracting documentation from da - checking for parse errors - - % extracting documentation from de - checking for parse errors - - % extracting documentation from el - checking for parse errors - - % extracting documentation from fr - checking for parse errors - - % extracting documentation from it - checking for parse errors - - % extracting documentation from ja - checking for parse errors - - % extracting documentation from pt_BR - checking for parse errors - - % extracting documentation from ro - checking for parse errors - - % extracting documentation from sv - checking for parse errors - - % extracting documentation from zh_CN - checking for parse errors - - % extracting documentation from zh_TW - checking for parse errors ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-git-import.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-git-import.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-git-import.t.err @@ -1,385 +1,4 @@ + + ### Abort: timeout after 180 seconds. $ hg init - -New file: - - $ hg import -d "1000000 0" -mnew - < diff --git a/new b/new - > new file mode 100644 - > index 0000000..7898192 - > --- /dev/null - > +++ b/new - > @@ -0,0 +1 @@ - > +a - > EOF - applying patch from stdin - - $ hg tip -q - 0:ae3ee40d2079 - -New empty file: - - $ hg import -d "1000000 0" -mempty - < diff --git a/empty b/empty - > new file mode 100644 - > EOF - applying patch from stdin - - $ hg tip -q - 1:ab199dc869b5 - - $ hg locate empty - empty - -chmod +x: - - $ hg import -d "1000000 0" -msetx - < diff --git a/new b/new - > old mode 100644 - > new mode 100755 - > EOF - applying patch from stdin - - $ hg tip -q - 2:3a34410f282e - - $ test -x new - -Copy: - - $ hg import -d "1000000 0" -mcopy - < diff --git a/new b/copy - > old mode 100755 - > new mode 100644 - > similarity index 100% - > copy from new - > copy to copy - > diff --git a/new b/copyx - > similarity index 100% - > copy from new - > copy to copyx - > EOF - applying patch from stdin - - $ hg tip -q - 3:37bacb7ca14d - - $ if "$TESTDIR/hghave" -q execbit; then - > test -f copy -a ! -x copy || echo bad - > test -x copyx || echo bad - > else - > test -f copy || echo bad - > fi - - $ cat copy - a - - $ hg cat copy - a - -Rename: - - $ hg import -d "1000000 0" -mrename - < diff --git a/copy b/rename - > similarity index 100% - > rename from copy - > rename to rename - > EOF - applying patch from stdin - - $ hg tip -q - 4:47b81a94361d - - $ hg locate - copyx - empty - new - rename - -Delete: - - $ hg import -d "1000000 0" -mdelete - < diff --git a/copyx b/copyx - > deleted file mode 100755 - > index 7898192..0000000 - > --- a/copyx - > +++ /dev/null - > @@ -1 +0,0 @@ - > -a - > EOF - applying patch from stdin - - $ hg tip -q - 5:d9b001d98336 - - $ hg locate - empty - new - rename - - $ test -f copyx - [1] - -Regular diff: - - $ hg import -d "1000000 0" -mregular - < diff --git a/rename b/rename - > index 7898192..72e1fe3 100644 - > --- a/rename - > +++ b/rename - > @@ -1 +1,5 @@ - > a - > +a - > +a - > +a - > +a - > EOF - applying patch from stdin - - $ hg tip -q - 6:ebe901e7576b - -Copy and modify: - - $ hg import -d "1000000 0" -mcopymod - < diff --git a/rename b/copy2 - > similarity index 80% - > copy from rename - > copy to copy2 - > index 72e1fe3..b53c148 100644 - > --- a/rename - > +++ b/copy2 - > @@ -1,5 +1,5 @@ - > a - > a - > -a - > +b - > a - > a - > EOF - applying patch from stdin - - $ hg tip -q - 7:18f368958ecd - - $ hg cat copy2 - a - a - b - a - a - -Rename and modify: - - $ hg import -d "1000000 0" -mrenamemod - < diff --git a/copy2 b/rename2 - > similarity index 80% - > rename from copy2 - > rename to rename2 - > index b53c148..8f81e29 100644 - > --- a/copy2 - > +++ b/rename2 - > @@ -1,5 +1,5 @@ - > a - > a - > b - > -a - > +c - > a - > EOF - applying patch from stdin - - $ hg tip -q - 8:c32b0d7e6f44 - - $ hg locate copy2 - [1] - $ hg cat rename2 - a - a - b - c - a - -One file renamed multiple times: - - $ hg import -d "1000000 0" -mmultirenames - < diff --git a/rename2 b/rename3 - > rename from rename2 - > rename to rename3 - > diff --git a/rename2 b/rename3-2 - > rename from rename2 - > rename to rename3-2 - > EOF - applying patch from stdin - - $ hg tip -q - 9:034a6bf95330 - - $ hg log -vr. --template '{rev} {files} / {file_copies}\n' - 9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) - - $ hg locate rename2 rename3 rename3-2 - rename3 - rename3-2 - - $ hg cat rename3 - a - a - b - c - a - - $ hg cat rename3-2 - a - a - b - c - a - - $ echo foo > foo - $ hg add foo - $ hg ci -m 'add foo' - -Binary files and regular patch hunks: - - $ hg import -d "1000000 0" -m binaryregular - < diff --git a/binary b/binary - > new file mode 100644 - > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 - > GIT binary patch - > literal 4 - > Lc\${NkU|;|M00aO5 - > - > diff --git a/foo b/foo2 - > rename from foo - > rename to foo2 - > EOF - applying patch from stdin - - $ hg tip -q - 11:c39bce63e786 - - $ cat foo2 - foo - - $ hg manifest --debug | grep binary - 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary - -Multiple binary files: - - $ hg import -d "1000000 0" -m multibinary - < diff --git a/mbinary1 b/mbinary1 - > new file mode 100644 - > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 - > GIT binary patch - > literal 4 - > Lc\${NkU|;|M00aO5 - > - > diff --git a/mbinary2 b/mbinary2 - > new file mode 100644 - > index 0000000000000000000000000000000000000000..112363ac1917b417ffbd7f376ca786a1e5fa7490 - > GIT binary patch - > literal 5 - > Mc\${NkU|\`?^000jF3jhEB - > - > EOF - applying patch from stdin - - $ hg tip -q - 12:30b530085242 - - $ hg manifest --debug | grep mbinary - 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 - a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 - -Filenames with spaces: - - $ hg import -d "1000000 0" -m spaces - < diff --git a/foo bar b/foo bar - > new file mode 100644 - > index 0000000..257cc56 - > --- /dev/null - > +++ b/foo bar - > @@ -0,0 +1 @@ - > +foo - > EOF - applying patch from stdin - - $ hg tip -q - 13:04750ef42fb3 - - $ cat "foo bar" - foo - -Copy then modify the original file: - - $ hg import -d "1000000 0" -m copy-mod-orig - < diff --git a/foo2 b/foo2 - > index 257cc56..fe08ec6 100644 - > --- a/foo2 - > +++ b/foo2 - > @@ -1 +1,2 @@ - > foo - > +new line - > diff --git a/foo2 b/foo3 - > similarity index 100% - > copy from foo2 - > copy to foo3 - > EOF - applying patch from stdin - - $ hg tip -q - 14:c4cd9cdeaa74 - - $ cat foo3 - foo - -Move text file and patch as binary - - $ echo a > text2 - $ hg ci -Am0 - adding text2 - $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" - > diff --git a/text2 b/binary2 - > rename from text2 - > rename to binary2 - > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 - > GIT binary patch - > literal 5 - > Mc$`b*O5$Pw00T?_*Z=?k - > - > EOF - applying patch from stdin - - $ python $TESTDIR/printrepr.py < binary2 - a - b - \x00 - - $ hg st --copies --change . - A binary2 - text2 - R text2 - $ cd .. - -Consecutive import with renames (issue2459) - - $ hg init issue2459 - $ cd issue2459 - $ hg import --no-commit --force - < diff --git a/a b/a - > new file mode 100644 - > EOF - applying patch from stdin - $ hg import --no-commit --force - < diff --git a/a b/b - > rename from a - > rename to b - > EOF - applying patch from stdin - a has not been committed yet, so no copy data will be stored for b. - $ hg debugstate - a 0 -1 unset b - $ hg ci -m done - $ cd .. ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-extension.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-extension.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-extension.t.err @@ -1,320 +1,5 @@ + + ### Abort: timeout after 180 seconds. Test basic extension support $ "$TESTDIR/hghave" no-outer-repo || exit 80 - - $ cat > foobar.py < import os - > from mercurial import commands - > - > def uisetup(ui): - > ui.write("uisetup called\\n") - > - > def reposetup(ui, repo): - > ui.write("reposetup called for %s\\n" % os.path.basename(repo.root)) - > ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!")) - > - > def foo(ui, *args, **kwargs): - > ui.write("Foo\\n") - > - > def bar(ui, *args, **kwargs): - > ui.write("Bar\\n") - > - > cmdtable = { - > "foo": (foo, [], "hg foo"), - > "bar": (bar, [], "hg bar"), - > } - > - > commands.norepo += ' bar' - > EOF - $ abspath=`pwd`/foobar.py - - $ mkdir barfoo - $ cp foobar.py barfoo/__init__.py - $ barfoopath=`pwd`/barfoo - - $ hg init a - $ cd a - $ echo foo > file - $ hg add file - $ hg commit -m 'add file' - - $ echo '[extensions]' >> $HGRCPATH - $ echo "foobar = $abspath" >> $HGRCPATH - $ hg foo - uisetup called - reposetup called for a - ui == repo.ui - Foo - - $ cd .. - $ hg clone a b - uisetup called - reposetup called for a - ui == repo.ui - reposetup called for b - ui == repo.ui - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - - $ hg bar - uisetup called - Bar - $ echo 'foobar = !' >> $HGRCPATH - -module/__init__.py-style - - $ echo "barfoo = $barfoopath" >> $HGRCPATH - $ cd a - $ hg foo - uisetup called - reposetup called for a - ui == repo.ui - Foo - $ echo 'barfoo = !' >> $HGRCPATH - -Check that extensions are loaded in phases: - - $ cat > foo.py < import os - > name = os.path.basename(__file__).rsplit('.', 1)[0] - > print "1) %s imported" % name - > def uisetup(ui): - > print "2) %s uisetup" % name - > def extsetup(): - > print "3) %s extsetup" % name - > def reposetup(ui, repo): - > print "4) %s reposetup" % name - > EOF - - $ cp foo.py bar.py - $ echo 'foo = foo.py' >> $HGRCPATH - $ echo 'bar = bar.py' >> $HGRCPATH - -Command with no output, we just want to see the extensions loaded: - - $ hg paths - 1) foo imported - 1) bar imported - 2) foo uisetup - 2) bar uisetup - 3) foo extsetup - 3) bar extsetup - 4) foo reposetup - 4) bar reposetup - -Check hgweb's load order: - - $ cat > hgweb.cgi < #!/usr/bin/env python - > from mercurial import demandimport; demandimport.enable() - > from mercurial.hgweb import hgweb - > from mercurial.hgweb import wsgicgi - > - > application = hgweb('.', 'test repo') - > wsgicgi.launch(application) - > EOF - - $ SCRIPT_NAME='/' SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \ - > | grep '^[0-9]) ' # ignores HTML output - 1) foo imported - 1) bar imported - 2) foo uisetup - 2) bar uisetup - 3) foo extsetup - 3) bar extsetup - 4) foo reposetup - 4) bar reposetup - 4) foo reposetup - 4) bar reposetup - - $ echo 'foo = !' >> $HGRCPATH - $ echo 'bar = !' >> $HGRCPATH - - $ cd .. - - $ cat > empty.py < '''empty cmdtable - > ''' - > cmdtable = {} - > EOF - $ emptypath=`pwd`/empty.py - $ echo "empty = $emptypath" >> $HGRCPATH - $ hg help empty - empty extension - empty cmdtable - - no commands defined - - $ echo 'empty = !' >> $HGRCPATH - - $ cat > debugextension.py < '''only debugcommands - > ''' - > def debugfoobar(ui, repo, *args, **opts): - > "yet another debug command" - > pass - > - > def foo(ui, repo, *args, **opts): - > """yet another foo command - > - > This command has been DEPRECATED since forever. - > """ - > pass - > - > cmdtable = { - > "debugfoobar": (debugfoobar, (), "hg debugfoobar"), - > "foo": (foo, (), "hg foo") - > } - > EOF - $ debugpath=`pwd`/debugextension.py - $ echo "debugextension = $debugpath" >> $HGRCPATH - - $ hg help debugextension - debugextension extension - only debugcommands - - no commands defined - - $ hg --verbose help debugextension - debugextension extension - only debugcommands - - list of commands: - - foo: - yet another foo command - - global options: - -R --repository REPO repository root directory or name of overlay bundle - file - --cwd DIR change working directory - -y --noninteractive do not prompt, assume 'yes' for any required answers - -q --quiet suppress output - -v --verbose enable additional output - --config CONFIG [+] set/override config option (use 'section.name=value') - --debug enable debugging output - --debugger start debugger - --encoding ENCODE set the charset encoding (default: ascii) - --encodingmode MODE set the charset encoding mode (default: strict) - --traceback always print a traceback on exception - --time time how long the command takes - --profile print command execution profile - --version output version information and exit - -h --help display help and exit - - [+] marked option can be specified multiple times - - $ hg --debug help debugextension - debugextension extension - only debugcommands - - list of commands: - - debugfoobar: - yet another debug command - foo: - yet another foo command - - global options: - -R --repository REPO repository root directory or name of overlay bundle - file - --cwd DIR change working directory - -y --noninteractive do not prompt, assume 'yes' for any required answers - -q --quiet suppress output - -v --verbose enable additional output - --config CONFIG [+] set/override config option (use 'section.name=value') - --debug enable debugging output - --debugger start debugger - --encoding ENCODE set the charset encoding (default: ascii) - --encodingmode MODE set the charset encoding mode (default: strict) - --traceback always print a traceback on exception - --time time how long the command takes - --profile print command execution profile - --version output version information and exit - -h --help display help and exit - - [+] marked option can be specified multiple times - $ echo 'debugextension = !' >> $HGRCPATH - -Issue811: Problem loading extensions twice (by site and by user) - - $ debugpath=`pwd`/debugissue811.py - $ cat > debugissue811.py < '''show all loaded extensions - > ''' - > from mercurial import extensions, commands - > - > def debugextensions(ui): - > "yet another debug command" - > ui.write("%s\n" % '\n'.join([x for x, y in extensions.extensions()])) - > - > cmdtable = {"debugextensions": (debugextensions, (), "hg debugextensions")} - > commands.norepo += " debugextensions" - > EOF - $ echo "debugissue811 = $debugpath" >> $HGRCPATH - $ echo "mq=" >> $HGRCPATH - $ echo "hgext.mq=" >> $HGRCPATH - $ echo "hgext/mq=" >> $HGRCPATH - -Show extensions: - - $ hg debugextensions - debugissue811 - mq - -Disabled extension commands: - - $ HGRCPATH= - $ export HGRCPATH - $ hg help email - 'email' is provided by the following extension: - - patchbomb command to send changesets as (a series of) patch emails - - use "hg help extensions" for information on enabling extensions - $ hg qdel - hg: unknown command 'qdel' - 'qdelete' is provided by the following extension: - - mq manage a stack of patches - - use "hg help extensions" for information on enabling extensions - [255] - $ hg churn - hg: unknown command 'churn' - 'churn' is provided by the following extension: - - churn command to display statistics about repository history - - use "hg help extensions" for information on enabling extensions - [255] - -Disabled extensions: - - $ hg help churn - churn extension - command to display statistics about repository history - - use "hg help extensions" for information on enabling extensions - $ hg help patchbomb - patchbomb extension - command to send changesets as (a series of) patch emails - - use "hg help extensions" for information on enabling extensions - -Broken disabled extension and command: - - $ mkdir hgext - $ echo > hgext/__init__.py - $ cat > hgext/broken.py < "broken extension' - > EOF - $ cat > path.py < import os, sys - > sys.path.insert(0, os.environ['HGEXTPATH']) - > EOF - $ HGEXTPATH=`pwd` - $ export HGEXTPATH - - $ hg --config extensions.path=./path.py help broken - broken extension - (no help text available) - - use "hg help extensions" for information on enabling extensions - - $ hg --config extensions.path=./path.py help foo > /dev/null - hg: unknown command 'foo' - [255] ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-globalopts.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-globalopts.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-globalopts.t.err @@ -1,429 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ "$TESTDIR/hghave" no-outer-repo || exit 80 - - $ hg init a - $ cd a - $ echo a > a - $ hg ci -A -d'1 0' -m a - adding a - - $ cd .. - - $ hg init b - $ cd b - $ echo b > b - $ hg ci -A -d'1 0' -m b - adding b - - $ cd .. - - $ hg clone a c - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd c - $ cat >> .hg/hgrc < [paths] - > relative = ../a - > EOF - $ hg pull -f ../b - pulling from ../b - searching for changes - warning: repository is unrelated - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files (+1 heads) - (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg merge - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - - $ cd .. - -Testing -R/--repository: - - $ hg -R a tip - changeset: 0:8580ff50825a - tag: tip - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: a - - $ hg --repository b tip - changeset: 0:b6c483daf290 - tag: tip - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: b - - --R with a URL: - - $ hg -R file:a identify - 8580ff50825a tip - $ hg -R file://localhost/`pwd`/a/ identify - 8580ff50825a tip - --R with path aliases: - - $ cd c - $ hg -R default identify - 8580ff50825a tip - $ hg -R relative identify - 8580ff50825a tip - $ echo '[paths]' >> $HGRCPATH - $ echo 'relativetohome = a' >> $HGRCPATH - $ HOME=`pwd`/../ hg -R relativetohome identify - 8580ff50825a tip - $ cd .. - -Implicit -R: - - $ hg ann a/a - 0: a - $ hg ann a/a a/a - 0: a - $ hg ann a/a b/b - abort: There is no Mercurial repository here (.hg not found)! - [255] - $ hg -R b ann a/a - abort: a/a not under root - [255] - $ hg log - abort: There is no Mercurial repository here (.hg not found)! - [255] - -Abbreviation of long option: - - $ hg --repo c tip - changeset: 1:b6c483daf290 - tag: tip - parent: -1:000000000000 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: b - - -earlygetopt with duplicate options (36d23de02da1): - - $ hg --cwd a --cwd b --cwd c tip - changeset: 1:b6c483daf290 - tag: tip - parent: -1:000000000000 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: b - - $ hg --repo c --repository b -R a tip - changeset: 0:8580ff50825a - tag: tip - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: a - - -earlygetopt short option without following space: - - $ hg -q -Rb tip - 0:b6c483daf290 - -earlygetopt with illegal abbreviations: - - $ hg --confi "foo.bar=baz" - abort: option --config may not be abbreviated! - [255] - $ hg --cw a tip - abort: option --cwd may not be abbreviated! - [255] - $ hg --rep a tip - abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! - [255] - $ hg --repositor a tip - abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! - [255] - $ hg -qR a tip - abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! - [255] - $ hg -qRa tip - abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! - [255] - -Testing --cwd: - - $ hg --cwd a parents - changeset: 0:8580ff50825a - tag: tip - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - summary: a - - -Testing -y/--noninteractive - just be sure it is parsed: - - $ hg --cwd a tip -q --noninteractive - 0:8580ff50825a - $ hg --cwd a tip -q -y - 0:8580ff50825a - -Testing -q/--quiet: - - $ hg -R a -q tip - 0:8580ff50825a - $ hg -R b -q tip - 0:b6c483daf290 - $ hg -R c --quiet parents - 0:8580ff50825a - 1:b6c483daf290 - -Testing -v/--verbose: - - $ hg --cwd c head -v - changeset: 1:b6c483daf290 - tag: tip - parent: -1:000000000000 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - files: b - description: - b - - - changeset: 0:8580ff50825a - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - files: a - description: - a - - - $ hg --cwd b tip --verbose - changeset: 0:b6c483daf290 - tag: tip - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - files: b - description: - b - - - -Testing --config: - - $ hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo - quuxfoo - $ hg --cwd c --config '' tip -q - abort: malformed --config option: '' (use --config section.name=value) - [255] - $ hg --cwd c --config a.b tip -q - abort: malformed --config option: 'a.b' (use --config section.name=value) - [255] - $ hg --cwd c --config a tip -q - abort: malformed --config option: 'a' (use --config section.name=value) - [255] - $ hg --cwd c --config a.= tip -q - abort: malformed --config option: 'a.=' (use --config section.name=value) - [255] - $ hg --cwd c --config .b= tip -q - abort: malformed --config option: '.b=' (use --config section.name=value) - [255] - -Testing --debug: - - $ hg --cwd c log --debug - changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a - tag: tip - parent: -1:0000000000000000000000000000000000000000 - parent: -1:0000000000000000000000000000000000000000 - manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - files+: b - extra: branch=default - description: - b - - - changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab - parent: -1:0000000000000000000000000000000000000000 - parent: -1:0000000000000000000000000000000000000000 - manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 - user: test - date: Thu Jan 01 00:00:01 1970 +0000 - files+: a - extra: branch=default - description: - a - - - -Testing --traceback: - - $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback' - Traceback (most recent call last): - -Testing --time: - - $ hg --cwd a --time id - 8580ff50825a tip - Time: real * (glob) - -Testing --version: - - $ hg --version -q - Mercurial Distributed SCM * (glob) - -Testing -h/--help: - - $ hg -h - Mercurial Distributed SCM - - list of commands: - - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore individual files or directories to an earlier state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information - - additional help topics: - - config Configuration Files - dates Date Formats - patterns File Name Patterns - environment Environment Variables - revisions Specifying Single Revisions - multirevs Specifying Multiple Revisions - revsets Specifying Revision Sets - diffs Diff Formats - merge-tools Merge Tools - templating Template Usage - urls URL Paths - extensions Using additional features - subrepos Subrepositories - hgweb Configuring hgweb - glossary Glossary - - use "hg -v help" to show aliases and global options - - $ hg --help - Mercurial Distributed SCM - - list of commands: - - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information by line for each file - archive create an unversioned archive of a repository revision - backout reverse effect of earlier changeset - bisect subdivision search of changesets - branch set or show the current branch name - branches list repository named branches - bundle create a changegroup file - cat output the current or given revision of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - grep search for a pattern in specified files and revisions - heads show current repository heads or show branch heads - help show help for a given topic or a help overview - identify identify the working copy or specified revision - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the current or given revision of the project manifest - merge merge working directory with another revision - outgoing show changesets not found in the destination - parents show the parents of the working directory or revision - paths show aliases for remote repositories - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - resolve redo merges or set/view the merge status of files - revert restore individual files or directories to an earlier state - rollback roll back the last transaction (dangerous) - root print the root (top) of the current working directory - serve start stand-alone webserver - showconfig show combined config settings from all hgrc files - status show changed files in the working directory - summary summarize working directory state - tag add one or more tags for the current or given revision - tags list repository tags - tip show the tip revision - unbundle apply one or more changegroup files - update update working directory (or switch revisions) - verify verify the integrity of the repository - version output version and copyright information - - additional help topics: - - config Configuration Files - dates Date Formats - patterns File Name Patterns - environment Environment Variables - revisions Specifying Single Revisions - multirevs Specifying Multiple Revisions - revsets Specifying Revision Sets - diffs Diff Formats - merge-tools Merge Tools - templating Template Usage - urls URL Paths - extensions Using additional features - subrepos Subrepositories - hgweb Configuring hgweb - glossary Glossary - - use "hg -v help" to show aliases and global options - -Not tested: --debugger - !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-glog.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-glog.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-glog.t.err @@ -1,3 +1,5 @@ + + ### Abort: timeout after 180 seconds. @ (34) head | | o (33) head @@ -70,820 +72,3 @@ $ "$TESTDIR/hghave" no-outer-repo || exit 80 - - $ commit() - > { - > rev=$1 - > msg=$2 - > shift 2 - > if [ "$#" -gt 0 ]; then - > hg debugsetparents "$@" - > fi - > echo $rev > a - > hg commit -Aqd "$rev 0" -m "($rev) $msg" - > } - - $ echo "[extensions]" >> $HGRCPATH - $ echo "graphlog=" >> $HGRCPATH - - $ hg init repo - $ cd repo - -Empty repo: - - $ hg glog - - -Building DAG: - - $ commit 0 "root" - $ commit 1 "collapse" 0 - $ commit 2 "collapse" 1 - $ commit 3 "collapse" 2 - $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 - $ commit 5 "expand" 3 4 - $ commit 6 "merge two known; one immediate left, one far left" 2 5 - $ commit 7 "expand" 2 5 - $ commit 8 "merge two known; one immediate left, one far right" 0 7 - $ commit 9 "expand" 7 8 - $ commit 10 "merge two known; one immediate left, one near right" 0 6 - $ commit 11 "expand" 6 10 - $ commit 12 "merge two known; one immediate right, one far left" 1 9 - $ commit 13 "expand" 9 11 - $ commit 14 "merge two known; one immediate right, one far right" 0 12 - $ commit 15 "expand" 13 14 - $ commit 16 "merge two known; one immediate right, one near right" 0 1 - $ commit 17 "expand" 12 16 - $ commit 18 "merge two known; two far left" 1 15 - $ commit 19 "expand" 15 17 - $ commit 20 "merge two known; two far right" 0 18 - $ commit 21 "expand" 19 20 - $ commit 22 "merge two known; one far left, one far right" 18 21 - $ commit 23 "merge one known; immediate left" 1 22 - $ commit 24 "merge one known; immediate right" 0 23 - $ commit 25 "merge one known; far left" 21 24 - $ commit 26 "merge one known; far right" 18 25 - $ commit 27 "collapse" 21 - $ commit 28 "merge zero known" 1 26 - $ commit 29 "regular commit" 0 - $ commit 30 "expand" 28 29 - $ commit 31 "expand" 21 30 - $ commit 32 "expand" 27 31 - $ commit 33 "head" 18 - $ commit 34 "head" 32 - - - $ hg glog -q - @ 34:fea3ac5810e0 - | - | o 33:68608f5145f9 - | | - o | 32:d06dffa21a31 - |\ \ - | o \ 31:621d83e11f67 - | |\ \ - | | o \ 30:6e11cd4b648f - | | |\ \ - | | | o | 29:cd9bb2be7593 - | | | | | - | | o | | 28:44ecd0b9ae99 - | | |\ \ \ - o | | | | | 27:886ed638191b - |/ / / / / - | | o---+ 26:7f25b6c2f0b9 - | | | | | - +---o | | 25:91da8ed57247 - | | | | | - | | o | | 24:a9c19a3d96b7 - | | |\| | - | | o | | 23:a01cddf0766d - | |/| | | - +---o---+ 22:e0d9cccacb5d - | | / / - o | | | 21:d42a756af44d - |\ \ \ \ - | o---+-+ 20:d30ed6450e32 - | / / / - o | | | 19:31ddc2c1573b - |\ \ \ \ - +---+---o 18:1aa84d96232a - | | | | - | o | | 17:44765d7c06e0 - | |\ \ \ - | | o---+ 16:3677d192927d - | | |/ / - o | | | 15:1dda3f72782d - |\ \ \ \ - | o-----+ 14:8eac370358ef - | |/ / / - o | | | 13:22d8966a97e3 - |\ \ \ \ - +---o | | 12:86b91144a6e9 - | | |/ / - | o | | 11:832d76e6bdf2 - | |\ \ \ - | | o---+ 10:74c64d036d72 - | |/ / / - o | | | 9:7010c0af0a35 - |\ \ \ \ - | o-----+ 8:7a0b11f71937 - |/ / / / - o | | | 7:b632bb1b1224 - |\ \ \ \ - +---o | | 6:b105a072e251 - | |/ / / - | o | | 5:4409d547b708 - | |\ \ \ - | | o | | 4:26a8bac39d9f - | |/|/ / - | o / / 3:27eef8ed80b4 - |/ / / - o / / 2:3d9a33b8d1e1 - |/ / - o / 1:6db2ef61d156 - |/ - o 0:e6eb3150255d - - - $ hg glog - @ changeset: 34:fea3ac5810e0 - | tag: tip - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | | parent: 18:1aa84d96232a - | | user: test - | | date: Thu Jan 01 00:00:33 1970 +0000 - | | summary: (33) head - | | - o | changeset: 32:d06dffa21a31 - |\ \ parent: 27:886ed638191b - | | | parent: 31:621d83e11f67 - | | | user: test - | | | date: Thu Jan 01 00:00:32 1970 +0000 - | | | summary: (32) expand - | | | - | o | changeset: 31:621d83e11f67 - | |\ \ parent: 21:d42a756af44d - | | | | parent: 30:6e11cd4b648f - | | | | user: test - | | | | date: Thu Jan 01 00:00:31 1970 +0000 - | | | | summary: (31) expand - | | | | - | | o | changeset: 30:6e11cd4b648f - | | |\ \ parent: 28:44ecd0b9ae99 - | | | | | parent: 29:cd9bb2be7593 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:30 1970 +0000 - | | | | | summary: (30) expand - | | | | | - | | | o | changeset: 29:cd9bb2be7593 - | | | | | parent: 0:e6eb3150255d - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:29 1970 +0000 - | | | | | summary: (29) regular commit - | | | | | - | | o | | changeset: 28:44ecd0b9ae99 - | | |\ \ \ parent: 1:6db2ef61d156 - | | | | | | parent: 26:7f25b6c2f0b9 - | | | | | | user: test - | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 - | | | | | | summary: (28) merge zero known - | | | | | | - o | | | | | changeset: 27:886ed638191b - |/ / / / / parent: 21:d42a756af44d - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:27 1970 +0000 - | | | | | summary: (27) collapse - | | | | | - | | o---+ changeset: 26:7f25b6c2f0b9 - | | | | | parent: 18:1aa84d96232a - | | | | | parent: 25:91da8ed57247 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:26 1970 +0000 - | | | | | summary: (26) merge one known; far right - | | | | | - +---o | | changeset: 25:91da8ed57247 - | | | | | parent: 21:d42a756af44d - | | | | | parent: 24:a9c19a3d96b7 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:25 1970 +0000 - | | | | | summary: (25) merge one known; far left - | | | | | - | | o | | changeset: 24:a9c19a3d96b7 - | | |\| | parent: 0:e6eb3150255d - | | | | | parent: 23:a01cddf0766d - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:24 1970 +0000 - | | | | | summary: (24) merge one known; immediate right - | | | | | - | | o | | changeset: 23:a01cddf0766d - | |/| | | parent: 1:6db2ef61d156 - | | | | | parent: 22:e0d9cccacb5d - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:23 1970 +0000 - | | | | | summary: (23) merge one known; immediate left - | | | | | - +---o---+ changeset: 22:e0d9cccacb5d - | | | | parent: 18:1aa84d96232a - | | / / parent: 21:d42a756af44d - | | | | user: test - | | | | date: Thu Jan 01 00:00:22 1970 +0000 - | | | | summary: (22) merge two known; one far left, one far right - | | | | - o | | | changeset: 21:d42a756af44d - |\ \ \ \ parent: 19:31ddc2c1573b - | | | | | parent: 20:d30ed6450e32 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:21 1970 +0000 - | | | | | summary: (21) expand - | | | | | - | o---+-+ changeset: 20:d30ed6450e32 - | | | | parent: 0:e6eb3150255d - | / / / parent: 18:1aa84d96232a - | | | | user: test - | | | | date: Thu Jan 01 00:00:20 1970 +0000 - | | | | summary: (20) merge two known; two far right - | | | | - o | | | changeset: 19:31ddc2c1573b - |\ \ \ \ parent: 15:1dda3f72782d - | | | | | parent: 17:44765d7c06e0 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:19 1970 +0000 - | | | | | summary: (19) expand - | | | | | - +---+---o changeset: 18:1aa84d96232a - | | | | parent: 1:6db2ef61d156 - | | | | parent: 15:1dda3f72782d - | | | | user: test - | | | | date: Thu Jan 01 00:00:18 1970 +0000 - | | | | summary: (18) merge two known; two far left - | | | | - | o | | changeset: 17:44765d7c06e0 - | |\ \ \ parent: 12:86b91144a6e9 - | | | | | parent: 16:3677d192927d - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:17 1970 +0000 - | | | | | summary: (17) expand - | | | | | - | | o---+ changeset: 16:3677d192927d - | | | | | parent: 0:e6eb3150255d - | | |/ / parent: 1:6db2ef61d156 - | | | | user: test - | | | | date: Thu Jan 01 00:00:16 1970 +0000 - | | | | summary: (16) merge two known; one immediate right, one near right - | | | | - o | | | changeset: 15:1dda3f72782d - |\ \ \ \ parent: 13:22d8966a97e3 - | | | | | parent: 14:8eac370358ef - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:15 1970 +0000 - | | | | | summary: (15) expand - | | | | | - | o-----+ changeset: 14:8eac370358ef - | | | | | parent: 0:e6eb3150255d - | |/ / / parent: 12:86b91144a6e9 - | | | | user: test - | | | | date: Thu Jan 01 00:00:14 1970 +0000 - | | | | summary: (14) merge two known; one immediate right, one far right - | | | | - o | | | changeset: 13:22d8966a97e3 - |\ \ \ \ parent: 9:7010c0af0a35 - | | | | | parent: 11:832d76e6bdf2 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:13 1970 +0000 - | | | | | summary: (13) expand - | | | | | - +---o | | changeset: 12:86b91144a6e9 - | | |/ / parent: 1:6db2ef61d156 - | | | | parent: 9:7010c0af0a35 - | | | | user: test - | | | | date: Thu Jan 01 00:00:12 1970 +0000 - | | | | summary: (12) merge two known; one immediate right, one far left - | | | | - | o | | changeset: 11:832d76e6bdf2 - | |\ \ \ parent: 6:b105a072e251 - | | | | | parent: 10:74c64d036d72 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:11 1970 +0000 - | | | | | summary: (11) expand - | | | | | - | | o---+ changeset: 10:74c64d036d72 - | | | | | parent: 0:e6eb3150255d - | |/ / / parent: 6:b105a072e251 - | | | | user: test - | | | | date: Thu Jan 01 00:00:10 1970 +0000 - | | | | summary: (10) merge two known; one immediate left, one near right - | | | | - o | | | changeset: 9:7010c0af0a35 - |\ \ \ \ parent: 7:b632bb1b1224 - | | | | | parent: 8:7a0b11f71937 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:09 1970 +0000 - | | | | | summary: (9) expand - | | | | | - | o-----+ changeset: 8:7a0b11f71937 - | | | | | parent: 0:e6eb3150255d - |/ / / / parent: 7:b632bb1b1224 - | | | | user: test - | | | | date: Thu Jan 01 00:00:08 1970 +0000 - | | | | summary: (8) merge two known; one immediate left, one far right - | | | | - o | | | changeset: 7:b632bb1b1224 - |\ \ \ \ parent: 2:3d9a33b8d1e1 - | | | | | parent: 5:4409d547b708 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:07 1970 +0000 - | | | | | summary: (7) expand - | | | | | - +---o | | changeset: 6:b105a072e251 - | |/ / / parent: 2:3d9a33b8d1e1 - | | | | parent: 5:4409d547b708 - | | | | user: test - | | | | date: Thu Jan 01 00:00:06 1970 +0000 - | | | | summary: (6) merge two known; one immediate left, one far left - | | | | - | o | | changeset: 5:4409d547b708 - | |\ \ \ parent: 3:27eef8ed80b4 - | | | | | parent: 4:26a8bac39d9f - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:05 1970 +0000 - | | | | | summary: (5) expand - | | | | | - | | o | | changeset: 4:26a8bac39d9f - | |/|/ / parent: 1:6db2ef61d156 - | | | | parent: 3:27eef8ed80b4 - | | | | user: test - | | | | date: Thu Jan 01 00:00:04 1970 +0000 - | | | | summary: (4) merge two known; one immediate left, one immediate right - | | | | - | o | | changeset: 3:27eef8ed80b4 - |/ / / user: test - | | | date: Thu Jan 01 00:00:03 1970 +0000 - | | | summary: (3) collapse - | | | - o | | changeset: 2:3d9a33b8d1e1 - |/ / user: test - | | date: Thu Jan 01 00:00:02 1970 +0000 - | | summary: (2) collapse - | | - o | changeset: 1:6db2ef61d156 - |/ user: test - | date: Thu Jan 01 00:00:01 1970 +0000 - | summary: (1) collapse - | - o changeset: 0:e6eb3150255d - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: (0) root - - -File glog: - $ hg glog a - @ changeset: 34:fea3ac5810e0 - | tag: tip - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | | parent: 18:1aa84d96232a - | | user: test - | | date: Thu Jan 01 00:00:33 1970 +0000 - | | summary: (33) head - | | - o | changeset: 32:d06dffa21a31 - |\ \ parent: 27:886ed638191b - | | | parent: 31:621d83e11f67 - | | | user: test - | | | date: Thu Jan 01 00:00:32 1970 +0000 - | | | summary: (32) expand - | | | - | o | changeset: 31:621d83e11f67 - | | | parent: 21:d42a756af44d - | | | parent: 30:6e11cd4b648f - | | | user: test - | | | date: Thu Jan 01 00:00:31 1970 +0000 - | | | summary: (31) expand - | | | - | o | changeset: 30:6e11cd4b648f - | |\ \ parent: 28:44ecd0b9ae99 - | | | | parent: 29:cd9bb2be7593 - | | | | user: test - | | | | date: Thu Jan 01 00:00:30 1970 +0000 - | | | | summary: (30) expand - | | | | - | | o | changeset: 29:cd9bb2be7593 - | | | | parent: 0:e6eb3150255d - | | | | user: test - | | | | date: Thu Jan 01 00:00:29 1970 +0000 - | | | | summary: (29) regular commit - | | | | - | o | | changeset: 28:44ecd0b9ae99 - | | | | parent: 1:6db2ef61d156 - | | | | parent: 26:7f25b6c2f0b9 - | | | | user: test - | | | | date: Thu Jan 01 00:00:28 1970 +0000 - | | | | summary: (28) merge zero known - | | | | - o | | | changeset: 27:886ed638191b - | | | | parent: 21:d42a756af44d - | | | | user: test - | | | | date: Thu Jan 01 00:00:27 1970 +0000 - | | | | summary: (27) collapse - | | | | - | o | | changeset: 26:7f25b6c2f0b9 - | | | | parent: 18:1aa84d96232a - | | | | parent: 25:91da8ed57247 - | | | | user: test - | | | | date: Thu Jan 01 00:00:26 1970 +0000 - | | | | summary: (26) merge one known; far right - | | | | - | o | | changeset: 25:91da8ed57247 - | | | | parent: 21:d42a756af44d - | | | | parent: 24:a9c19a3d96b7 - | | | | user: test - | | | | date: Thu Jan 01 00:00:25 1970 +0000 - | | | | summary: (25) merge one known; far left - | | | | - | o | | changeset: 24:a9c19a3d96b7 - | | | | parent: 0:e6eb3150255d - | | | | parent: 23:a01cddf0766d - | | | | user: test - | | | | date: Thu Jan 01 00:00:24 1970 +0000 - | | | | summary: (24) merge one known; immediate right - | | | | - | o | | changeset: 23:a01cddf0766d - | | | | parent: 1:6db2ef61d156 - | | | | parent: 22:e0d9cccacb5d - | | | | user: test - | | | | date: Thu Jan 01 00:00:23 1970 +0000 - | | | | summary: (23) merge one known; immediate left - | | | | - | o | | changeset: 22:e0d9cccacb5d - |/ / / parent: 18:1aa84d96232a - | | | parent: 21:d42a756af44d - | | | user: test - | | | date: Thu Jan 01 00:00:22 1970 +0000 - | | | summary: (22) merge two known; one far left, one far right - | | | - o | | changeset: 21:d42a756af44d - |\ \ \ parent: 19:31ddc2c1573b - | | | | parent: 20:d30ed6450e32 - | | | | user: test - | | | | date: Thu Jan 01 00:00:21 1970 +0000 - | | | | summary: (21) expand - | | | | - | o---+ changeset: 20:d30ed6450e32 - | | | parent: 0:e6eb3150255d - | / / parent: 18:1aa84d96232a - | | | user: test - | | | date: Thu Jan 01 00:00:20 1970 +0000 - | | | summary: (20) merge two known; two far right - | | | - o | | changeset: 19:31ddc2c1573b - |\ \ \ parent: 15:1dda3f72782d - | | | | parent: 17:44765d7c06e0 - | | | | user: test - | | | | date: Thu Jan 01 00:00:19 1970 +0000 - | | | | summary: (19) expand - | | | | - +-----o changeset: 18:1aa84d96232a - | | | parent: 1:6db2ef61d156 - | | | parent: 15:1dda3f72782d - | | | user: test - | | | date: Thu Jan 01 00:00:18 1970 +0000 - | | | summary: (18) merge two known; two far left - | | | - | o | changeset: 17:44765d7c06e0 - | |\ \ parent: 12:86b91144a6e9 - | | | | parent: 16:3677d192927d - | | | | user: test - | | | | date: Thu Jan 01 00:00:17 1970 +0000 - | | | | summary: (17) expand - | | | | - | | o | changeset: 16:3677d192927d - | | | | parent: 0:e6eb3150255d - | | | | parent: 1:6db2ef61d156 - | | | | user: test - | | | | date: Thu Jan 01 00:00:16 1970 +0000 - | | | | summary: (16) merge two known; one immediate right, one near right - | | | | - o | | | changeset: 15:1dda3f72782d - |\ \ \ \ parent: 13:22d8966a97e3 - | | | | | parent: 14:8eac370358ef - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:15 1970 +0000 - | | | | | summary: (15) expand - | | | | | - | o | | | changeset: 14:8eac370358ef - | |/ / / parent: 0:e6eb3150255d - | | | | parent: 12:86b91144a6e9 - | | | | user: test - | | | | date: Thu Jan 01 00:00:14 1970 +0000 - | | | | summary: (14) merge two known; one immediate right, one far right - | | | | - o | | | changeset: 13:22d8966a97e3 - |\ \ \ \ parent: 9:7010c0af0a35 - | | | | | parent: 11:832d76e6bdf2 - | | | | | user: test - | | | | | date: Thu Jan 01 00:00:13 1970 +0000 - | | | | | summary: (13) expand - | | | | | - +---o | | changeset: 12:86b91144a6e9 - | | / / parent: 1:6db2ef61d156 - | | | | parent: 9:7010c0af0a35 - | | | | user: test - | | | | date: Thu Jan 01 00:00:12 1970 +0000 - | | | | summary: (12) merge two known; one immediate right, one far left - | | | | - | o | | changeset: 11:832d76e6bdf2 - | | | | parent: 6:b105a072e251 - | | | | parent: 10:74c64d036d72 - | | | | user: test - | | | | date: Thu Jan 01 00:00:11 1970 +0000 - | | | | summary: (11) expand - | | | | - | o | | changeset: 10:74c64d036d72 - | | | | parent: 0:e6eb3150255d - | | | | parent: 6:b105a072e251 - | | | | user: test - | | | | date: Thu Jan 01 00:00:10 1970 +0000 - | | | | summary: (10) merge two known; one immediate left, one near right - | | | | - o | | | changeset: 9:7010c0af0a35 - | | | | parent: 7:b632bb1b1224 - | | | | parent: 8:7a0b11f71937 - | | | | user: test - | | | | date: Thu Jan 01 00:00:09 1970 +0000 - | | | | summary: (9) expand - | | | | - o | | | changeset: 8:7a0b11f71937 - | | | | parent: 0:e6eb3150255d - | | | | parent: 7:b632bb1b1224 - | | | | user: test - | | | | date: Thu Jan 01 00:00:08 1970 +0000 - | | | | summary: (8) merge two known; one immediate left, one far right - | | | | - o | | | changeset: 7:b632bb1b1224 - | | | | parent: 2:3d9a33b8d1e1 - | | | | parent: 5:4409d547b708 - | | | | user: test - | | | | date: Thu Jan 01 00:00:07 1970 +0000 - | | | | summary: (7) expand - | | | | - | o | | changeset: 6:b105a072e251 - |/ / / parent: 2:3d9a33b8d1e1 - | | | parent: 5:4409d547b708 - | | | user: test - | | | date: Thu Jan 01 00:00:06 1970 +0000 - | | | summary: (6) merge two known; one immediate left, one far left - | | | - o | | changeset: 5:4409d547b708 - | | | parent: 3:27eef8ed80b4 - | | | parent: 4:26a8bac39d9f - | | | user: test - | | | date: Thu Jan 01 00:00:05 1970 +0000 - | | | summary: (5) expand - | | | - o | | changeset: 4:26a8bac39d9f - | | | parent: 1:6db2ef61d156 - | | | parent: 3:27eef8ed80b4 - | | | user: test - | | | date: Thu Jan 01 00:00:04 1970 +0000 - | | | summary: (4) merge two known; one immediate left, one immediate right - | | | - o | | changeset: 3:27eef8ed80b4 - | | | user: test - | | | date: Thu Jan 01 00:00:03 1970 +0000 - | | | summary: (3) collapse - | | | - o | | changeset: 2:3d9a33b8d1e1 - |/ / user: test - | | date: Thu Jan 01 00:00:02 1970 +0000 - | | summary: (2) collapse - | | - o | changeset: 1:6db2ef61d156 - |/ user: test - | date: Thu Jan 01 00:00:01 1970 +0000 - | summary: (1) collapse - | - o changeset: 0:e6eb3150255d - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: (0) root - - -Unused arguments: - $ hg glog -q foo bar - hg glog: invalid arguments - hg glog [OPTION]... [FILE] - - show revision history alongside an ASCII revision graph - [255] - -Empty revision range - display nothing: - $ hg glog -r 1..0 - -From outer space: - $ cd .. - $ hg glog -l1 repo - @ changeset: 34:fea3ac5810e0 - | tag: tip - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - $ hg glog -l1 repo/a - @ changeset: 34:fea3ac5810e0 - | tag: tip - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - $ hg glog -l1 repo/missing - -File log with revs != cset revs: - $ hg init flog - $ cd flog - $ echo one >one - $ hg add one - $ hg commit -mone - $ echo two >two - $ hg add two - $ hg commit -mtwo - $ echo more >two - $ hg commit -mmore - $ hg glog two - @ changeset: 2:12c28321755b - | tag: tip - | user: test - | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: more - | - o changeset: 1:5ac72c0599bf - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: two - - -Issue1896: File log with explicit style - $ hg glog --style=default one - o changeset: 0:3d578b4a1f53 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: one - -Issue2395: glog --style header and footer - $ hg glog --style=xml one - - - o - test - 1970-01-01T00:00:00+00:00 - one - - - - $ cd .. - -Incoming and outgoing: - - $ hg clone -U -r31 repo repo2 - adding changesets - adding manifests - adding file changes - added 31 changesets with 31 changes to 1 files - $ cd repo2 - - $ hg incoming --graph ../repo - comparing with ../repo - searching for changes - o changeset: 34:fea3ac5810e0 - | tag: tip - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | parent: 18:1aa84d96232a - | user: test - | date: Thu Jan 01 00:00:33 1970 +0000 - | summary: (33) head - | - o changeset: 32:d06dffa21a31 - | parent: 27:886ed638191b - | parent: 31:621d83e11f67 - | user: test - | date: Thu Jan 01 00:00:32 1970 +0000 - | summary: (32) expand - | - o changeset: 27:886ed638191b - parent: 21:d42a756af44d - user: test - date: Thu Jan 01 00:00:27 1970 +0000 - summary: (27) collapse - - $ cd .. - - $ hg -R repo outgoing --graph repo2 - comparing with repo2 - searching for changes - @ changeset: 34:fea3ac5810e0 - | tag: tip - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | parent: 18:1aa84d96232a - | user: test - | date: Thu Jan 01 00:00:33 1970 +0000 - | summary: (33) head - | - o changeset: 32:d06dffa21a31 - | parent: 27:886ed638191b - | parent: 31:621d83e11f67 - | user: test - | date: Thu Jan 01 00:00:32 1970 +0000 - | summary: (32) expand - | - o changeset: 27:886ed638191b - parent: 21:d42a756af44d - user: test - date: Thu Jan 01 00:00:27 1970 +0000 - summary: (27) collapse - - -File + limit with revs != cset revs: - $ cd repo - $ touch b - $ hg ci -Aqm0 - $ hg glog -l2 a - o changeset: 34:fea3ac5810e0 - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | | parent: 18:1aa84d96232a - | | user: test - | | date: Thu Jan 01 00:00:33 1970 +0000 - | | summary: (33) head - | | - -File + limit + -ra:b, (b - a) < limit: - $ hg glog -l3000 -r32:tip a - o changeset: 34:fea3ac5810e0 - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | | parent: 18:1aa84d96232a - | | user: test - | | date: Thu Jan 01 00:00:33 1970 +0000 - | | summary: (33) head - | | - o | changeset: 32:d06dffa21a31 - |\ \ parent: 27:886ed638191b - | | | parent: 31:621d83e11f67 - | | | user: test - | | | date: Thu Jan 01 00:00:32 1970 +0000 - | | | summary: (32) expand - | | | - -File + limit + -ra:b, b < tip: - $ hg glog -l1 -r32:34 a - o changeset: 34:fea3ac5810e0 - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - -File + limit + -ra:b, b < tip, (b - a) < limit: - $ hg glog -l10 -r33:34 a - o changeset: 34:fea3ac5810e0 - | parent: 32:d06dffa21a31 - | user: test - | date: Thu Jan 01 00:00:34 1970 +0000 - | summary: (34) head - | - | o changeset: 33:68608f5145f9 - | | parent: 18:1aa84d96232a - | | user: test - | | date: Thu Jan 01 00:00:33 1970 +0000 - | | summary: (33) head - | | - ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-grep.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-grep.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-grep.t.err @@ -1,168 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ mkdir t - $ cd t - $ hg init - $ echo import > port - $ hg add port - $ hg commit -m 0 -u spam -d '0 0' - $ echo export >> port - $ hg commit -m 1 -u eggs -d '1 0' - $ echo export > port - $ echo vaportight >> port - $ echo 'import/export' >> port - $ hg commit -m 2 -u spam -d '2 0' - $ echo 'import/export' >> port - $ hg commit -m 3 -u eggs -d '3 0' - $ head -n 3 port > port1 - $ mv port1 port - $ hg commit -m 4 -u spam -d '4 0' - -pattern error - - $ hg grep '**test**' - grep: invalid match pattern: nothing to repeat - [1] - -simple - - $ hg grep port port - port:4:export - port:4:vaportight - port:4:import/export - -simple with color - - $ hg --config extensions.color= grep --config color.mode=ansi \ - > --color=always port port - port:4:export - port:4:vaportight - port:4:import/export - -all - - $ hg grep --traceback --all -nu port port - port:4:4:-:spam:import/export - port:3:4:+:eggs:import/export - port:2:1:-:spam:import - port:2:2:-:spam:export - port:2:1:+:spam:export - port:2:2:+:spam:vaportight - port:2:3:+:spam:import/export - port:1:2:+:eggs:export - port:0:1:+:spam:import - -other - - $ hg grep import port - port:4:import/export - - $ hg cp port port2 - $ hg commit -m 4 -u spam -d '5 0' - -follow - - $ hg grep --traceback -f 'import$' port2 - port:0:import - $ echo deport >> port2 - $ hg commit -m 5 -u eggs -d '6 0' - $ hg grep -f --all -nu port port2 - port2:6:4:+:eggs:deport - port:4:4:-:spam:import/export - port:3:4:+:eggs:import/export - port:2:1:-:spam:import - port:2:2:-:spam:export - port:2:1:+:spam:export - port:2:2:+:spam:vaportight - port:2:3:+:spam:import/export - port:1:2:+:eggs:export - port:0:1:+:spam:import - - $ cd .. - $ hg init t2 - $ cd t2 - $ hg grep foobar foo - [1] - $ hg grep foobar - [1] - $ echo blue >> color - $ echo black >> color - $ hg add color - $ hg ci -m 0 - $ echo orange >> color - $ hg ci -m 1 - $ echo black > color - $ hg ci -m 2 - $ echo orange >> color - $ echo blue >> color - $ hg ci -m 3 - $ hg grep orange - color:3:orange - $ hg grep --all orange - color:3:+:orange - color:2:-:orange - color:1:+:orange - - -match in last "line" without newline - - $ python -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();' - $ hg ci -Amnoeol - adding noeol - -last character omitted in output to avoid infinite loop - - $ hg grep loop - noeol:4:no infinite loo - - - $ cd .. - -Issue685: trackback in grep -r after rename - -Got a traceback when using grep on a single -revision with renamed files. - - $ hg init issue685 - $ cd issue685 - $ echo octarine > color - $ hg ci -Amcolor - adding color - $ hg rename color colour - $ hg ci -Am rename - $ hg grep octarine - colour:1:octarine - color:0:octarine - -Used to crash here - - $ hg grep -r 1 octarine - colour:1:octarine - $ cd .. - - -Issue337: test that grep follows parent-child relationships instead -of just using revision numbers. - - $ hg init issue337 - $ cd issue337 - - $ echo white > color - $ hg commit -A -m "0 white" - adding color - - $ echo red > color - $ hg commit -A -m "1 red" - - $ hg update 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo black > color - $ hg commit -A -m "2 black" - created new head - - $ hg update --clean 1 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo blue > color - $ hg commit -A -m "3 blue" - - $ hg grep --all red - color:3:-:red - color:1:+:red !..... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-empty.t output changed --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-empty.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-empty.t.err @@ -3,7 +3,12 @@ $ hg init test $ cd test $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + abort: cannot start server at ':$HGPORT': Address already in use + abort: child process failed to start + [255] $ cat hg.pid >> $DAEMON_PIDS + cat: hg.pid: No such file or directory + [1] $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/shortlog') 200 Script output follows @@ -14,11 +19,11 @@ - test: log + /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a: log + href="/atom-log" title="Atom feed for /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a" /> + href="/rss-log" title="RSS feed for /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a" /> @@ -30,13 +35,13 @@
    @@ -47,7 +52,7 @@
    -

    test

    +

    /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a

    log

    @@ -58,9 +63,9 @@
    - less - more - | rev -1: (0) tip + less + more + | rev 1: (0) tip
    @@ -69,13 +74,23 @@ + + + + + + + + + +
    author description
    1970-01-01testbdefault tip
    1970-01-01testa
    - less - more - | rev -1: (0) tip + less + more + | rev 1: (0) tip
    @@ -96,11 +111,11 @@ - test: log + /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a: log + href="/atom-log" title="Atom feed for /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a" /> + href="/rss-log" title="RSS feed for /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a" /> @@ -112,13 +127,13 @@
      @@ -129,7 +144,7 @@
      -

      test

      +

      /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a

      log

      @@ -140,9 +155,9 @@
      - less - more - | rev -1: (0) tip + less + more + | rev 1: (0) tip
      @@ -151,13 +166,23 @@ + + + + + + + + + +
      author description
      1970-01-01testbdefault tip
      1970-01-01testa
      - less - more - | rev -1: (0) tip + less + more + | rev 1: (0) tip
      @@ -178,11 +203,11 @@ - test: revision graph + /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a: revision graph + href="/atom-log" title="Atom feed for /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a: log" /> + href="/rss-log" title="RSS feed for /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a: log" /> @@ -194,14 +219,14 @@ mercurial
      • help
        • @@ -209,7 +234,7 @@
        -

        test

        +

        /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a

        graph

        @@ -220,16 +245,16 @@
        - less - more - | rev -1: (0) tip + less + more + | rev 1: (0) -1 tip
          - +
            @@ -237,7 +262,7 @@
            - less - more - | rev -1: (0) tip + less + more + | rev 1: (0) -1 tip
            @@ -326,7 +351,7 @@ - test: 000000000000 / + /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a: 97d72e5f12c7 / @@ -337,13 +362,13 @@ mercurial
              @@ -355,8 +380,8 @@
              -

              test

              -

              directory / @ -1:000000000000 tip

              +

              /var/tmp/portage/dev-vcs/mercurial-1.7/temp/tests-2.6/child2/test-fetch.t/a

              +

              directory / @ 1:97d72e5f12c7 tip

              @@ -372,12 +397,30 @@ permissions - [up] + [up] drwxr-xr-x + + + + file a + + + 2 + -rw-r--r-- + + + + + file b + + + 2 + -rw-r--r-- +
              ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-git-export.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-git-export.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-git-export.t.err @@ -1,349 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ hg init - $ echo start > start - $ hg ci -Amstart - adding start - -New file: - - $ echo new > new - $ hg ci -Amnew - adding new - $ hg diff --git -r 0 - diff --git a/new b/new - new file mode 100644 - --- /dev/null - +++ b/new - @@ -0,0 +1,1 @@ - +new - -Copy: - - $ hg cp new copy - $ hg ci -mcopy - $ hg diff --git -r 1:tip - diff --git a/new b/copy - copy from new - copy to copy - -Rename: - - $ hg mv copy rename - $ hg ci -mrename - $ hg diff --git -r 2:tip - diff --git a/copy b/rename - rename from copy - rename to rename - -Delete: - - $ hg rm rename - $ hg ci -mdelete - $ hg diff --git -r 3:tip - diff --git a/rename b/rename - deleted file mode 100644 - --- a/rename - +++ /dev/null - @@ -1,1 +0,0 @@ - -new - - $ cat > src < 1 - > 2 - > 3 - > 4 - > 5 - > EOF - $ hg ci -Amsrc - adding src - -chmod 644: - - $ chmod +x src - $ hg ci -munexec - $ hg diff --git -r 5:tip - diff --git a/src b/src - old mode 100644 - new mode 100755 - -Rename+mod+chmod: - - $ hg mv src dst - $ chmod -x dst - $ echo a >> dst - $ hg ci -mrenamemod - $ hg diff --git -r 6:tip - diff --git a/src b/dst - old mode 100755 - new mode 100644 - rename from src - rename to dst - --- a/src - +++ b/dst - @@ -3,3 +3,4 @@ - 3 - 4 - 5 - +a - -Nonexistent in tip+chmod: - - $ hg diff --git -r 5:6 - diff --git a/src b/src - old mode 100644 - new mode 100755 - -Binary diff: - - $ cp $TESTDIR/binfile.bin . - $ hg add binfile.bin - $ hg diff --git > b.diff - $ cat b.diff - diff --git a/binfile.bin b/binfile.bin - new file mode 100644 - index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9 - GIT binary patch - literal 593 - zc$@)I0W$NUkd - zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M - z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT - zLdYlXB*ODN003Z&P17_@)3Pi=i0wb04> start - $ hg ci -m 'change start' - - $ hg revert -r -2 start - $ hg mv dst2 dst3 - $ hg ci -m 'mv dst2 dst3; revert start' - - $ hg diff --git -r 9:11 - diff --git a/dst2 b/dst3 - rename from dst2 - rename to dst3 - -Reversed: - - $ hg diff --git -r 11:9 - diff --git a/dst3 b/dst2 - rename from dst3 - rename to dst2 - - - $ echo a >> foo - $ hg add foo - $ hg ci -m 'add foo' - $ echo b >> foo - $ hg ci -m 'change foo' - $ hg mv foo bar - $ hg ci -m 'mv foo bar' - $ echo c >> bar - $ hg ci -m 'change bar' - -File created before r1 and renamed before r2: - - $ hg diff --git -r -3:-1 - diff --git a/foo b/bar - rename from foo - rename to bar - --- a/foo - +++ b/bar - @@ -1,2 +1,3 @@ - a - b - +c - -Reversed: - - $ hg diff --git -r -1:-3 - diff --git a/bar b/foo - rename from bar - rename to foo - --- a/bar - +++ b/foo - @@ -1,3 +1,2 @@ - a - b - -c - -File created in r1 and renamed before r2: - - $ hg diff --git -r -4:-1 - diff --git a/foo b/bar - rename from foo - rename to bar - --- a/foo - +++ b/bar - @@ -1,1 +1,3 @@ - a - +b - +c - -Reversed: - - $ hg diff --git -r -1:-4 - diff --git a/bar b/foo - rename from bar - rename to foo - --- a/bar - +++ b/foo - @@ -1,3 +1,1 @@ - a - -b - -c - -File created after r1 and renamed before r2: - - $ hg diff --git -r -5:-1 - diff --git a/bar b/bar - new file mode 100644 - --- /dev/null - +++ b/bar - @@ -0,0 +1,3 @@ - +a - +b - +c - -Reversed: - - $ hg diff --git -r -1:-5 - diff --git a/bar b/bar - deleted file mode 100644 - --- a/bar - +++ /dev/null - @@ -1,3 +0,0 @@ - -a - -b - -c - - -Comparing with the working dir: - - $ echo >> start - $ hg ci -m 'change start again' - - $ echo > created - $ hg add created - $ hg ci -m 'add created' - - $ hg mv created created2 - $ hg ci -m 'mv created created2' - - $ hg mv created2 created3 - -There's a copy in the working dir: - - $ hg diff --git - diff --git a/created2 b/created3 - rename from created2 - rename to created3 - -There's another copy between the original rev and the wd: - - $ hg diff --git -r -2 - diff --git a/created b/created3 - rename from created - rename to created3 - -The source of the copy was created after the original rev: - - $ hg diff --git -r -3 - diff --git a/created3 b/created3 - new file mode 100644 - --- /dev/null - +++ b/created3 - @@ -0,0 +1,1 @@ - + - $ hg ci -m 'mv created2 created3' - - - $ echo > brand-new - $ hg add brand-new - $ hg ci -m 'add brand-new' - $ hg mv brand-new brand-new2 - -Created in parent of wd; renamed in the wd: - - $ hg diff --git - diff --git a/brand-new b/brand-new2 - rename from brand-new - rename to brand-new2 - -Created between r1 and parent of wd; renamed in the wd: - - $ hg diff --git -r -2 - diff --git a/brand-new2 b/brand-new2 - new file mode 100644 - --- /dev/null - +++ b/brand-new2 - @@ -0,0 +1,1 @@ - + - $ hg ci -m 'mv brand-new brand-new2' - -One file is copied to many destinations and removed: - - $ hg cp brand-new2 brand-new3 - $ hg mv brand-new2 brand-new3-2 - $ hg ci -m 'multiple renames/copies' - $ hg diff --git -r -2 -r -1 - diff --git a/brand-new2 b/brand-new3 - rename from brand-new2 - rename to brand-new3 - diff --git a/brand-new2 b/brand-new3-2 - copy from brand-new2 - copy to brand-new3-2 - -Reversed: - - $ hg diff --git -r -1 -r -2 - diff --git a/brand-new3 b/brand-new2 - rename from brand-new3 - rename to brand-new2 - diff --git a/brand-new3-2 b/brand-new3-2 - deleted file mode 100644 - --- a/brand-new3-2 - +++ /dev/null - @@ -1,1 +0,0 @@ - - - -There should be a trailing TAB if there are spaces in the file name: - - $ echo foo > 'with spaces' - $ hg add 'with spaces' - $ hg diff --git - diff --git a/with spaces b/with spaces - new file mode 100644 - --- /dev/null - +++ b/with spaces - @@ -0,0 +1,1 @@ - +foo - $ hg ci -m 'add filename with spaces' - !...... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-diffs.t output changed --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-diffs.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-diffs.t.err @@ -16,461 +16,52 @@ set up hgweb $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + abort: cannot start server at ':$HGPORT': Address already in use + abort: child process failed to start + [255] $ cat hg.pid >> $DAEMON_PIDS + cat: hg.pid: No such file or directory + [1] revision $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' - 200 Script output follows + 500 Internal Server Error - - - - - - + Internal Server ErrorSALT1293134864.0 120 1 + 500 Internal Server Error - test: 0cd96de13884 - - -
              -
              - - - -
                - -
              - -
              + Internal Server ErrorSALT1293134864.0 145 1 + 500 Internal Server Error -
              - -

              test

              -

              changeset 0:0cd96de13884

              - - - -

              -
              find changesets by author, revision, - files, or words in the commit message
              - - -
              a
              - - - - - - - - - - - - - - - - - - - - - -
              authortest
              dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
              parents
              children 78e4ebad7cdf
              filesa b
              - -
              -
              line diff
              - - 
                   1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-       1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-       1.3 @@ -0,0 +1,1 @@
-       1.4 +a
-  
                   2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-       2.2 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
-       2.3 @@ -0,0 +1,1 @@
-       2.4 +b
-
              -
              - -
              -
              - - - - - + Internal Server ErrorSALT1293134864.0 241 1 raw revision $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' - 200 Script output follows - - - # HG changeset patch - # User test - # Date 0 0 - # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e - - a - - diff -r 000000000000 -r 0cd96de13884 a - --- /dev/null Thu Jan 01 00:00:00 1970 +0000 - +++ b/a Thu Jan 01 00:00:00 1970 +0000 - @@ -0,0 +1,1 @@ - +a - diff -r 000000000000 -r 0cd96de13884 b - --- /dev/null Thu Jan 01 00:00:00 1970 +0000 - +++ b/b Thu Jan 01 00:00:00 1970 +0000 - @@ -0,0 +1,1 @@ - +b - - -diff removed file - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' - 200 Script output follows - - - - - - - - - test: a diff - - - -
              -
              - - - - - -
              - -
              -

              test

              -

              diff a @ 1:78e4ebad7cdf

              - -
              -

              -

              -
              find changesets by author, revision, - files, or words in the commit message
              -
              - -
              b
              - - - - - - - - - - - - - - - - - - - -
              authortest
              dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
              parents
              children
              - -
              -
              line diff
              - - 
                   1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-       1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-       1.3 @@ -0,0 +1,1 @@
-       1.4 +a
-
              -
              -
              -
              - - - - - - - -set up hgweb with git diffs - - $ "$TESTDIR/killdaemons.py" - $ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + abort: cannot start server at ':$HGPORT': Address already in use + abort: child process failed to start + [255] $ cat hg.pid >> $DAEMON_PIDS + cat: hg.pid: No such file or directory + [1] revision $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' - 200 Script output follows + 500 Internal Server Error - - - - - - + Internal Server ErrorSALT1293134864.0 347 1 + 500 Internal Server Error - test: 0cd96de13884 - - -
              -
              - - - -
                - -
              - -
              + Internal Server ErrorSALT1293134864.0 374 1 + 500 Internal Server Error -
              - -

              test

              -

              changeset 0:0cd96de13884

              - -
              - -

              -
              find changesets by author, revision, - files, or words in the commit message
              -
              - -
              a
              - - - - - - - - - - - - - - - - - - - - - -
              authortest
              dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
              parents
              children 78e4ebad7cdf
              filesa b
              - -
              -
              line diff
              - - 
                   1.1 new file mode 100644
-       1.2 --- /dev/null
-       1.3 +++ b/a
-       1.4 @@ -0,0 +1,1 @@
-       1.5 +a
-  
                   2.1 new file mode 100644
-       2.2 --- /dev/null
-       2.3 +++ b/b
-       2.4 @@ -0,0 +1,1 @@
-       2.5 +b
-
              -
              - -
              -
              - - - - - + Internal Server ErrorSALT1293134864.0 468 1 revision $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' - 200 Script output follows - - - # HG changeset patch - # User test - # Date 0 0 - # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e - - a - - diff --git a/a b/a - new file mode 100644 - --- /dev/null - +++ b/a - @@ -0,0 +1,1 @@ - +a - diff --git a/b b/b - new file mode 100644 - --- /dev/null - +++ b/b - @@ -0,0 +1,1 @@ - +b - - -diff removed file - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' - 200 Script output follows - - - - - - - - - test: a diff - - - -
              -
              - - - - - -
              - -
              -

              test

              -

              diff a @ 1:78e4ebad7cdf

              - -
              -

              -

              -
              find changesets by author, revision, - files, or words in the commit message
              -
              - -
              b
              - - - - - - - - - - - - - - - - - - - -
              authortest
              dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
              parents
              children
              - -
              -
              line diff
              - - 
                   1.1 new file mode 100755
-       1.2 --- /dev/null
-       1.3 +++ b/a
-       1.4 @@ -0,0 +1,1 @@
-       1.5 +a
-
              -
              -
              -
              - - - - - - - $ cd .. - -test import rev as raw-rev - - $ hg clone -r0 test test1 adding changesets adding manifests adding file changes @@ -479,7 +70,11 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd test1 $ hg import -q --exact http://localhost:$HGPORT/rev/1 + abort: HTTP Error 500: Internal Server Error + [255] errors $ cat ../test/errors.log + cat: ../test/errors.log: No such file or directory + [1] !.... ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb.t output changed --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb.t.err @@ -9,421 +9,72 @@ adding da/foo adding foo $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + abort: cannot start server at ':$HGPORT': Address already in use + abort: child process failed to start + [255] $ cat hg.pid >> $DAEMON_PIDS + cat: hg.pid: No such file or directory + [1] manifest $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw') - 200 Script output follows + 500 Internal Server Error + Internal Server ErrorSALT1293134995.77 23 1 + 500 Internal Server Error - drwxr-xr-x da - -rw-r--r-- 4 foo + Internal Server ErrorSALT1293134995.77 33 1 + 500 Internal Server Error + Internal Server ErrorSALT1293134995.77 40 1 + 500 Internal Server Error + Internal Server ErrorSALT1293134995.77 101 1 + 500 Internal Server Error + + Internal Server ErrorSALT1293134995.77 110 1 + 500 Internal Server Error + + Internal Server ErrorSALT1293134995.77 119 1 + 500 Internal Server Error + + Internal Server ErrorSALT1293134995.77 125 1 + 500 Internal Server Error + + Internal Server ErrorSALT1293134995.77 183 1 + 500 Internal Server Error + + Internal Server ErrorSALT1293134995.77 192 1 + 500 Internal Server Error + + Internal Server ErrorSALT1293134995.77 286 1 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw') - 200 Script output follows - - - -rw-r--r-- 4 foo - - - -plain file - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?style=raw' - 200 Script output follows - - foo - -should give a 404 - static file that does not exist - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/bogus' - 404 Not Found - - - - - - - - - test: error - - - -
              -
              - - -
              - -
              - -

              test

              -

              error

              - -
              - -

              -
              find changesets by author, revision, - files, or words in the commit message
              -
              - -
              -

              - An error occurred while processing your request: -

              -

              - Not Found -

              -
              -
              -
              - - - - - - + abort: cannot start server at ':$HGPORT': Address already in use + abort: child process failed to start + [255] + $ cat hg.pid >> $DAEMON_PIDS + cat: hg.pid: No such file or directory [1] - -should give a 404 - bad revision - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/spam/foo?style=raw' - 404 Not Found - - - error: revision not found: spam - [1] - -should give a 400 - bad command - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?cmd=spam&style=raw' - 400* (glob) - - - error: no such method: spam - [1] - -should give a 404 - file does not exist - - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork?style=raw' - 404 Not Found - - - error: bork@2ef0ac749a14: not found in manifest - [1] - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork' - 404 Not Found - - - - - - - - - test: error - - - -
              -
              - - -
              - -
              - -

              test

              -

              error

              - -
              - -

              -
              find changesets by author, revision, - files, or words in the commit message
              -
              - -
              -

              - An error occurred while processing your request: -

              -

              - bork@2ef0ac749a14: not found in manifest -

              -
              -
              -
              - - - - - - - [1] - $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/bork?style=raw' - 404 Not Found - - - error: bork@2ef0ac749a14: not found in manifest - [1] - -try bad style - - $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=foobar') - 200 Script output follows - - - - - - - - - test: 2ef0ac749a14 / - - - -
              -
              - - - -
                - -
              - -
              - -
              -

              test

              -

              directory / @ 0:2ef0ac749a14 tip

              - -
              - -

              -
              find changesets by author, revision, - files, or words in the commit message
              -
              - - - - - - - - - - - - - - - - - - - - - - - - -
              namesizepermissions
              [up]drwxr-xr-x
              - - dir. da/ - - - - - drwxr-xr-x
              - - file foo - - 4-rw-r--r--
              -
              -
              - - - - - - -stop and restart - - $ "$TESTDIR/killdaemons.py" - $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log - $ cat hg.pid >> $DAEMON_PIDS Test the access/error files are opened in append mode $ python -c "print len(file('access.log').readlines()), 'log lines written'" - 10 log lines written + Traceback (most recent call last): + File "", line 1, in + IOError: [Errno 2] No such file or directory: 'access.log' + [1] static file $ "$TESTDIR/get-with-headers.py" --twice localhost:$HGPORT '/static/style-gitweb.css' - 200 Script output follows + 500 Internal Server Error - body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; } - a { color:#0000cc; } - a:hover, a:visited, a:active { color:#880000; } - div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; } - div.page_header a:visited { color:#0000cc; } - div.page_header a:hover { color:#880000; } - div.page_nav { padding:8px; } - div.page_nav a:visited { color:#0000cc; } - div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px} - div.page_footer { padding:4px 8px; background-color: #d9d8d1; } - div.page_footer_text { float:left; color:#555555; font-style:italic; } - div.page_body { padding:8px; } - div.title, a.title { - display:block; padding:6px 8px; - font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000; - } - a.title:hover { background-color: #d9d8d1; } - div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; } - div.log_body { padding:8px 8px 8px 150px; } - .age { white-space:nowrap; } - span.age { position:relative; float:left; width:142px; font-style:italic; } - div.log_link { - padding:0px 8px; - font-size:10px; font-family:sans-serif; font-style:normal; - position:relative; float:left; width:136px; - } - div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; } - a.list { text-decoration:none; color:#000000; } - a.list:hover { text-decoration:underline; color:#880000; } - table { padding:8px 4px; } - th { padding:2px 5px; font-size:12px; text-align:left; } - tr.light:hover, .parity0:hover { background-color:#edece6; } - tr.dark, .parity1 { background-color:#f6f6f0; } - tr.dark:hover, .parity1:hover { background-color:#edece6; } - td { padding:2px 5px; font-size:12px; vertical-align:top; } - td.closed { background-color: #99f; } - td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } - td.indexlinks { white-space: nowrap; } - td.indexlinks a { - padding: 2px 5px; line-height: 10px; - border: 1px solid; - color: #ffffff; background-color: #7777bb; - border-color: #aaaadd #333366 #333366 #aaaadd; - font-weight: bold; text-align: center; text-decoration: none; - font-size: 10px; - } - td.indexlinks a:hover { background-color: #6666aa; } - div.pre { font-family:monospace; font-size:12px; white-space:pre; } - div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; } - div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; } - div.search { margin:4px 8px; position:absolute; top:56px; right:12px } - .linenr { color:#999999; text-decoration:none } - div.rss_logo { float: right; white-space: nowrap; } - div.rss_logo a { - padding:3px 6px; line-height:10px; - border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e; - color:#ffffff; background-color:#ff6600; - font-weight:bold; font-family:sans-serif; font-size:10px; - text-align:center; text-decoration:none; - } - div.rss_logo a:hover { background-color:#ee5500; } - pre { margin: 0; } - span.logtags span { - padding: 0px 4px; - font-size: 10px; - font-weight: normal; - border: 1px solid; - background-color: #ffaaff; - border-color: #ffccff #ff00ee #ff00ee #ffccff; - } - span.logtags span.tagtag { - background-color: #ffffaa; - border-color: #ffffcc #ffee00 #ffee00 #ffffcc; - } - span.logtags span.branchtag { - background-color: #aaffaa; - border-color: #ccffcc #00cc33 #00cc33 #ccffcc; - } - span.logtags span.inbranchtag { - background-color: #d5dde6; - border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4; - } + Internal Server Error500 Internal Server Error - /* Graph */ - div#wrapper { - position: relative; - margin: 0; - padding: 0; - margin-top: 3px; - } - - canvas { - position: absolute; - z-index: 5; - top: -0.9em; - margin: 0; - } - - ul#nodebgs { - list-style: none inside none; - padding: 0; - margin: 0; - top: -0.7em; - } - - ul#graphnodes li, ul#nodebgs li { - height: 39px; - } - - ul#graphnodes { - position: absolute; - z-index: 10; - top: -0.8em; - list-style: none inside none; - padding: 0; - } - - ul#graphnodes li .info { - display: block; - font-size: 100%; - position: relative; - top: -3px; - font-style: italic; - } - 304 Not Modified - + Internal Server ErrorSALT1293134995.77 429 1 + cat: errors.log: No such file or directory + [1] errors ! ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hook.t output changed and returned error code -15 --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hook.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hook.t.err @@ -1,483 +1,3 @@ + + ### Abort: timeout after 180 seconds. $ cp "$TESTDIR"/printenv.py . - -commit hooks can see env vars - - $ hg init a - $ cd a - $ echo "[hooks]" > .hg/hgrc - $ echo 'commit = unset HG_LOCAL HG_TAG; python ../printenv.py commit' >> .hg/hgrc - $ echo 'commit.b = unset HG_LOCAL HG_TAG; python ../printenv.py commit.b' >> .hg/hgrc - $ echo 'precommit = unset HG_LOCAL HG_NODE HG_TAG; python ../printenv.py precommit' >> .hg/hgrc - $ echo 'pretxncommit = unset HG_LOCAL HG_TAG; python ../printenv.py pretxncommit' >> .hg/hgrc - $ echo 'pretxncommit.tip = hg -q tip' >> .hg/hgrc - $ echo 'pre-identify = python ../printenv.py pre-identify 1' >> .hg/hgrc - $ echo 'pre-cat = python ../printenv.py pre-cat' >> .hg/hgrc - $ echo 'post-cat = python ../printenv.py post-cat' >> .hg/hgrc - $ echo a > a - $ hg add a - $ hg commit -m a - precommit hook: HG_PARENT1=0000000000000000000000000000000000000000 - pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$TESTTMP/a - 0:cb9a9f314b8b - commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 - commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 - - $ hg clone . ../b - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd ../b - -changegroup hooks can see env vars - - $ echo '[hooks]' > .hg/hgrc - $ echo 'prechangegroup = python ../printenv.py prechangegroup' >> .hg/hgrc - $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc - $ echo 'incoming = python ../printenv.py incoming' >> .hg/hgrc - -pretxncommit and commit hooks can see both parents of merge - - $ cd ../a - $ echo b >> a - $ hg commit -m a1 -d "1 0" - precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b - pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a - 1:ab228980c14d - commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b - commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b - $ hg update -C 0 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ echo b > b - $ hg add b - $ hg commit -m b -d '1 0' - precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b - pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a - 2:ee9deb46ab31 - commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b - commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b - created new head - $ hg merge 1 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg commit -m merge -d '2 0' - precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd - pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$TESTTMP/a - 3:07f3376c1e65 - commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd - commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd - -test generic hooks - - $ hg id - pre-identify hook: HG_ARGS=id HG_OPTS={'tags': None, 'rev': '', 'num': None, 'branch': None, 'id': None} HG_PATS=[] - warning: pre-identify hook exited with status 1 - [1] - $ hg cat b - pre-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b'] - post-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b'] HG_RESULT=0 - b - - $ cd ../b - $ hg pull ../a - prechangegroup hook: HG_SOURCE=pull HG_URL=file: - changegroup hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file: - incoming hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file: - incoming hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_URL=file: - incoming hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_URL=file: - pulling from ../a - searching for changes - adding changesets - adding manifests - adding file changes - added 3 changesets with 2 changes to 2 files - (run 'hg update' to get a working copy) - -tag hooks can see env vars - - $ cd ../a - $ echo 'pretag = python ../printenv.py pretag' >> .hg/hgrc - $ echo 'tag = unset HG_PARENT1 HG_PARENT2; python ../printenv.py tag' >> .hg/hgrc - $ hg tag -d '3 0' a - pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a - precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 - pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$TESTTMP/a - 4:539e4b31b6dc - commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 - commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 - tag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a - $ hg tag -l la - pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la - tag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la - -pretag hook can forbid tagging - - $ echo 'pretag.forbid = python ../printenv.py pretag.forbid 1' >> .hg/hgrc - $ hg tag -d '4 0' fa - pretag hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa - pretag.forbid hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa - abort: pretag.forbid hook exited with status 1 - [255] - $ hg tag -l fla - pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla - pretag.forbid hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla - abort: pretag.forbid hook exited with status 1 - [255] - -pretxncommit hook can see changeset, can roll back txn, changeset no -more there after - - $ echo 'pretxncommit.forbid0 = hg tip -q' >> .hg/hgrc - $ echo 'pretxncommit.forbid1 = python ../printenv.py pretxncommit.forbid 1' >> .hg/hgrc - $ echo z > z - $ hg add z - $ hg -q tip - 4:539e4b31b6dc - $ hg commit -m 'fail' -d '4 0' - precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 - pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a - 5:6f611f8018c1 - 5:6f611f8018c1 - pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a - transaction abort! - rollback completed - abort: pretxncommit.forbid1 hook exited with status 1 - [255] - $ hg -q tip - 4:539e4b31b6dc - -precommit hook can prevent commit - - $ echo 'precommit.forbid = python ../printenv.py precommit.forbid 1' >> .hg/hgrc - $ hg commit -m 'fail' -d '4 0' - precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 - precommit.forbid hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 - abort: precommit.forbid hook exited with status 1 - [255] - $ hg -q tip - 4:539e4b31b6dc - -preupdate hook can prevent update - - $ echo 'preupdate = python ../printenv.py preupdate' >> .hg/hgrc - $ hg update 1 - preupdate hook: HG_PARENT1=ab228980c14d - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - -update hook - - $ echo 'update = python ../printenv.py update' >> .hg/hgrc - $ hg update - preupdate hook: HG_PARENT1=539e4b31b6dc - update hook: HG_ERROR=0 HG_PARENT1=539e4b31b6dc - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - -prechangegroup hook can prevent incoming changes - - $ cd ../b - $ hg -q tip - 3:07f3376c1e65 - $ echo '[hooks]' > .hg/hgrc - $ echo 'prechangegroup.forbid = python ../printenv.py prechangegroup.forbid 1' >> .hg/hgrc - $ hg pull ../a - prechangegroup.forbid hook: HG_SOURCE=pull HG_URL=file: - pulling from ../a - searching for changes - abort: prechangegroup.forbid hook exited with status 1 - [255] - -pretxnchangegroup hook can see incoming changes, can roll back txn, -incoming changes no longer there after - - $ echo '[hooks]' > .hg/hgrc - $ echo 'pretxnchangegroup.forbid0 = hg tip -q' >> .hg/hgrc - $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc - $ hg pull ../a - 4:539e4b31b6dc - pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/b HG_SOURCE=pull HG_URL=file: - pulling from ../a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - transaction abort! - rollback completed - abort: pretxnchangegroup.forbid1 hook exited with status 1 - [255] - $ hg -q tip - 3:07f3376c1e65 - -outgoing hooks can see env vars - - $ rm .hg/hgrc - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing = python ../printenv.py preoutgoing' >> ../a/.hg/hgrc - $ echo 'outgoing = python ../printenv.py outgoing' >> ../a/.hg/hgrc - $ hg pull ../a - preoutgoing hook: HG_SOURCE=pull - outgoing hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_SOURCE=pull - pulling from ../a - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - $ hg rollback - rolling back to revision 3 (undo pull) - -preoutgoing hook can prevent outgoing changes - - $ echo 'preoutgoing.forbid = python ../printenv.py preoutgoing.forbid 1' >> ../a/.hg/hgrc - $ hg pull ../a - preoutgoing hook: HG_SOURCE=pull - preoutgoing.forbid hook: HG_SOURCE=pull - pulling from ../a - searching for changes - abort: preoutgoing.forbid hook exited with status 1 - [255] - -outgoing hooks work for local clones - - $ cd .. - $ echo '[hooks]' > a/.hg/hgrc - $ echo 'preoutgoing = python ../printenv.py preoutgoing' >> a/.hg/hgrc - $ echo 'outgoing = python ../printenv.py outgoing' >> a/.hg/hgrc - $ hg clone a c - preoutgoing hook: HG_SOURCE=clone - outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ rm -rf c - -preoutgoing hook can prevent outgoing changes for local clones - - $ echo 'preoutgoing.forbid = python ../printenv.py preoutgoing.forbid 1' >> a/.hg/hgrc - $ hg clone a zzz - preoutgoing hook: HG_SOURCE=clone - preoutgoing.forbid hook: HG_SOURCE=clone - abort: preoutgoing.forbid hook exited with status 1 - [255] - $ cd b - - $ cat > hooktests.py < from mercurial import util - > - > uncallable = 0 - > - > def printargs(args): - > args.pop('ui', None) - > args.pop('repo', None) - > a = list(args.items()) - > a.sort() - > print 'hook args:' - > for k, v in a: - > print ' ', k, v - > - > def passhook(**args): - > printargs(args) - > - > def failhook(**args): - > printargs(args) - > return True - > - > class LocalException(Exception): - > pass - > - > def raisehook(**args): - > raise LocalException('exception from hook') - > - > def aborthook(**args): - > raise util.Abort('raise abort from hook') - > - > def brokenhook(**args): - > return 1 + {} - > - > class container: - > unreachable = 1 - > EOF - -test python hooks - - $ PYTHONPATH="`pwd`:$PYTHONPATH" - $ export PYTHONPATH - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.broken = python:hooktests.brokenhook' >> ../a/.hg/hgrc - $ hg pull ../a 2>&1 | grep 'raised an exception' - error: preoutgoing.broken hook raised an exception: unsupported operand type(s) for +: 'int' and 'dict' - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.raise = python:hooktests.raisehook' >> ../a/.hg/hgrc - $ hg pull ../a 2>&1 | grep 'raised an exception' - error: preoutgoing.raise hook raised an exception: exception from hook - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.abort = python:hooktests.aborthook' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - error: preoutgoing.abort hook failed: raise abort from hook - abort: raise abort from hook - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.fail = python:hooktests.failhook' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - hook args: - hooktype preoutgoing - source pull - abort: preoutgoing.fail hook failed - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - abort: preoutgoing.uncallable hook is invalid ("hooktests.uncallable" is not callable) - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.nohook = python:hooktests.nohook' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - abort: preoutgoing.nohook hook is invalid ("hooktests.nohook" is not defined) - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.nomodule = python:nomodule' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - abort: preoutgoing.nomodule hook is invalid ("nomodule" not in a module) - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.badmodule = python:nomodule.nowhere' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - abort: preoutgoing.badmodule hook is invalid (import of "nomodule" failed) - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.unreachable = python:hooktests.container.unreachable' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - abort: preoutgoing.unreachable hook is invalid (import of "hooktests.container" failed) - [255] - - $ echo '[hooks]' > ../a/.hg/hgrc - $ echo 'preoutgoing.pass = python:hooktests.passhook' >> ../a/.hg/hgrc - $ hg pull ../a - pulling from ../a - searching for changes - hook args: - hooktype preoutgoing - source pull - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - -make sure --traceback works - - $ echo '[hooks]' > .hg/hgrc - $ echo 'commit.abort = python:hooktests.aborthook' >> .hg/hgrc - - $ echo aa > a - $ hg --traceback commit -d '0 0' -ma 2>&1 | grep '^Traceback' - Traceback (most recent call last): - - $ cd .. - $ hg init c - $ cd c - - $ cat > hookext.py < def autohook(**args): - > print "Automatically installed hook" - > - > def reposetup(ui, repo): - > repo.ui.setconfig("hooks", "commit.auto", autohook) - > EOF - $ echo '[extensions]' >> .hg/hgrc - $ echo 'hookext = hookext.py' >> .hg/hgrc - - $ touch foo - $ hg add foo - $ hg ci -d '0 0' -m 'add foo' - Automatically installed hook - $ echo >> foo - $ hg ci --debug -d '0 0' -m 'change foo' - foo - calling hook commit.auto: (glob) - Automatically installed hook - committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 - - $ hg showconfig hooks - hooks.commit.auto= (glob) - -test python hook configured with python:[file]:[hook] syntax - - $ cd .. - $ mkdir d - $ cd d - $ hg init repo - $ mkdir hooks - - $ cd hooks - $ cat > testhooks.py < def testhook(**args): - > print 'hook works' - > EOF - $ echo '[hooks]' > ../repo/.hg/hgrc - $ echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc - - $ cd ../repo - $ hg commit -d '0 0' - hook works - nothing changed - [1] - - $ cd ../../b - -make sure --traceback works on hook import failure - - $ cat > importfail.py < import somebogusmodule - > # dereference something in the module to force demandimport to load it - > somebogusmodule.whatever - > EOF - - $ echo '[hooks]' > .hg/hgrc - $ echo 'precommit.importfail = python:importfail.whatever' >> .hg/hgrc - - $ echo a >> a - $ hg --traceback commit -ma 2>&1 | egrep '^(exception|Traceback|ImportError)' - exception from first failed import attempt: - Traceback (most recent call last): - ImportError: No module named somebogusmodule - exception from second failed import attempt: - Traceback (most recent call last): - ImportError: No module named hgext_importfail - Traceback (most recent call last): - -Issue1827: Hooks Update & Commit not completely post operation - -commit and update hooks should run after command completion - - $ echo '[hooks]' > .hg/hgrc - $ echo 'commit = hg id' >> .hg/hgrc - $ echo 'update = hg id' >> .hg/hgrc - $ echo bb > a - $ hg ci -ma - 223eafe2750c tip - $ hg up 0 - cb9a9f314b8b - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - !. ERROR: /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-commands.t output changed --- /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-commands.t +++ /var/tmp/portage/dev-vcs/mercurial-1.7/work/mercurial-1.7/tests/test-hgweb-commands.t.err @@ -20,7 +20,12 @@ marked working directory as branch stable $ hg ci -Ambranch $ hg serve --config server.uncompressed=False -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log + abort: cannot start server at ':$HGPORT': Address already in use + abort: child process failed to start + [255] $ cat hg.pid >> $DAEMON_PIDS + cat: hg.pid: No such file or directory + [1] Logs and changes @@ -33,54 +38,54 @@ http://*:$HGPORT/ (glob) (glob) (glob) - test Changelog - 1970-01-01T00:00:00+00:00 + test-archive Changelog + 2001-09-09T01:46:40+00:00 - branch - http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe (glob) - (glob) + 3 + http://localhost:$HGPORT/#changeset-2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 2001-09-09T01:46:40+00:00 + 2001-09-09T01:46:40+00:00
              - 
              branch
              + 
              3
                             - Added tag 1.0 for changeset 2ef0ac749a14 - http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de (glob) - (glob) + 2 + http://localhost:$HGPORT/#changeset-0e6a6674cbcc3d7ad053aec20062bb2a298d24c2 + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 1970-01-01T00:00:02+00:00 + 1970-01-01T00:00:02+00:00
              - 
              Added tag 1.0 for changeset 2ef0ac749a14
              + 
              2
                             - base - http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f (glob) - (glob) + 1 + http://localhost:$HGPORT/#changeset-daa7f7c60e0a224faa4ff77ca41b2760562af264 + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 1970-01-01T00:00:01+00:00 + 1970-01-01T00:00:01+00:00
              - 
              base
              + 
              1
                             @@ -95,54 +100,54 @@ http://*:$HGPORT/ (glob) (glob) (glob) - test Changelog - 1970-01-01T00:00:00+00:00 + test-archive Changelog + 2001-09-09T01:46:40+00:00 - branch - http://*:$HGPORT/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe (glob) - (glob) + 3 + http://localhost:$HGPORT/#changeset-2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 2001-09-09T01:46:40+00:00 + 2001-09-09T01:46:40+00:00
              - 
              branch
              + 
              3
                             - Added tag 1.0 for changeset 2ef0ac749a14 - http://*:$HGPORT/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de (glob) - (glob) + 2 + http://localhost:$HGPORT/#changeset-0e6a6674cbcc3d7ad053aec20062bb2a298d24c2 + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 1970-01-01T00:00:02+00:00 + 1970-01-01T00:00:02+00:00
              - 
              Added tag 1.0 for changeset 2ef0ac749a14
              + 
              2
                             - base - http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f (glob) - (glob) + 1 + http://localhost:$HGPORT/#changeset-daa7f7c60e0a224faa4ff77ca41b2760562af264 + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 1970-01-01T00:00:01+00:00 + 1970-01-01T00:00:01+00:00
              - 
              base
              + 
              1
                             @@ -155,22 +160,22 @@ http://*:$HGPORT/atom-log/tip/foo (glob) (glob) - test: foo history - 1970-01-01T00:00:00+00:00 + test-archive: foo history + 1970-01-01T00:00:01+00:00 - base - http://*:$HGPORT/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f (glob) - (glob) + 1 + http://localhost:$HGPORT/#changeset-daa7f7c60e0a224faa4ff77ca41b2760562af264 + test test - 1970-01-01T00:00:00+00:00 - 1970-01-01T00:00:00+00:00 + 1970-01-01T00:00:01+00:00 + 1970-01-01T00:00:01+00:00
              - 
              base
              + 
              1
                             @@ -186,11 +191,11 @@ - test: log + test-archive: log + href="/atom-log" title="Atom feed for test-archive" /> + href="/rss-log" title="RSS feed for test-archive" /> @@ -202,16 +207,25 @@
              • help
                • @@ -219,7 +233,7 @@
                -

                test

                +

                test-archive

                log

                @@ -232,7 +246,7 @@
                less more - | rev 2: (0) tip + | rev 2: (0) tip
                @@ -242,19 +256,19 @@ - + - + - + - +
                description
                1970-01-012001-09-09 testbranchstable tip 3default tip
                1970-01-01 testAdded tag 1.0 for changeset 2ef0ac749a14default 2
                1970-01-01 testbase1.0 1
                @@ -262,7 +276,7 @@
                less more - | rev 2: (0) tip + | rev 2: (0) tip
                @@ -283,7 +297,7 @@ - test: 2ef0ac749a14 + test-archive: daa7f7c60e0a
                @@ -293,28 +307,160 @@ mercurial
                  +
                • + bz2 +
                  • +
                • + zip +
                  • Internal Server ErrorSALT1293134972.73 370 0 + 500 Internal Server Error + + Internal Server ErrorSALT1293134972.73 387 1 + 200 Script output follows + + + + + + + + + test-archive: searching for base + + + +
                  +
                  + + -
                  + +
                  +

                  test-archive

                  +

                  searching for 'base'

                  + + + +

                  +
                  find changesets by author, revision, + files, or words in the commit message
                  + + +
                  + less + more +
                  + + + + + + + + +
                  ageauthordescription
                  + +
                  + less + more +
                  + +
                  +
                  + + + + + + + $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/1/?style=raw' + 200 Script output follows + + foo + $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/annotate/1/foo/?style=raw' + 200 Script output follows + + + test@0: foo + + + + + $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/?style=raw' + 200 Script output follows + + + -rw-r--r-- 4 bar + -rw-r--r-- 4 foo + + + $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo' + 200 Script output follows + + + + + + + + + test-archive: 0e6a6674cbcc foo + + + +
                  +
                  + + + + +
                  - -

                  test

                  -

                  changeset 0:2ef0ac749a14 1.0

                  +

                  test-archive

                  +

                  view foo @ 1:0e6a6674cbcc

                  @@ -323,7 +469,7 @@ files, or words in the commit message
                  -
                  base
                  +
                  2
                  @@ -332,220 +478,7 @@ - - - - - - - - - - - - - -
                  dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
                  parents
                  children a4f92ed23982
                  filesda/foo foo
                  - -
                  -
                  line diff
                  - - 
                       1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-       1.2 +++ b/da/foo	Thu Jan 01 00:00:00 1970 +0000
-       1.3 @@ -0,0 +1,1 @@
-       1.4 +foo
-  
                       2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-       2.2 +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-       2.3 @@ -0,0 +1,1 @@
-       2.4 +foo
-
                  -
                  - -
                  - - - - - - - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/1/?style=raw' - 200 Script output follows - - - # HG changeset patch - # User test - # Date 0 0 - # Node ID a4f92ed23982be056b9852de5dfe873eaac7f0de - # Parent 2ef0ac749a14e4f57a5a822464a0902c6f7f448f - Added tag 1.0 for changeset 2ef0ac749a14 - - diff -r 2ef0ac749a14 -r a4f92ed23982 .hgtags - --- /dev/null Thu Jan 01 00:00:00 1970 +0000 - +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 - @@ -0,0 +1,1 @@ - +2ef0ac749a14e4f57a5a822464a0902c6f7f448f 1.0 - - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log?rev=base' - 200 Script output follows - - - - - - - - - test: searching for base - - - -
                  -
                  - - -
                  - -
                  -

                  test

                  -

                  searching for 'base'

                  - -
                  - -

                  -
                  find changesets by author, revision, - files, or words in the commit message
                  -
                  - -
                  - less - more -
                  - - - - - - - - - - - - - -
                  ageauthordescription
                  1970-01-01testbase1.0
                  - -
                  - less - more -
                  - -
                  -
                  - - - - - - - -File-related - - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo/?style=raw' - 200 Script output follows - - foo - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/annotate/1/foo/?style=raw' - 200 Script output follows - - - test@0: foo - - - - - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/?style=raw' - 200 Script output follows - - - drwxr-xr-x da - -rw-r--r-- 45 .hgtags - -rw-r--r-- 4 foo - - - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo' - 200 Script output follows - - - - - - - - - test: a4f92ed23982 foo - - - -
                  -
                  - - - - - -
                  - -
                  -

                  test

                  -

                  view foo @ 1:a4f92ed23982

                  - -
                  - -

                  -
                  find changesets by author, revision, - files, or words in the commit message
                  -
                  - -
                  Added tag 1.0 for changeset 2ef0ac749a14
                  - - - - - - - - - + @@ -553,7 +486,7 @@ - +
                  authortest
                  dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)Thu Jan 01 00:00:02 1970 +0000 (1970-01-01)
                  parents
                  children1d22e65f027e
                  @@ -574,31 +507,19 @@ $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/filediff/1/foo/?style=raw' - 200 Script output follows - - - diff -r 000000000000 -r a4f92ed23982 foo - --- /dev/null Thu Jan 01 00:00:00 1970 +0000 - +++ b/foo Thu Jan 01 00:00:00 1970 +0000 - @@ -0,0 +1,1 @@ - +foo - - - - + 500 Internal Server Error + + Internal Server ErrorSALT1293134972.73 591 1 + 200 Script output follows + + tip 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e Overviews $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/raw-tags' 200 Script output follows - tip 1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe - 1.0 2ef0ac749a14e4f57a5a822464a0902c6f7f448f - $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/raw-branches' - 200 Script output follows - - stable 1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe open - default a4f92ed23982be056b9852de5dfe873eaac7f0de inactive + default 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e open $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb' 200 Script output follows @@ -611,16 +532,16 @@ - test: Summary + test-archive: Summary + href="/atom-log" title="Atom feed for test-archive"/> + href="/rss-log" title="RSS feed for test-archive"/>
                  - Mercurialtest / summary + Mercurialtest-archive / summary
                  @@ -637,7 +558,7 @@ graph | tags | branches | - files | + files | bz2 | zip | gz | help
                  @@ -646,52 +567,52 @@ - +
                  descriptionunknown
                  ownerFoo Bar <foo.bar@example.com>
                  last changeThu, 01 Jan 1970 00:00:00 +0000
                  last changeSun, 09 Sep 2001 01:46:40 +0000
                  - + @@ -700,15 +621,6 @@
                  1970-01-012001-09-09 test - - branch - stable tip + + 3 + default tip - changeset | - files + changeset | + files
                  1970-01-01 test - - Added tag 1.0 for changeset 2ef0ac749a14 - default + + 2 + - changeset | - files + changeset | + files
                  1970-01-01 test - - base - 1.0 + + 1 + - changeset | - files + changeset | + files
                  ...
                  - - - - -
                  1970-01-011.0 - changeset | - changelog | - files -
                  ...
                  @@ -716,23 +628,13 @@ - - - - - - - - + + @@ -740,7 +642,7 @@
                  1970-01-011d22e65f027estable - changeset | - changelog | - files -
                  1970-01-01a4f92ed239822001-09-092c0277f05ed4 default - changeset | - changelog | - files + changeset | + changelog | + files
                  -
                  test
                  +
                  test-archive
                   
                  @@ -811,7 +713,7 @@