debian/0000775000000000000000000000000012266004050007163 5ustar debian/mercurial-common.bash-completion0000664000000000000000000000004212216001775015444 0ustar contrib/bash_completion mercurial debian/patches/0000775000000000000000000000000012261312155010615 5ustar debian/patches/deb_specific__optional-dependencies0000664000000000000000000001575412261301466017646 0ustar Suggest Debian packages for some optional dependencies. --- a/hgext/bugzilla.py +++ b/hgext/bugzilla.py @@ -354,7 +354,8 @@ class bzmysql(bzaccess): import MySQLdb as mysql bzmysql._MySQLdb = mysql except ImportError, err: - raise util.Abort(_('python mysql support not available: %s') % err) + raise util.Abort(_('python mysql support not available: %s') % err + + _(' (try installing the %s package)') % 'python-mysqldb') bzaccess.__init__(self, ui) --- a/hgext/convert/bzr.py +++ b/hgext/convert/bzr.py @@ -44,7 +44,8 @@ class bzr_source(converter_source): # access bzrlib stuff bzrdir except NameError: - raise NoRepo(_('Bazaar modules could not be loaded')) + raise NoRepo(_('Bazaar modules could not be loaded') + + _(' (try installing the %s package)') % 'bzr') path = os.path.abspath(path) self._checkrepotype(path) --- a/hgext/convert/common.py +++ b/hgext/convert/common.py @@ -28,11 +28,12 @@ def decodeargs(s): class MissingTool(Exception): pass -def checktool(exe, name=None, abort=True): +def checktool(exe, name=None, abort=True, debname=None): name = name or exe if not util.findexe(exe): exc = abort and util.Abort or MissingTool - raise exc(_('cannot find required "%s" tool') % name) + raise exc(_('cannot find required "%s" tool') % name + + (debname and _(' (try installing the %s package)') % debname or '')) class NoRepo(Exception): pass --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -22,7 +22,7 @@ class convert_cvs(converter_source): if not os.path.exists(cvs): raise NoRepo(_("%s does not look like a CVS checkout") % path) - checktool('cvs') + checktool('cvs', debname='cvs') self.changeset = None self.files = {} --- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -36,14 +36,15 @@ class darcs_source(converter_source, com if not os.path.exists(os.path.join(path, '_darcs')): raise NoRepo(_("%s does not look like a darcs repository") % path) - checktool('darcs') + checktool('darcs', debname='darcs') version = self.run0('--version').splitlines()[0].strip() if version < '2.1': raise util.Abort(_('darcs version 2.1 or newer needed (found %r)') % version) if "ElementTree" not in globals(): - raise util.Abort(_("Python ElementTree module is not available")) + raise util.Abort(_("Python ElementTree module is not available") + + _(" (try installing the %s package)") % 'python-celementtree') self.path = os.path.realpath(path) --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -79,7 +79,7 @@ class convert_git(converter_source): if not os.path.exists(path + "/objects"): raise NoRepo(_("%s does not look like a Git repository") % path) - checktool('git', 'git') + checktool('git', 'git', debname='git-core') self.path = path self.submodules = [] --- a/hgext/convert/gnuarch.py +++ b/hgext/convert/gnuarch.py @@ -42,7 +42,8 @@ class gnuarch_source(converter_source, c if util.findexe('tla'): self.execmd = 'tla' else: - raise util.Abort(_('cannot find a GNU Arch tool')) + raise util.Abort(_('cannot find a GNU Arch tool') + + _(' (try installing the %s package)') % 'tla') commandline.__init__(self, ui, self.execmd) --- a/hgext/convert/monotone.py +++ b/hgext/convert/monotone.py @@ -66,7 +66,7 @@ class monotone_source(converter_source, self.files = None self.dirs = None - checktool('mtn', abort=False) + checktool('mtn', abort=False, debname='monotone') def mtnrun(self, *args, **kwargs): if self.automatestdio: --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -20,6 +20,7 @@ from cStringIO import StringIO from common import NoRepo, MissingTool, commit, encodeargs, decodeargs from common import commandline, converter_source, converter_sink, mapfile from common import makedatetimestamp +from common import checktool try: from svn.core import SubversionException, Pool @@ -237,16 +238,19 @@ class svn_source(converter_source): raise NoRepo(_("%s does not look like a Subversion repository") % url) if svn is None: - raise MissingTool(_('could not load Subversion python bindings')) + raise MissingTool(_('could not load Subversion python bindings') + + _(' (try installing the %s package)') % 'python-subversion') try: version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR if version < (1, 4): raise MissingTool(_('Subversion python bindings %d.%d found, ' - '1.4 or later required') % version) + '1.4 or later required') % version + + _(' (try upgrading the %s package)') % 'python-subversion') except AttributeError: raise MissingTool(_('Subversion python bindings are too old, 1.4 ' - 'or later required')) + 'or later required') + + _(' (try upgrading the %s package)') % 'python-subversion') self.lastrevs = {} @@ -1025,6 +1029,8 @@ class svn_sink(converter_sink, commandli return self.join('hg-authormap') def __init__(self, ui, path): + checktool('svn', debname='subversion') + checktool('svnadmin', debname='subversion') converter_sink.__init__(self, ui, path) commandline.__init__(self, ui, 'svn') --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -207,7 +207,8 @@ class _httprequesthandleropenssl(_httpre import OpenSSL OpenSSL.SSL.Context except ImportError: - raise util.Abort(_("SSL support is unavailable")) + raise util.Abort(_("SSL support is unavailable") + + _(" (try installing the %s package)") % 'python-openssl') ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) ctx.use_privatekey_file(ssl_cert) ctx.use_certificate_file(ssl_cert) @@ -248,7 +249,8 @@ class _httprequesthandlerssl(_httpreques import ssl ssl.wrap_socket except ImportError: - raise util.Abort(_("SSL support is unavailable")) + raise util.Abort(_("SSL support is unavailable") + + _(" (try installing the %s package)") % 'python-openssl') httpserver.socket = ssl.wrap_socket(httpserver.socket, server_side=True, certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv23) debian/patches/deb_specific__fix_hg-ssh_interpreter.patch0000664000000000000000000000110712230221467021136 0ustar Author: Javi Merino Description: Fix python interpreter for hg-ssh hg-ssh is installed by dh_install instead of setup.py, so it's interpreter is not fixed automatically for us. System-wide commands should use /usr/bin/python as the Debian Python Policy recommends. Bug-Debian: http://bugs.debian.org/654925 Bug-Ubuntu: https://bugs.launchpad.net/bugs/912625 Forwarded: not-needed --- a/contrib/hg-ssh +++ b/contrib/hg-ssh @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # # Copyright 2005-2007 by Intevation GmbH # debian/patches/series0000664000000000000000000000071612261301466012041 0ustar deb_specific__support_templates_in_fsh.patch deb_specific__support_help_in_fhs.patch deb_specific__use_sensible-editor.patch deb_specific__hgk.py.patch deb_specific__optional-dependencies proposed_upstream__correct-zeroconf-doc deb_specific__support_mo_in_fhs.patch deb_specific__disable_libdir_replacement.patch deb_specific__fix_hg-ssh_interpreter.patch for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch for_upstream__lenient_test-shelve.patch debian/patches/proposed_upstream__correct-zeroconf-doc0000664000000000000000000000121612230221473020557 0ustar Correct the documentation for the zeroconf extension. --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -7,9 +7,9 @@ '''discover and advertise repositories on the local network -Zeroconf-enabled repositories will be announced in a network without -the need to configure a server or a service. They can be discovered -without knowing their actual IP address. +The zeroconf extension will advertise :hg:`serve` instances over +DNS-SD so that they can be discovered using the :hg:`paths` command +without knowing the server's address. To allow other people to discover your repository using run :hg:`serve` in your repository:: debian/patches/for_upstream__lenient_test-shelve.patch0000664000000000000000000000215012261277251020551 0ustar Author: Tristan Seligmann Description: Make test-shelve.t more lenient When running on a slower system (eg. MIPS buildd), the age of the shelf can be 10 seconds or more, resulting in the output alignment changing and thus a test failure. This patch makes the spacing be matched more leniently. Bug: http://bz.selenic.com/show_bug.cgi?id=4124 Index: mercurial-2.8.1/tests/test-shelve.t =================================================================== --- mercurial-2.8.1.orig/tests/test-shelve.t 2013-12-02 04:51:10.000000000 +0200 +++ mercurial-2.8.1/tests/test-shelve.t 2013-12-08 01:28:17.505760594 +0200 @@ -80,12 +80,12 @@ ensure that our shelved changes exist - $ hg shelve -l - default-01 (*) [mq]: second.patch (glob) - default (*) [mq]: second.patch (glob) + $ sleep 10 && hg shelve -l + default-01 (*)* [mq]: second.patch (glob) + default (*)* [mq]: second.patch (glob) $ hg shelve -l -p default - default (*) [mq]: second.patch (glob) + default (*)* [mq]: second.patch (glob) diff --git a/a/a b/a/a --- a/a/a debian/patches/deb_specific__hgk.py.patch0000664000000000000000000000101012230221467015645 0ustar Set default hgk path for hgk outside bin. --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -313,7 +313,7 @@ def view(ui, repo, *etc, **opts): "start interactive history viewer" os.chdir(repo.root) optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v]) - cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc)) + cmd = ui.config("hgk", "path", "/usr/share/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc)) ui.debug("running %s\n" % cmd) util.system(cmd) debian/patches/deb_specific__support_help_in_fhs.patch0000664000000000000000000000123112231045361020522 0ustar Author: Vernon Tang Description: Support installation of help topics in FHS. Forwarded: not-needed --- a/mercurial/help.py +++ b/mercurial/help.py @@ -131,9 +131,11 @@ def loaddoc(topic): module = __file__ base = os.path.dirname(module) + docdir = '/usr/share/mercurial/help' for dir in ('.', '..'): - docdir = os.path.join(base, dir, 'help') - if os.path.isdir(docdir): + tmpdocdir = os.path.join(base, dir, 'help') + if os.path.isdir(tmpdocdir): + docdir = tmpdocdir break path = os.path.join(docdir, topic + ".txt") debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch0000664000000000000000000000152312231311676026246 0ustar Author: Javi Merino Description: Don't rm /usr/bin/python when running the testsuite mercurial tries to delete /usr/bin/python when running the testsuite with "make tests TESTFLAGS=--with-hg=/usr/bin/hg". If you're doing it as a user, the testsuite fails because it can't remove it. . This fixes it at least in Debian. I'm unsure about other systems. Bug: http://bz.selenic.com/show_bug.cgi?id=4045 --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -430,7 +430,7 @@ def usecorrectpython(): sys.executable) mypython = os.path.join(BINDIR, pyexename) try: - if os.readlink(mypython) == sys.executable: + if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable): return os.unlink(mypython) except OSError, err: debian/patches/deb_specific__disable_libdir_replacement.patch0000664000000000000000000000151112230221466021761 0ustar Description: Disabled hginstallscripts @LIBDIR@ replacement in setup.py. setup.py replaces @LIBDIR@ in the hg script, with a path that differs between Python verisons. libdir in hg doesn't need to be set if mercurial is available in the public namespace, as it is in Debian. hg doesn't alter sys.paths if this replacement hasn't happened. Author: Stefano Rivera Bug-Debian: http://bugs.debian.org/620087 Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250 Forwarded: not-needed Last-Update: 2011-03-30 --- a/setup.py +++ b/setup.py @@ -413,7 +413,6 @@ cmdclass = {'build': hgbuild, 'build_ext': hgbuildext, 'build_py': hgbuildpy, 'build_hgextindex': buildhgextindex, - 'install_scripts': hginstallscripts, 'build_hgexe': buildhgexe, } debian/patches/deb_specific__support_mo_in_fhs.patch0000664000000000000000000000066012231045361020212 0ustar Author: Vincent Danjean Description: Look for *.mo files in /usr/share/locale (FHS compliant) Forwarded: not-needed --- a/mercurial/i18n.py +++ b/mercurial/i18n.py @@ -15,7 +15,7 @@ else: module = __file__ base = os.path.dirname(module) -for dir in ('.', '..'): +for dir in ('.', '..', '/usr/share'): localedir = os.path.join(base, dir, 'locale') if os.path.isdir(localedir): break debian/patches/deb_specific__use_sensible-editor.patch0000664000000000000000000004102412261301466020424 0ustar Use sensible-editor as default instead of vi. --- a/hgeditor +++ b/hgeditor @@ -7,7 +7,7 @@ # only for Mercurial, modify this: case "${EDITOR}" in "") - EDITOR="vi" + EDITOR="sensible-editor" ;; emacs) EDITOR="$EDITOR -nw" --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2095,8 +2095,8 @@ def debuginstall(ui): editor = ui.geteditor() cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) if not cmdpath: - if editor == 'vi': - ui.write(_(" No commit editor set and can't find vi in PATH\n")) + if editor == 'sensible-editor': + ui.write(_(" No commit editor set and can't find sensible-editor in PATH\n")) ui.write(_(" (specify a commit editor in your configuration" " file)\n")) else: --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -755,7 +755,7 @@ class ui(object): # avoid confusion. editor = 'E' else: - editor = 'vi' + editor = 'sensible-editor' return (os.environ.get("HGEDITOR") or self.config("ui", "editor") or os.environ.get("VISUAL") or --- a/i18n/da.po +++ b/i18n/da.po @@ -8752,7 +8752,7 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "" -msgid " No commit editor set and can't find vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" msgstr "" msgid " (specify a commit editor in your configuration file)\n" @@ -13521,7 +13521,8 @@ msgstr "" msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" msgid "" @@ -14194,7 +14195,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" --- a/i18n/de.po +++ b/i18n/de.po @@ -13738,8 +13738,8 @@ msgid "checking commit editor...\n" msgstr "Prüfe Editor für Versionsmeldungen...\n" #: mercurial/commands.py:2093 -msgid " No commit editor set and can't find vi in PATH\n" -msgstr " Kein Editor für Versionsmeldungen angegeben und vi nicht im PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n" #: mercurial/commands.py:2094 mercurial/commands.py:2098 msgid " (specify a commit editor in your configuration file)\n" @@ -20474,7 +20474,8 @@ msgstr "" #: mercurial/help/config.txt:1156 msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" #: mercurial/help/config.txt:1159 @@ -21471,7 +21472,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" "EDITOR\n" " Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n" @@ -21480,7 +21481,7 @@ msgstr "" " variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) " "ermittelt.\n" " Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n" -" wird die Voreinstellung 'vi' verwendet." +" wird die Voreinstellung 'sensible-editor' verwendet." #: mercurial/help/environment.txt:99 msgid "" --- a/i18n/el.po +++ b/i18n/el.po @@ -274,7 +274,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" @@ -6364,7 +6364,7 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "" -msgid " No commit editor set and can't find vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" msgstr "" msgid " (specify a commit editor in your .hgrc file)\n" --- a/i18n/fr.po +++ b/i18n/fr.po @@ -299,7 +299,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" @@ -8201,7 +8201,7 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "" -msgid " No commit editor set and can't find vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" msgstr "" msgid " (specify a commit editor in your .hgrc file)\n" --- a/i18n/it.po +++ b/i18n/it.po @@ -7156,8 +7156,8 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "Sto controllando l'editor per il commit...\n" -msgid " No commit editor set and can't find vi in PATH\n" -msgstr "Nessun editor per il commit trovato e non trovo vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr "Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n" msgid " (specify a commit editor in your configuration file)\n" msgstr "" @@ -10461,7 +10461,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" --- a/i18n/ja.po +++ b/i18n/ja.po @@ -11954,8 +11954,8 @@ msgstr " (テンプレートのインス msgid "checking commit editor...\n" msgstr "メッセージ入力用エディタの確認中...\n" -msgid " No commit editor set and can't find vi in PATH\n" -msgstr " エディタが起動できません(vi にも PATH が通っていません)\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n" msgid " (specify a commit editor in your configuration file)\n" msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n" @@ -18499,11 +18499,12 @@ msgstr "" msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" "``editor``\n" " コミットログ入力用エディタ。 無指定の場合、 ``$EDITOR`` ないし\n" -" ``vi`` が使用されます。" +" ``sensible-editor`` が使用されます。" msgid "" "``fallbackencoding``\n" @@ -19662,7 +19663,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" "EDITOR\n" " コミットログ入力時のように、 エディタでファイルを開き、\n" @@ -19670,7 +19671,7 @@ msgstr "" " そこで使用されるエディタは、 HGEDITOR、 VISUAL\n" " あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n" " 最初の空で無い値に設定された環境変数の値を使用します。\n" -" いずれも未設定 (あるいは空) の場合は、 'vi' が使用されます。" +" いずれも未設定 (あるいは空) の場合は、 'sensible-editor' が使用されます。" msgid "" "PYTHONPATH\n" --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -12122,10 +12122,10 @@ msgstr " (modelos parecem ter sido insta msgid "checking commit editor...\n" msgstr "verificando editor para consolidação...\n" -msgid " No commit editor set and can't find vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" msgstr "" " Nenhum editor para consolidação configurado, e não foi possível encontrar " -"'vi' no PATH\n" +"'sensible-editor' no PATH\n" msgid " (specify a commit editor in your configuration file)\n" msgstr "" @@ -18837,10 +18837,12 @@ msgstr "" msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" "``editor``\n" -" O editor usado durante um commit. O padrão é ``$EDITOR`` ou ``vi``." +" O editor usado durante um commit. O padrão é ``$EDITOR`` ou\n" +" ``sensible-editor``." msgid "" "``fallbackencoding``\n" @@ -20030,7 +20032,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" "EDITOR\n" " Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n" @@ -20038,7 +20040,7 @@ msgstr "" " mensagens de consolidação. O editor usado é determinado pela\n" " consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n" " nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n" -" estiverem vazios, o editor será o 'vi'." +" estiverem vazios, o editor será o 'sensible-editor'." msgid "" "PYTHONPATH\n" --- a/i18n/sv.po +++ b/i18n/sv.po @@ -9509,8 +9509,8 @@ msgstr " (mallar verkar vara inkorrekt i msgid "checking commit editor...\n" msgstr "kontrollerar arkiveringseditor...\n" -msgid " No commit editor set and can't find vi in PATH\n" -msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr " Ingen arkiveringseditor satt och kan inte hitta sensible-editor i PATH\n" msgid " (specify a commit editor in your configuration file)\n" msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n" @@ -14852,7 +14852,8 @@ msgstr "" msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" msgid "" @@ -15564,7 +15565,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -5778,7 +5778,7 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "" -msgid " No commit editor set and can't find vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" msgstr "" msgid " (specify a commit editor in your .hgrc file)\n" @@ -8666,7 +8666,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" --- a/i18n/zh_TW.po +++ b/i18n/zh_TW.po @@ -6760,8 +6760,8 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "檢查提交訊息編輯器...\n" -msgid " No commit editor set and can't find vi in PATH\n" -msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有sensible-editor\n" msgid " (specify a commit editor in your configuration file)\n" msgstr "(在你的設定檔指明一個用來編輯提交訊息的編輯器)\n" @@ -9710,7 +9710,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" --- a/mercurial/help/environment.txt +++ b/mercurial/help/environment.txt @@ -94,7 +94,7 @@ EDITOR editor it uses is determined by looking at the environment variables HGEDITOR, VISUAL and EDITOR, in that order. The first non-empty one is chosen. If all of them are empty, the editor - defaults to 'vi'. + defaults to 'sensible-editor'. PYTHONPATH This is used by Python to find imported modules and may need to be --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -1154,7 +1154,8 @@ User interface controls. Print debugging information. True or False. Default is False. ``editor`` - The editor to use during a commit. Default is ``$EDITOR`` or ``vi``. + The editor to use during a commit. Default is ``$EDITOR`` or + ``sensible-editor``. ``fallbackencoding`` Encoding to try if it's not possible to decode the changelog using --- a/i18n/ro.po +++ b/i18n/ro.po @@ -7722,7 +7722,7 @@ msgstr "" msgid "Checking commit editor...\n" msgstr "Se verifică editorul pentru commit...\n" -msgid " No commit editor set and can't find vi in PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" msgstr "" msgid " (specify a commit editor in your configuration file)\n" @@ -11925,7 +11925,8 @@ msgstr "" msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" msgid "" @@ -12570,7 +12571,7 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" msgid "" --- a/i18n/ru.po +++ b/i18n/ru.po @@ -12019,8 +12019,8 @@ msgstr " (шаблоны, похоже, msgid "checking commit editor...\n" msgstr "проверка редактора сообщений фиксации...\n" -msgid " No commit editor set and can't find vi in PATH\n" -msgstr " Редактор сообщений не установлен и vi не доступен в PATH\n" +msgid " No commit editor set and can't find sensible-editor in PATH\n" +msgstr " Редактор сообщений не установлен и sensible-editor не доступен в PATH\n" msgid " (specify a commit editor in your configuration file)\n" msgstr " (задайте редактор сообщений в вашем конфиге)\n" @@ -18656,10 +18656,12 @@ msgstr "" msgid "" "``editor``\n" -" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +" The editor to use during a commit. Default is ``$EDITOR`` or\n" +" ``sensible-editor``." msgstr "" "``editor``\n" -" Редактор, вызываемый при фиксации. По умолчанию ``$EDITOR`` or ``vi``." +" Редактор, вызываемый при фиксации. По умолчанию ``$EDITOR`` or\n" +" ``sensible-editor``." msgid "" "``fallbackencoding``\n" @@ -19832,14 +19834,14 @@ msgid "" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'." +" defaults to 'sensible-editor'." msgstr "" "EDITOR\n" " Иногда требуется открыть текстовый файл в редакторе, чтобы.\n" " внести изменения, например для написания сообщения фиксации.\n" " Используемый редактор определяется переменными среды HGEDITOR,\n" " VISUAL и EDITOR, именно в таком порядке. Выбирается первая\n" -" непустая переменная. Если они все пусты, используется 'vi'." +" непустая переменная. Если они все пусты, используется 'sensible-editor'." msgid "" "PYTHONPATH\n" debian/patches/deb_specific__support_templates_in_fsh.patch0000664000000000000000000000062012261301466021575 0ustar Author: Vernon Tang Description: Support installation of templates in FHS. Forwarded: not-needed --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -375,7 +375,7 @@ funcs = { # template engine -path = ['templates', '../templates'] +path = ['templates', '../templates', '/usr/share/mercurial/templates'] stringify = templatefilters.stringify def _flatten(thing): debian/mercurial-common.examples0000664000000000000000000000051612216001724014176 0ustar hgeditor contrib/dumprevlog contrib/hgsh contrib/hgweb.fcgi contrib/hgweb.wsgi contrib/mercurial.el contrib/perf.py contrib/python-hook-examples.py contrib/sample.hgrc contrib/simplemerge contrib/tcsh_completion contrib/tcsh_completion_build.sh contrib/tmplrewrite.py contrib/undumprevlog contrib/vim contrib/zsh_completion hgweb.cgi debian/mercurial.postinst0000664000000000000000000000252512216001775012765 0ustar #!/bin/sh # postinst script for mercurial # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `configure' # * `abort-upgrade' # * `abort-remove' `in-favour' # # * `abort-remove' # * `abort-deconfigure' `in-favour' # `removing' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in configure) for conffile in hgext.rc; do # Tell ucf that the file in /usr/share/mercurial is the latest maintainer # version, and let it handle how to manage the real configuration file in # /etc/mercurial/hgrc.d. ucf --sum-file /usr/share/mercurial/$conffile.md5sums --three-way \ /usr/share/mercurial/$conffile /etc/mercurial/hgrc.d/$conffile ucfr mercurial /etc/mercurial/hgrc.d/$conffile done ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/mercurial.links0000664000000000000000000000011112201757705012214 0ustar usr/share/doc/mercurial-common/examples usr/share/doc/mercurial/examples debian/compat0000664000000000000000000000000212201757705010374 0ustar 9 debian/mercurial-common.dirs0000664000000000000000000000005612216001775013326 0ustar usr/share/mercurial/help etc/mercurial/hgrc.d debian/rules0000775000000000000000000001037112261277251010257 0ustar #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ --with python2,bash-completion PYVERS=$(shell pyversions -vs) PYVER_DEFAULT=$(shell pyversions -vd) DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) override_dh_auto_build: $(MAKE) all # Do not start a line with a word with a dot in a manpage sed -i -e 's,^[.]\(hgignore\|hg/hgrc\),\\fP\1,' doc/hg.1 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) PARALLEL_TEST_JOBS := --jobs $(NJOBS) endif ARCH_IS_MIPS := $(if $(subst mips,,$(DEB_HOST_ARCH)),,T) ARCH_IS_KFREEBSD-i386 := $(if $(subst kfreebsd-i386,,$(DEB_HOST_ARCH)),,T) ARCH_IS_ARMEL := $(if $(subst armel,,$(DEB_HOST_ARCH)),,T) ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T) override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # test-pull-pull-corruption tries to execute two hg commands at the # same time to test for corruption. It does so by running an hg # command in the background, sleeping one second and running the # second command. In architectures with slow buildds, one second is # not enough and the second test starts before the first one has # started printing. This is hacky and we just enhance the hack by # incrementing the sleep time in those architectures. ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),) sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t endif http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS)" rename.ul .deb-backup '' $(CURDIR)/tests/* endif override_dh_auto_install: $(PYVERS:%=install-python%) install-python%: python$* setup.py install --root $(CURDIR)/debian/tmp --install-layout=deb # Do not hardcode the python interpreter sed -i '1c#!/usr/bin/python' debian/tmp/usr/bin/hg override_dh_install: dh_install if test -d $(CURDIR)/debian/mercurial ; then \ $(MAKE) -f debian/rules install-archdep ; \ fi if test -d $(CURDIR)/debian/mercurial-common ; then \ $(MAKE) -f debian/rules install-archindep ;\ fi install-archdep: # remove arch-independent python stuff find debian/mercurial/usr/lib \ ! -name '*.so' ! -type d -delete , \ -type d -empty -delete install-archindep: # Install system-wide conffiles. Note the rename from .hgrc # to .rc, which dh_install can't do if you list the file in # mercurial-common.install install -m 644 \ contrib/mergetools.hgrc \ $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/mergetools.rc install -m 644 \ debian/cacerts.hgrc \ $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/cacerts.rc # Move templates and help installed by setup.py to their FHS-correct location mv $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/templates \ $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/help \ $(CURDIR)/debian/mercurial-common/usr/share/mercurial mv $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/locale \ $(CURDIR)/debian/mercurial-common/usr/share # If more than one Python version is supported, clean up the templates # and help installed for the other versions -rm -rf $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/templates \ $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/help \ $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/locale \ # remove arch-dependent python stuff find debian/mercurial-common/usr/lib \ -name '*.so' ! -type d -delete , \ -type d -empty -delete override_dh_python2: dh_python2 find debian/mercurial/usr/share -type d -empty -delete override_dh_auto_clean: mercurial/__version__.py cp -a mercurial/__version__.py mercurial/__version__.py.save dh_auto_clean mv mercurial/__version__.py.save mercurial/__version__.py $(RM) -rv tmp/ override_dh_clean: dh_clean -rm -f tests/test-check-pyflakes.t mercurial/__version__.py: @echo "$@ is missing (you probably call 'make clean' directly)." @echo "Restore it from sources before building the package" @echo "Aborting." exit 1 debian/upstream-signing-key.pgp0000664000000000000000000001763412261306322013772 0ustar  O)Wy|!z=F-GQA UFlq2ydBZUD lml=x˺C I١8W!j2fy☙,'Rcq\|ON|b<זI 檥8঱]:{ה<0RW[ .F[Sz1~ӉK^fcnf{ X!Q Qf\>λ,bT$uuHwn`?j|Ձ`KDVZ-’ j3K*,mQvpP31DNRʰ}pĘ CwW H7wQO -£{<0x ZM rRljeu=W 4WmrGbb>ipj ^䆗vZ5O{u>D no<Cb 366r?]cS 1q!Matthew Mackall FO 9y*])2(q;mʈI]DTf=J Q~x /wMd@55@c57XpaOMgP&" Q #U'+Th=`,Tڃ ^{=ɱHbmٷi=Iٞ Wˏޓy[vsͼ۷a Rpp\%C Yչ!r Yqiȱ&-+EY&}me!}36W}Qⶔ{@*dYp+9CQĊrCğ~zFCՔRHWl{J(i^<wFIU-? =]ljO #2OdV{GOC,i,[xtq>-P]$=mj{{C >c~I'cPgfN 4CyۖjܠAf(RU籄l}=C. G _yCz1^ "Б$lIo,t5Lb %R8N-)3epђy yp͍OEi$̩PWP=eXߊõ\Ӥο/+Z{xyJT$Sc뉱-yblV!fGoJ"rbi6>aw(3l鑡<* 4MiisܪA eZflگ$R|P7Xֻl֫(Bt0U֏H@]>F9Z6h=0 pߡᙟÅr{8B, TZsӖ4ç4YOX l?yQޙ͉ͳUOq ܂J*'hڪAɍQ^TS6Mۣ$o:4sI ~>+<,-?a 5dp Q oBbKga>։,:b1Hv>-MRfr~` W69):~/ЇG9)6={Q޳WP kPzA0ëzY-X3ZyL/bRS>ؕB'\N 3܉Mk+<^\7! 'KČﺅ:2W8Yd 0$0eHV=Z\zlC=DԧCM]19 ce\+,ӱ˂spa4t\& XŻΒߺҔ7|&0~F.>hU{3"Ҿh7⇽0EI=42: Trxc[[miI~7G/ An ўJ99tLdK1, 8Dڀ؄ey:7t 42\B=? zbW}.Ǐ9郿E[{pW+C!-G NnNăfr ӽnE>ۈļvT:llKO PNٶz[+{sr- N515VM{+15IRMuֲ$(A'41'-!>va0,ׇJ$_/PeG\909).\s/b;%ȂpW(nxC̈́)Z+0Ee,LPl7~ u HOsBޯLxE ޥۄm$w; n_⁾Å2~9Y NT2Z{VgQB:X8痊4؛q pe%t#'8S_(7f(q`:._Y|U׷lk'vC<̃ }en3hD'8NP|>5+5#`%InQSy%,SY̝@Lt9pTShG $LklMˬj#co~Ĝs9‘MPC/oH QQ>nBiq%5ɫ&|OG v%EK2u7VKw9r_|gFsQWEC -_2&sa-fhCY8B-54K&ΞΜ&d.Ds`Jgbt!^fT}]y*m.Xw훓ή;5;C>sHݦ^o)Bpm90SV l@ ]X p& q+nm=V8釮hVGLUan׎UATTµz1RD2{JHؓO)㳣،9F yKBTpFc589 D4bMW"5Fċ+sA‹oрgşjC`msP5Nz%zmtZ ,Psj_H؇x % ~;$W@˝KE719i:툇lԿ)MO;7QTKwPOI@!" oAy ]ȱ;oWǥn/bǷOqnSW(f)AGg^Mbe+nby5-S'l'zZyEisiq$#)38njh4&КXMs NdbRps"۸JM+Mw+)hYM%uջ +~>}TIPG ƔgĐ.7;7)T {ЙHBEĔl-5G ORK嶛r 5O)?OMjr"&?hɚ(٩qQq|>q :wzFҕs_ޥG|>ã4[)/mc$4iɘ6\BՈF!imP,j'P2^B'Xi,OLX# I|(Igͧ`EDT'tExbz %<$BIy2<|r!y_@]%μh̤rٲj`zjJRZY19Dp̱ɖ$d1Ѫ6Hq{2ݥ4Y!Ď=Zc]5d_X/ d- +ϳ=4ts4 ZE)B\q8 XO0V_8^`ӬYY90 O  PNٶz[>>H`+SLa Sy.ُ l0dkt߈? wmJHt ͣT}^mVvHq[k[M X['Ue5&agʯ퀶jce(l^M eG$E<貐OĦa<@.6P6M궏pʈ41_w}9s.$4wحI;zf*#Y]٩?iRd핁E o49PM*']iOw75|\A{p`ϦV.qnt+7mVT3E?tO`_ƛg4qpCdOʠw#(>"h[3oQ;rEwgYYy= @d$Q|AH.h=%pd8B"4?֢D}fzd#/9"h )%0ǟ<]$we=$N@   QVx Eʩ*q{²ccjc)1t`ݷ-2X]n^;+ i]THo[Íe r;CrYYBG.iX{$  HkPfni;"CM6zRmٍǘ;bٜ[kDPLnI(D>_ԝA,wNs\Lt/`Xtضf|EʌN@7G*k5Cad!\Wfk:%μIAhs5WzV0.hI3yl~[ٻϹfsxni#U+y;q!l:KXEvdp29mk ]WmkQI i `_gϓ^ pp%9,>bO]./EC=R8׍(BFGsف Q/l$TVr,op^j #4(T=YB`3< 7ב.)" Q  V~&FԦh}M NviFZޒT8[c%eAp»}gAR3^9B`R1ul7OQ cheq`]Q=)PI&3ųxb]L'-b._wvoAV; < I+!2R'o .@Up:K(8DV-[cajnV0C?؎q+Ek䐅\uxΓ,f~?B-傫~-r1 IIuh$v!P405$){7 >\G̈́ݾs5Y/mxʼiP?N]'ͥ^yn$Uc^ ~~2e9-Iż't0BlFerNJbJI413C0Z'/Ħ ESdd*^9P7, Ñx_IC=geQO$ޥflW?q;`R 9_1}X ޙ=f.Y?siM0daUNҽ<:j"+8D 1h7;@{INξeх$}#u6LuoVoV-Ae\nB8#=WLƴFe" O)ˎ#(b`aT@@L\ dvkAG  1f7.3$p./GPӎ)z/_!J{4m iH$Sq L +3$x]ہ$?pyi^l'B",7&eJW'l=Q/%(>ZnO&t"HYa!aV9qjUV1 0TC,~ϖ-u@܏17 g. "scCqHPqݠ[ o* ^f=Jć%,T{U%Qk739K~'HXD@,X Dzk'AYR)7>)WNu5b)܍gyZ ̕N}aVa1`m~e0ZA7K*o=(dQ[_.~0wH\>Nz|z O)  Wh*-rߖNNy#%/rl>1*7)+z7&Ÿe3Wkth_$C|^R F܋ @>GYmH񞵤L71s+lIn:>ϻ*P*"'h?Rm/Weuư }L~VEPu q8;~<3nޱvp4d^M?q%Ytc=Sa9W5KD||[xE!"luy1&h~$>>.b/CF cFtgS77^F6s4QXR߁!b6ʾ(,iCuvIQԨ&&5T?c1 /*j˚> 4Z, &HM"FO7YB31E¶L_%3 F˜p8?R+v':yQo{ n|bac!W8udebian/copyright0000664000000000000000000000266512201757705011142 0ustar Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 Upstream-Name: mercurial Upstream-Source: http://www.selenic.com/mercurial/ Files: * Copyright: Copyright 2005 Matt Mackall and others. License: GPL-2+ You can redistribute this software and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 or any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. Files: debian/* Copyright: Copyright 2005-2010, Vincent Danjean License: GPL-2+ You can redistribute this software and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 or any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. debian/README.Debian0000664000000000000000000000200412201757705011233 0ustar Mercurial for Debian -------------------- Table of contents * Documentation * Extensions provided in this package and their dependencies * Other extensions * Emacs support Documentation ************* Mercurial documentation is available on the web at: http://hgbook.red-bean.com/ and http://mercurial.selenic.com/wiki/ Extensions ********** Extensions can be enabled system-wide, per-user and/or per repository (see hgrc(5) for more information). Previous versions of this Debian package enabled some extensions by default; however, this is no longer the case. To enable extensions system-wide, you may edit the /etc/mercurial/hgrc.d/hgext.rc configuration file. This file also contains information on the dependencies of each extension. Emacs support ************* This package installs a mercurial.el file in the example directory (/usr/share/doc/mercurial/examples/). However, with emacs22 or better, vc-hg.el provided directly by emacs is better. This is why mercurial.el is not installed by default anymore. debian/mercurial-common.install0000664000000000000000000000030012231045361014017 0ustar debian/tmp/usr/lib contrib/mq.el usr/share/emacs/site-lisp contrib/logo-droplets.svg usr/share/mercurial contrib/hgk usr/share/mercurial/ contrib/hg-ssh usr/bin debian/hgrc etc/mercurial/ debian/mercurial.postrm0000664000000000000000000000322412201757705012430 0ustar #!/bin/sh # postrm script for mercurial # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `remove' # * `purge' # * `upgrade' # * `failed-upgrade' # * `abort-install' # * `abort-install' # * `abort-upgrade' # * `disappear' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in purge) for conffile in hgext.rc; do # we mimic dpkg as closely as possible, so we remove configuration # files with dpkg backup extensions too: ### Some of the following is from Tore Anderson: for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old .ucf-new .ucf-dist; do rm -f /etc/mercurial/hgrc.d/$conffile$ext done # remove the configuration file itself rm -f /etc/mercurial/hgrc.d/$conffile # and finally clear it out from the ucf database if which ucf >/dev/null; then ucf --purge /etc/mercurial/hgrc.d/$conffile fi if which ucfr >/dev/null; then ucfr --purge mercurial /etc/mercurial/hgrc.d/$conffile fi done ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/hg-ssh.80000664000000000000000000000154612201757705010466 0ustar .TH HG-SSH 8 2008-01-03 .SH NAME hg-ssh \- restricted ssh login shell for Mercurial .SH SYNOPSIS .B hg-ssh .IR repositories ... .SH DESCRIPTION .B hg-ssh can be used as a restricted shell where access to Mercurial repositories is given over .BR ssh (1). It should be specified, together with the paths to the .I repositories the user should be given access to, as a .I command option in an .BR authorized_keys (5) file. .PP An example .I authorized_keys line using .BR hg-ssh : .RS command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-rsa AA...== .RE .PP The user with the specified key would then be permitted to push and pull to the repositories using the URLs: .RS .nf ssh://example.com/path/to/repo1 ssh://example.com//path/to/repo2 ssh://example.com/~/repo3 ssh://example.com/~user/repo4 .fi .RE .SH SEE ALSO .BR sshd (8), .BR ssh (1), .BR hg (1). debian/NEWS0000664000000000000000000001065312201757705007702 0ustar mercurial (1.4.3-1) unstable; urgency=low mercurial.el (emacs mode for mercurial) is not installed anymore in emacs paths. Emacs22 or newer has vc-hg.el that is better. If needed, this file is still provided in the examples directory. The alias extension does not exist anymore as its functionalities are now in mercurial core. To avoid spurious warning about failed loading of extension, users just have to remove it in their hgrc file. -- Vincent Danjean Mon, 15 Feb 2010 18:06:52 +0100 mercurial (1.1.2-1) unstable; urgency=low Since the 1.1.2-1 version, mercurial does not enable any extension by default anymore. Upstream asks us to do so because: - users can easily enable any extension if they wish, however they cannot disable a extension that have been enabled system-wide - upstream prefers that default Mercurial installation is the plain Mercurial without extension. -- Vincent Danjean Sat, 17 Jan 2009 17:47:06 +0100 mercurial (1.0-5) unstable; urgency=low Since the 1.0 version, mercurial handles most of the merges internaly. This is an upstream decision (see upstream changeset f077815932ce) that the debian package will follow. This means that : - there is no hgmerge script any more - programs that were invoked by hgmerge (kdiff3, ...) are not by default See http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration for configuring mergetools with mercurial 1.0 -- Vincent Danjean Tue, 20 May 2008 22:37:24 +0200 mercurial (1.0) unstable; urgency=low Since the 1.0 version, the hbisect extension is now provided as a built-in command. If you keep an older version of the hgext.rc file in /etc/mercurial/hgrc.d/ or a $HOME/.hgrc file with the extension enabled , mercurial will emit a warning: "failed to import extension hgext.hbisect: No module named hbisect". Just delete the hgext.hbisect entry in the hgext.rc and/or .hgrc file. -- Gerardo Curiel Wed, 02 Apr 2008 16:14:47 -0430 mercurial (0.9) unstable; urgency=low Since the 0.8.1-5 version, mercurial uses python2.4 instead of (currently the default on Debian system) python2.3. This allows tailor to use the hg backend (tailor requires python2.4). If someone really need python2.3 version of mercurial, please tell me (with reportbug for example). I will then split the package in python modules (default, 2.3, 2.4, ...) and one executable. Note: if you copied the hgwebdir.cgi or hgweb.cgi script from the examples directory, do not forget to update it so that it runs /usr/bin/python2.4 instead of /usr/bin/python (or recopy it) UPDATE since 0.9-6: Due to the new python policy, mercurial modules are now available for all supported python versions in debian (currently 2.3 and 2.4) -- Vincent Danjean Tue, 4 Jul 2006 00:53:21 +0200 mercurial (0.8) unstable; urgency=low Upgrade notes: - diff and status command are now repo-wide by default (use 'hg diff .' for the old behavior) - GPG signing is now done with the gpg extension - the --text option for commit, rawcommit, and tag has been removed - the copy/rename --parents option has been removed -- Vincent Danjean Mon, 30 Jan 2006 16:11:19 +0100 mercurial (0.6c-1) unstable; urgency=low Previous versions of mercurial can lead to conflicts for internal filenames if the repo has both a file 'foo' and a directory 'foo.d'. This version of mercurial solves this, however this means that some internal files have been renamed. If you want to use (commit, clone on same filesystem, ...) a repo created with an old version with the new version AND this repo contains directory nammed 'foo.d', then you need to deal with it. According to the upstream author, something like this should do the trick: find .hg -type d -name "*.[di]" -exec echo mv {} {}.hg ";" Run this at the top of your working dir. Take out the 'echo' once you've confirmed it's finding the right files. Also note that 0.6c and older clients should be perfectly compatible over the wire, so long as each side has the appropriate directory naming. But if you use 0.6c to pull into a repo created by 0.6b with changes that touch files in an affected directory, you're likely to have strange behavior. -- Vincent Danjean Tue, 23 Aug 2005 09:55:35 +0200 debian/changelog0000664000000000000000000021564612266004041011053 0ustar mercurial (2.8.2-1ubuntu1) trusty; urgency=medium * debian/tests/control: - Add "allow-stderr" restriction to "testsuite" as it prints out a "Tested with unexpected mercurial lib:" warning. - Disable hgsubversion test as it needs access to anonscm.debian.org which we don't have in Ubuntu CI. -- Martin Pitt Thu, 16 Jan 2014 17:25:51 +0100 mercurial (2.8.2-1) unstable; urgency=medium * New upstream release * Drop for_upstream__fix_i18n.patch as it's now included upstream * Make uscan verify the signature of downloaded tarballs -- Javi Merino Thu, 02 Jan 2014 17:31:05 +0100 mercurial (2.8.1-2) unstable; urgency=low * Pass -f to rm so that repeated builds succeed (Closes: #731623). * Fix installation in the case where there is more than one supported version of Python (Closes: #729153). - Thanks to Faheem Mitha for the patch. * Make test-shelve.t more lenient. This should hopefully fix the semi-intermittent build failures on some architectures with slower buildds. -- Tristan Seligmann Sun, 08 Dec 2013 02:03:54 +0200 mercurial (2.8.1-1) unstable; urgency=low * New upstream release (Closes: #731471) * Add myself to Uploaders. * Add patch to fix test-i18n. * Remove pyflakes test to avoid build failures when pyflakes is installed. -- Tristan Seligmann Fri, 06 Dec 2013 01:14:40 +0200 mercurial (2.8-3) unstable; urgency=low * Fix mercurial-git autopkg test * Add missing deps to run the testsuite with autopkgtest * Increment testsuite timeout to 1440 to prevent timeouts in mips * Move wish to Recommends as it's needed for hg view -- Javi Merino Sun, 17 Nov 2013 10:13:23 +0000 mercurial (2.8-2) unstable; urgency=medium * Increment testsuite timeout to 720 as test-gendoc.t takes a loooong time on armel * Don't run pyflakes on the autopkgtest for the testsuite, it fails to see the pyflakes error it's expecting (but it's not our job to fix python lint issues) -- Javi Merino Fri, 15 Nov 2013 14:10:00 +0000 mercurial (2.8-1) unstable; urgency=low * New upstream release * Fix mercurial-git and hgsubversion autopkgtest by loading the appropriate extension * Bump standards-version to 3.9.5 (no change needed) -- Javi Merino Fri, 01 Nov 2013 23:19:57 +0000 mercurial (2.8~rc1-1) experimental; urgency=low * New upstream release * Fix patches deb_specific__install-help-separately, deb_specific__install-help-separately and deb_specific__install-mo-fhs.patch so that we can run the full testsuite when building * Build-depend on netbase to make test-serve.t work -- Javi Merino Mon, 21 Oct 2013 22:35:36 +0100 mercurial (2.7.2-1) unstable; urgency=low * New upstream release * Revert breaks of mercurial-git back to << 0.4.0-1 (Closes: #725145) * Re-enable the testsuite as the tests that timeout can be blacklisted -- Javi Merino Wed, 02 Oct 2013 23:55:58 +0100 mercurial (2.7.1-3) unstable; urgency=low * Update breaks of mercurial-git to the current version (0.4.0-1) * Add autopkgtest tests -- Javi Merino Tue, 01 Oct 2013 08:48:23 +0100 mercurial (2.7.1-2) unstable; urgency=low * Temporarily don't run the testsuite when building. Since 2.7.1 it timeouts in buildd environments (but works ok if run in the command line). -- Javi Merino Thu, 05 Sep 2013 21:52:14 +0100 mercurial (2.7.1-1) unstable; urgency=low * New upstream release * Enable tests that need networking -- Javi Merino Wed, 04 Sep 2013 23:06:57 +0100 mercurial (2.7-2) unstable; urgency=low * Fix "conffiles not removed" by properly moving them to mercurial-common (Closes: #718621) -- Javi Merino Tue, 13 Aug 2013 23:11:14 +0200 mercurial (2.7-1) unstable; urgency=low * New upstream release * Remove shrink-revlog.py from examples as it is no longer shipped in mercurial -- Javi Merino Sun, 11 Aug 2013 16:09:20 +0200 mercurial (2.6.3-1) unstable; urgency=low * New upstream release * Remove preinst script as it's mostly checks for stuff that was fixed long ago * Remove old checks from postinst * Move config files to mercurial-common * Install bash-completion using debhelper's bash-completion sequencer * Compatible with hgsubversion 1.5 or greater, update breaks to reflect that -- Javi Merino Sun, 21 Jul 2013 23:31:34 +0200 mercurial (2.6.2-1) unstable; urgency=low * New upstream release * Delete patch from_upstream__fix_untranslated_prompts_with_translated_responses.patch which is now included upstream -- Javi Merino Sun, 09 Jun 2013 10:36:59 +0100 mercurial (2.6.1-1) unstable; urgency=low [ Jakub Wilk ] * Use canonical URIs for Vcs-* fields. [ Javi Merino ] * New upstream release (Closes: #709815) * Blacklist test-histedit-arguments.t and test-websub.t * Fix "Translation missing for yes/no question, but requires translated input from user" by adding patch from_upstream__fix_untranslated_prompts_with_translated_responses.patch (Closes: #707703) * Upload to unstable -- Javi Merino Wed, 15 May 2013 22:16:29 +0100 mercurial (2.5.2-1) experimental; urgency=low * New upstream release * Update hgview breaks. hgview works with mercurial 2.5 starting from 1.7.1-1. * test-convert-git.t works again so add it back to the test-suite we run when building the package -- Javi Merino Tue, 19 Mar 2013 22:53:20 +0000 mercurial (2.5.1-1) experimental; urgency=low * New upstream release * Add test-obsolete.t to the blacklisted tests * hgview 1.5.0-4 doesn't work with mercurial 2.5.1 -- Javi Merino Tue, 12 Feb 2013 21:13:06 +0000 mercurial (2.4.2-1) experimental; urgency=low * New upstream release -- Javi Merino Wed, 02 Jan 2013 13:01:27 +0100 mercurial (2.4.1-1) experimental; urgency=low * New upstream release -- Javi Merino Wed, 19 Dec 2012 21:10:25 +0000 mercurial (2.4-1) experimental; urgency=low * New upstream release * mercurial 2.3.1 was not compatible with hgsubversion 1.4 and mercurial-git 0.3.3 * Bump standards-version to 3.9.4 (no change needed) * Add test-commit-amend to the blacklisted tests as it needs styles now -- Javi Merino Tue, 27 Nov 2012 22:35:33 +0000 mercurial (2.3.1-1) experimental; urgency=low * New upstream release * Delete patch for_upstream__hgweb_fix_spelling_error.patch which is now included upstream -- Javi Merino Sun, 16 Sep 2012 16:05:55 +0100 mercurial (2.3-2) experimental; urgency=low * Blacklist test-histedit-revspec as it needs styles -- Javi Merino Sat, 04 Aug 2012 20:56:38 +0200 mercurial (2.3-1) experimental; urgency=low * Don't run the testsuite if nocheck is in DEB_BUILD_OPTIONS * Move to dh v9 to automatically get the Hardening buildflags * Don't Suggest xxdiff, as it's been removed from the archive * New upstream release * Add patch for_upstream__hgweb_fix_spelling_error.patch to fix a spelling error in a manpage -- Javi Merino Fri, 03 Aug 2012 20:53:44 +0200 mercurial (2.2.2-1) unstable; urgency=low * New upstream release -- Javi Merino Sun, 03 Jun 2012 09:17:36 +0100 mercurial (2.2.1-2) unstable; urgency=low * Blacklist test-convert-git.t as it is known to fail with git 1.7.10 and it's making it fail to build in armel. * Build-depend on python-roman (Closes: #671611) -- Javi Merino Sun, 06 May 2012 17:31:51 +0100 mercurial (2.2.1-1) unstable; urgency=low * New upstream release that fixes a memory leak in hgweb * Refresh i18n/{de,da,ja}.po translations in deb_specific__use_sensible-editor.patch -- Javi Merino Fri, 04 May 2012 21:57:42 +0100 mercurial (2.2-2) unstable; urgency=low * Don't patch test-pull-pull-corruption2.t in kfreebsd-i386, armel, sparc or mips, it's now integrated into test-pull-pull-corruption.t -- Javi Merino Wed, 02 May 2012 19:21:40 +0100 mercurial (2.2-1) unstable; urgency=low * New upstream release 2.2 * Delete patches for_upstream__skip_test_gpg_if_not_mercurial_wd.patch and from_upstream__tests_re_silence_test_bad_pull_log_messages.patch which are now included upstream * Refresh patches -- Javi Merino Wed, 02 May 2012 08:08:32 +0100 mercurial (2.1.2-2) unstable; urgency=low * Add sparc to the list of architectures with slow buildds * Import 91eec29dd7de from upstream to fix the test-suite failures in mips and sparc -- Javi Merino Tue, 03 Apr 2012 21:54:05 +0100 mercurial (2.1.2-1) unstable; urgency=low * New upstream release 2.1.2 * Add armel to the list of architectures with slow buildds * Drop patch "deb_specific__no_optim_bdiff_armel.patch" as gcc no longer miscompiles bdiff in armel * Remove confusing entry in Debian.NEWS (Closes: #666549) * Remove patches for_upstream__fix_kfreebsd_test_inherit.patch, from_upstream__dont_translate_the_abort_message_twice.patch and from_upstream__fix_all_remaining_uses_of_inside.patch which are now included upstream * Add patch for_upstream__skip_test_gpg_if_not_mercurial_wd.patch to skip test-gpg when the testsuite is not run in a hg checkout -- Javi Merino Mon, 02 Apr 2012 22:50:29 +0100 mercurial (2.1.1-2) unstable; urgency=low * Add kfreebsd-i386 to the list of slow architectures for the test suite. * Improve the fix for the test-inherit-mode.t patch based on suggestions from upstream * Fix "UnicodeDecodeError when refusing to update" by adding patches from_upstream__dont_translate_the_abort_message_twice.patch and from_upstream__fix_all_remaining_uses_of_inside.patch (Closes: #662207) -- Javi Merino Fri, 09 Mar 2012 00:14:13 +0000 mercurial (2.1.1-1) unstable; urgency=low * New upstream version 2.1.1-1 * Change the group of the test dir in test-inherit-mode.t so that the testsuite doesn't fail in kfreebsd-* * Drop from_upstream__test_check_code_hg_skip_test_if_not_wd.patch which is now included upstream * Upload to unstable -- Javi Merino Sat, 03 Mar 2012 08:03:18 +0000 mercurial (2.1-3) experimental; urgency=low * Remove unused lintian override binary-without-manpage * Bump standards-version to 3.9.3 (no change needed) * Suggest tkcvs instead of tkdiff. tkdiff has been removed from wheezy as tkcvs provides tkdiff (see bug #483362). * Suggest more visual diff commands * Increment test timeout. test-bisect2.t timed out on mips. * Increment the sleeps in the testsuite in mips so that the test produces the same output than in faster architectures * Ignore the output of chmod in a test so that the testsuite doesn't fail in kfreebsd-* * Add patch from_upstream__test_check_code_hg_skip_test_if_not_wd.patch to skip test_check_code_hg instead of having to blacklist it -- Javi Merino Wed, 29 Feb 2012 08:51:26 +0000 mercurial (2.1-2) experimental; urgency=low * Recommend ssh * Bump watch version to 3 since we are using version mangling * Run tests in the buildds * Added my new DD account -- Javi Merino Sat, 25 Feb 2012 18:12:14 +0000 mercurial (2.1-1) unstable; urgency=low * New upstream revision -- Javi Merino Fri, 03 Feb 2012 18:38:19 +0100 mercurial (2.0.2-1) unstable; urgency=low * New upstream revision * Fix "hg-ssh is installed system-wide but uses "/usr/bin/env python" as the python interpreter" with a patch that fixes the interpreter (Closes: #654925) -- Javi Merino Fri, 06 Jan 2012 22:09:32 +0000 mercurial (2.0.1-2) unstable; urgency=low * Team Upload * Update Breaks for hgsubversion (see bug #646946), hg-git (see bug #645037), hgview (see bug #637400), and qct (see bug #637401). -- Jakub Wilk Sun, 11 Dec 2011 23:47:26 +0100 mercurial (2.0.1-1) unstable; urgency=low * New upstream revision (Closes: #650727). * Fix "new -rc release are not properly parsed by watch" with a patch from Pierre-Yves David (Closes: #650728) -- Javi Merino Fri, 02 Dec 2011 21:35:31 +0000 mercurial (2.0-2) unstable; urgency=low * Fix "Cloning fails with: mpatch.mpatchError: patch cannot be decoded" by not compiling bdiff.c with optimizations in armel. This is probably a bug in gcc-4.6 (gcc 4.5 works fine) but while it's solved, at least mercurial works again in armel (Closes: #636396) -- Javi Merino Thu, 03 Nov 2011 23:00:43 +0000 mercurial (2.0-1) unstable; urgency=low * New upstream release 2.0 * Don't include empty directories in the package -- Javi Merino Tue, 01 Nov 2011 22:40:40 +0000 mercurial (1.9.999+2.0rc1-1) experimental; urgency=low * Upstream 2.0 Release Candidate 1 * Cover more uses of "defaults to sensible-editor" in the documentation and support ru and ro translations. -- Javi Merino Sun, 30 Oct 2011 13:20:38 +0000 mercurial (1.9.3-1) unstable; urgency=low * New upstream release 1.9.3. -- Javi Merino Tue, 11 Oct 2011 22:31:33 +0100 mercurial (1.9.2-1) unstable; urgency=low * New upstream release 1.9.2. * Remove old code that removed cruft from site-packages -- Javi Merino Mon, 12 Sep 2011 20:55:12 +0100 mercurial (1.9.1-2) unstable; urgency=low * Update breaks to include all the packages that mercurial-1.9.1-1 broke because of the uncoordinated transition to dh_python2. -- Javi Merino Wed, 10 Aug 2011 21:37:37 +0100 mercurial (1.9.1-1) unstable; urgency=low * Convert to dh_python2 * New upstream release 1.9.1 fixes "cannot import mercurial.httpclient with Python 2.7: 'module' object has no attribute 'PROTOCOL_SSLv2'" (Closes: #635496) -- Javi Merino Wed, 03 Aug 2011 08:00:03 +0100 mercurial (1.9-1) unstable; urgency=low * New upstream release 1.9 (Closes: #632250) * Strip trailing .0 from Debian Policy * Remove template warnings from debian/watch to remove a lintian warning -- Javi Merino Fri, 22 Jul 2011 19:44:26 +0200 mercurial (1.8.3-1) unstable; urgency=low [ Javi Merino ] * New upstream release 1.8.3 * Upgrade Debian Policy to 3.9.2.0 [ Jonathan Nieder ] * Make mercurial-common's Recommends field binNMU-safe (Closes: #626132) -- Javi Merino Tue, 10 May 2011 20:37:27 +0100 mercurial (1.8.1-3) unstable; urgency=low * Team Upload * deb_specific__disable_libdir_replacement.patch: Disable @LIBDIR@ replacement in the hg script, by setup.py (Closes: #620087, LP: #745250) -- Stefano Rivera Thu, 31 Mar 2011 00:06:02 +0200 mercurial (1.8.1-2) unstable; urgency=low [ Vincent Danjean ] * Set /etc/ssl/certs/ca-certificates.crt as default valid root certificates and add a recommends to the ca-certificates package (Closes: #619821) [ Javi Merino ] * Mercurial 1.8 breaks hg-git, add that info to debian/control (Closes: #619930) -- Javi Merino Mon, 28 Mar 2011 21:51:40 +0100 mercurial (1.8.1-1) unstable; urgency=low * New upstream release 1.8.1 backs out a behavior change for so-called 'fast-forward' merges on named branches. -- Javi Merino Sat, 12 Mar 2011 19:01:16 +0000 mercurial (1.8-1) unstable; urgency=low * New upstream release 1.8. Many new features and bugfixes, among them: - hgk: realize it is hgk and not gitk (Closes: #613339) -- Javi Merino Sun, 06 Mar 2011 16:01:58 +0000 mercurial (1.7.5-1) unstable; urgency=low * New upstream release 1.7.5 * Delete patch for_upstream__typo_in_manpage.patch which is now included upstream * Add patch for_upstream__add_backquote_fname.patch , proposed upstream (Closes: #611419) * Add patch from_upstream__fix_611420.patch which will be part of the next mercurial release (Closes: #611420) -- Javi Merino Sat, 05 Feb 2011 21:05:19 +0000 mercurial (1.7.3-1) experimental; urgency=low * New upstream release 1.7.3 * Add patch for_upstream__typo_in_manpage -- Javi Merino Tue, 25 Jan 2011 22:22:56 +0000 mercurial (1.7.2-1) experimental; urgency=low * New upstream release 1.7.2 (Closes: #606678) * Fix typo in NEWS (Closes: #605541) * Delete deb_specific__python-module-not-script.patch and deb_specific__mergetools * Update dh compatibility to 8 -- Javi Merino Mon, 13 Dec 2010 21:34:15 +0000 mercurial (1.6.4-1) unstable; urgency=low * New upstream release 1.6.4 (Closes: #598850) * Verify ssl validity in https connections (Closes: #598841) -- Javi Merino Mon, 04 Oct 2010 07:37:33 -0500 mercurial (1.6.3-1) experimental; urgency=low * New upstream release 1.6.3 * Deleted patch from_upstream__issue2255fix-basicauth.diff which is now included upstream. -- Javi Merino Tue, 31 Aug 2010 10:12:42 +0200 mercurial (1.6.2-2) unstable; urgency=low * The patch that fixed #586907 was not being applied. Now it should work. (Closes: #586907) -- Javi Merino Thu, 26 Aug 2010 16:31:09 +0200 mercurial (1.6.2-1) unstable; urgency=low * New upstream release 1.6.2 * Dropped build-depend on quilt (Closes: #588671) * Added a patch from upstream that works around a bug in python 2.6.5 (Closes: #586907) * Updated Standards-Version to 3.9.1.0 (no change needed) * Deleted patch for_upstream__add_doc_url_in_example_files.patch which is now in upstream. -- Javi Merino Fri, 06 Aug 2010 10:43:06 +0200 mercurial (1.6-2) unstable; urgency=low * Mercurial 1.6 breaks old versions of hg-git (Closes: #588336) -- Javi Merino Wed, 07 Jul 2010 15:48:53 +0200 mercurial (1.6-1) unstable; urgency=low [ Javi Merino ] * New upstream release (1.6). Many bug fixes and improvements. Among them: - push: break infinite http recursion bug with Python 2.6.5 (issue2179 and issue2255) (Closes: #586907) - zeroconf: Don't use string exceptions (Closes: #585250) * Removed patch for_upstream__bashism_in_examples.patch since a fix for #581122 is included upstream. * Updated Standards-Version to 3.9 (no change needed) [ Vincent Danjean ] * debian/control: + Use Breaks instead of Conflicts + Use a fixed version in Replaces I put 1.4 but it has been a long time since nothing has been moved from mercurial to mercurial-common -- Vincent Danjean Sun, 04 Jul 2010 09:55:28 +0200 mercurial (1.5.4-2) unstable; urgency=low * Fix regression in python 2.6.5 (Closes: #586907) -- Javi Merino Thu, 24 Jun 2010 12:46:57 +0200 mercurial (1.5.4-1) unstable; urgency=low * New upstream release (1.5.3). Fixes: * fix Issue2181 (commit generates traceback on Nonetype) * various improvements to SVN conversion support * minor doc improvements * New upstream release (1.5.4) (Closes: #586322). Fixes: * dispatch: include Python version in traceback * push: update help * status: avoid performance regression when no .hgsub is present * clone: fix performance issue with hardlinks and Windows shares * hgweb: fix race in refreshing repo list (issue2188) * hgrc: clarify that hgrc keys can be overridden and sections can be split * eol: new extension for managing file newlines based on a version controlled configuration file * pager: fork and exec pager as parent process with /bin/sh -c * rebase: stress that only local changesets should be rebased * convert/svn: close gettags() log stream (issue2196) * record: check that we are not committing a merge before patch selection -- Javi Merino Wed, 16 Jun 2010 09:51:21 +0200 mercurial (1.5.2-1) unstable; urgency=low * New upstream release. Many minor fixes: + Core * clone: fix URL too long problem with many heads * commands: revised documentation of 'default' and 'default-push' * copies: properly visit file context ancestors on working file contexts * diffstat: use ui.plain() instead of ui.interactive() * dirstate: fix in memory dirstate entries for 1-second race * dispatch: don't mangle ImportError abort messages * filemerge: use working dir parent as ancestor for backward wdir merge * hgrc.5: describe form of config values and mention lists as well * hgweb: fix attribute error in error response (issue2060) * log: document the new xml style * merge: correctly compute the flag for noexec filesystems * patch: don't look for headers in diff lines * push: fix bug in warning message selection * revlog: fix lazyparser.__iter__() to return all revisions (issue2137) * static-http: allow clone -r (issue2164) * subrepo: fix repo root path handling in svn subrepo * subrepo: propagate and catch push failures * templates: document missing template variables * util: fix default termwidth() under Windows * util: use an explicit prefix for checkexec/checklink temporary files + Extensions * convert/cvs: skip bad tags * convert/git: check status when reading output stream * convert/subversion: fix default URL checker prototype * mq: rewrite strip docstrings * mq: use util.unlink instead of os.unlink and os.removedirs * schemes: fix // breakage with Python 2.6.5 (issue2111) * Fix "bashism in /bin/sh hgeditor script" (changing shebang line) (Closes: #581122) -- Vincent Danjean Tue, 11 May 2010 11:01:25 +0200 mercurial (1.5.1-2) unstable; urgency=low * Refresh debian patches * Install localization files in the right place (Closes: #577132) -- Vincent Danjean Sat, 10 Apr 2010 06:58:38 +0200 mercurial (1.5.1-1) unstable; urgency=low * New upstream release -- Vincent Danjean Fri, 02 Apr 2010 10:45:26 +0200 mercurial (1.5-1) unstable; urgency=low * New upstream release + Fix "Reserved revnos aren't." (Closes: #552423) + Fix "Exception in zeroconf shows up in unrelated commands" (Closes: #572963) + Fix "/usr/bin/hg: HG(1) missing --config option syntax" (Closes: #548413) + Fix "A -> B, C -> A rename breaks diff --git" (Closes: #560386) -- Vincent Danjean Fri, 12 Mar 2010 15:10:33 +0100 mercurial (1.4.3-1) unstable; urgency=low * New upstream release. (Closes: #569612) * Updated Standards-Version to 3.8.4 (no change needed) * Remove Gerardo Curiel in the maintainer field as asked by the MIA team (Closes: #553101) * Do not install mercurial.el. It is only useful with emacs21 that will not be in sqeeze. (Closes: #557211) * Add a note in NEWS about the disparition of the alias extension (Closes: #536533) -- Vincent Danjean Mon, 15 Feb 2010 18:08:57 +0100 mercurial (1.4.1-1) unstable; urgency=low * New upstream release -- Vincent Danjean Thu, 03 Dec 2009 22:03:06 +0100 mercurial (1.4-1) unstable; urgency=low [ Vernon Tang ] * New upstream release. - /usr/share/doc/mercurial-common/examples/hg-relink gone (replaced by the relink extension) * Updated Standards-Version to 3.8.3. [ Vincent Danjean ] * adjust quilt dependency so that it works with backports (ie quilt >> 0.46-6 instead of quilt >= 0.46-7) -- Vincent Danjean Thu, 19 Nov 2009 22:02:54 +0100 mercurial (1.3.1-1) unstable; urgency=low * New Upstream Version (mostly bugfixes) -- Vincent Danjean Thu, 23 Jul 2009 22:49:32 +0200 mercurial (1.3-2) unstable; urgency=low * Do not hardcode the python interpreter in the hg script (ie use python and not pythonX.Y...) [thanks Vernon Tang] -- Vincent Danjean Thu, 09 Jul 2009 17:21:25 +0200 mercurial (1.3-1) unstable; urgency=low [ Vincent Danjean ] * [debian/control] add version to the quilt dependency. "dh --with quilt" is only supported since quilt 0.46-7 (thanks Faheem Mitha and Zed Pobre) (Closes: #529700, #534589). [ Luca Falavigna ] * Changes for Python 2.6 transition (Closes: #532190): - Pass --install-layout=deb option to setup.py install call. - Bump python-all-dev dependency to >= 2.5.4-1~. [ Vernon Tang ] * New upstream release. (closes: #536009) - Experimental support for sub-repositories - Fixed support for HTTPS through proxies (closes: #498711) - Experimental share extension - Updated translations and numerous small changes and bug fixes * Updated Standards-Version to 3.8.2. -- Vincent Danjean Wed, 08 Jul 2009 17:03:39 +0200 mercurial (1.2.1-3) unstable; urgency=low * Only install (or remove) files in packages we are building (Closes: #529803) Who knows how dh_install detect if we are building arch-dep and/or arch-indep packages ? -- Vincent Danjean Wed, 27 May 2009 01:46:40 +0200 mercurial (1.2.1-2) unstable; urgency=low * rebuild (forgot to upload arch-all in previous upload) -- Vincent Danjean Tue, 19 May 2009 11:01:15 +0200 mercurial (1.2.1-1) unstable; urgency=low [ Vernon Tang ] * New bugfix upstream release. (Closes: #525403) - fixed version number build from tarball - fix allow_read logic for hgweb - improve handling of damaged revlogs in verify - keep .orig files when resolving - clear resolve state properly when rebasing - improve --command handling with bisect - fix diff against bundles - improve fetch logic for inactive branches - fix diffstat with notify - fix 'synthetic file adds' in CVS conversion [ Vincent Danjean ] * Dump Standards-Version (no change needed) * Switch to dh7 instead of cdbs (last releases of cdbs was breaking the build system) (Closes: #522426, #527504) -- Vincent Danjean Mon, 18 May 2009 19:43:53 +0200 mercurial (1.2-1) unstable; urgency=low * New upstream release. * Fix FTBFS with python-support 0.90 by removing dependence on python-support internals. (closes: #516269) -- Vernon Tang Fri, 06 Mar 2009 17:37:45 +0800 mercurial (1.1.2+hg20090217-7787-b8d750daadde-1) experimental; urgency=low [ Vernon Tang ] * New snapshot for feature freeze before next major release. * debian/patches: - deb_specific__mergetools: remove RCS merge from merge tools - Added: - proposed_upstream__dont-install-i18n - Dropped: - convert-darc-doc.patch: dropping for now to avoid fuzzing translations - backport__zeroconf-doc - Refreshed: - deb_specific__install-templates-separately - deb_specific__mergetools * debian/control: - Add gettext to build dependencies for compiling translations - Remove RCS merge from Recommends - Change merge tool Recommends to Suggests, add xxdiff [ Vincent Danjean ] * swich to debhelper 7. Debhelper 5.0.37.2 is not enought: 6.0.7 at least is required for dh_lintian to be called. * Fix version to hg hash (instead of 'unknown') for this snapshot * Fix upstream version in changelog * Upload to experimental -- Vincent Danjean Wed, 18 Feb 2009 16:24:23 +0100 mercurial (1.1.2-2) unstable; urgency=low * debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't do it when upgrading (closes: #512155) * debian/control: mercurial-common replaces all earlier versions of mercurial -- Vernon Tang Sun, 18 Jan 2009 10:39:58 +0800 mercurial (1.1.2-1) unstable; urgency=low [ Vernon Tang ] * New upstream release (closes: #499846) Also resolves the following Debian bugs: - mq corrupts repository on file rename (closes: #503997) - failing import breaks Python help (closes: #476885) - hg email doesn't use correct encoding (closes: #427854) - error when loading extensions twice (closes: #447088) - static-http does not work with old layout repositories (closes: #494889) - hgwebdir.cgi goes into endless loop when viewing moved files (closes: #506694) * Install hg-ssh (ssh login shell for an hg server) system-wide. * Don't enable extensions by default. (closes: #511872, #503865, #491109) * debian/control: - Moved dependencies to mercurial-common where appropriate - Removed Recommends: python-beaker (not a Mercurial dependency) - Removed 'convert' extension dependencies from Suggests: (convert depends on many of the other SCMs it can convert from) - Added python-openssl to Suggests for "hg serve" HTTPS support. * debian/hgext.rc: updated for 1.1.2. * debian/mercurial*, debian/rules: general cleanup. * debian/README.Debian: updated, proofread, and corrected. * debian/patches: - Added headers. - Added: - deb_specific__install-templates-separately (patch template search path to /usr/share instead of symlinking from the module directory) - backport__zeroconf-doc, proposed_upstream__correct-zeroconf-doc - deb_specific__mergetools - Renamed deb_specific__ElementTree_for_darcs.patch to deb_specific__optional-dependencies and updated to suggest Debian packages for more optional dependencies - Dropped: - proposed_upstream__extension_syntax.patch - deb_specific__FAQ_subst.patch - deb_specific__bash_completion_global_option_already_set.patch - backport__CVE-2008-2942-fix.patch - backport__svn1.5-fix.patch - Refreshed: - deb_specific__use_sensible-editor.patch - deb_specific__hgk.py.patch - convert-darc-doc.patch [ Sandro Tosi ] * debian/control - switch Vcs-Browser field to viewsvn [ Marco Rodrigues ] * debian/control: + Add ${misc:Depends} to Depends to remove lintian warning. [ Vincent Danjean ] * Document the fact that extensions are not enabled by default anymore in the NEWS file * big thanks to Vernon Tang for its work * upload the package -- Vincent Danjean Sat, 17 Jan 2009 17:33:46 +0100 mercurial (1.0.1-5.1) unstable; urgency=high * Non-maintainer upload by the Security Team. * Honor allowpull configuration setting from hgrc on a repository clone to prevent information disclosure (CVE-2008-4297; Closes: #500781). -- Nico Golde Fri, 03 Oct 2008 16:25:13 +0200 mercurial (1.0.1-5) unstable; urgency=low * Fix debian/copyright (GPL-2 only and not GPL-2+) (Closes: #493967) -- Vincent Danjean Tue, 26 Aug 2008 15:28:20 +0200 mercurial (1.0.1-4) unstable; urgency=low * fix subversion 1.5 compatibility (Closes: #492244) using upstream patch * fix bashism in postinst -- Vincent Danjean Thu, 31 Jul 2008 14:27:51 +0200 mercurial (1.0.1-3) unstable; urgency=low * debian/control: + update Standard-Version (no change needed) + add python-beaker as recommends (needed for "hg serve") (Closes: #486299) * fix wrong ucf registration (/etc/hgrc.d/ vs /etc/mercurial/hgrc.d/) (Closes: #487089). Thanks Max Bowsher for noticing. * add a mention to "legacy Darcs 1 format" in convert documentation (Closes: #485887) -- Vincent Danjean Tue, 08 Jul 2008 20:40:05 +0200 mercurial (1.0.1-2) unstable; urgency=high * Backport from upstream: fix CVE-2008-2942 Insufficient input validation (Closes: #488628) -- Vincent Danjean Tue, 01 Jul 2008 18:44:19 +0200 mercurial (1.0.1-1) unstable; urgency=low * New upstream release + Bugfix release * debian/watch: do not call uupdate -- Vincent Danjean Sat, 31 May 2008 19:26:16 +0200 mercurial (1.0-7) unstable; urgency=low * Lowering versioned dependency on ucf. Etch version of ucf is enought. #479485 was using a pre etch version of ucf. -- Vincent Danjean Mon, 26 May 2008 09:25:45 +0200 mercurial (1.0-6) unstable; urgency=low * add versionned dependency on ucf due to the use to ucfr (Closes: #479485) * re-add rcs as first alternative of recommands. Discussion about this can be found in #460943 and #479077 (Closes: #479077) -- Vincent Danjean Wed, 21 May 2008 10:04:32 +0200 mercurial (1.0-5) unstable; urgency=low * Add a note in the NEWS file about upstream change for merging conflicts. (Closes: #481553, ) * install mergetools.hgrc system wide (Closes: #481089) * add suggest and documentation for convert extension dependencies (Closes: #477652) -- Vincent Danjean Tue, 20 May 2008 22:46:57 +0200 mercurial (1.0-4) unstable; urgency=low * fix build system so that "hg version" works * fix typos in doc (darcs instead of darc) * remove suggests: for foreign SCM. If someone needs them for the convert extension, they should be already installed (Closes: #476342) -- Vincent Danjean Wed, 16 Apr 2008 10:05:53 +0200 mercurial (1.0-3) unstable; urgency=low * really fix auto-enabling extensions at installation time + be less strict with spaces + reformat the hgext.rc file to be consistent -- Vincent Danjean Tue, 15 Apr 2008 10:32:38 +0200 mercurial (1.0-2) unstable; urgency=low * fix typo in mercurial postinst * remove Suggests to non existant mercurial-web * add lintian-override for non depends on "tk8.4 | wish" in mercurial-common (the Suggests: is in the mercurial package as for all other extensions' dependencies) * fix handling of automatic enabled extension in postinst (they must be disabled in the installed template) * add detection of inotify extension before enabling it (needed on etch that has a too old libc) -- Vincent Danjean Mon, 07 Apr 2008 09:06:04 +0200 mercurial (1.0-1) unstable; urgency=low * new upstream version Closes several Debian bugs: * "hg convert broken" (Closes: #472185) * "hgmerge: uses non-POSIX syntax `type' in /bin/sh script" (Closes: #447094) * "hgmerge: --help option gives a message that ends strangely" (Closes: #443428) * "mercurial: hg/editor interaction leaves a lot of temp files around" (Closes: #472943) * "mercurial: Mercurial merge with meld needs hint" (Closes: #466006) * "glog: tries to close closed fd" (Closes: #454326) * "mercurial: `hg diff` can break UTF-8 encoding" (Closes: #469326) * "Recording mtime after recording commit message leads to hidden (lost) changes" (Closes: #452385) General: * greatly improved merge tool configuration, see "hgrc.5.txt" for details * improved copy/rename handling in diffs, status, and merge * files in .hg inherit permissions from .hg/store * infer --repository when possible, so commands may be run from anywhere. * easy-installable * new "droplet" logo Commands: * archive: disable ".hg_archival.txt" file addition with "ui.archivemeta" * bisect: now built-in with greatly improved performance and usability * bundle: new --all option to bundle the whole repository more easily. * cat: apply decode filters with --decode * clone: can clone from a full-history bundle * commit: warn when creating a new head * debugancestor: index argument is now optional * diff: set the number of context line to show with -U/--unified * grep: display matched revisions commit date with --date * import: new --no-commit and --user options * incoming/outgoing: add --limit option * log: use -b/--only-branch to show revisions of a single branch * remove: improve handling for --after * revert: major speedup * serve: prefix the served path with --prefix (also in [web] section) * status: unknown files are skipped by --quiet * tag: allow multiple tags to be added or removed * tags: --verbose flags local tags * update: switch between named branches without -C Extensions: * churn: promoted to an official extension (previously in contrib) * color: new extension coloring "status" and "qseries" command outputs * convert: * allow synthetic history to be spliced in with --splicemap * support GNU Arch and Monotone sources * svn: allow shallow conversions of single branches with convert.svn.startrev option. * svn: make trunk/branches/tags layout detection more flexible by allowing either of them to be skipped. * svn: preliminary support as a conversion target * hgk: configuration file changed from .gitk to .hgk * highlight: new extension enabling syntax highlighting in hgweb file view (requires pygments) * inotify: new extension using Linux 2.6 inotify API for instant status checking * keyword: new extension for filewise RCS-keyword expansion in working directory * mq: new --currentdate, --date, --currentuser, and --user options * record: add "qrecord" command when used with mq Web interface: * improved WSGI integration and compatibility * follow symlinks in hgwebdir collections * show branches in most of gitweb templates * add line anchors to annotate, changeset, diff and file views * support web.baseurl in hgwebdir, overriding SCRIPT_NAME Hooks: * standard hook to reject text files with CRLF in win32text extension * redirect stdout to stderr for ssh and http servers [ Gerardo Curiel ] * Split package to fix lintian warnings: + mercurial - main package + mercurial-common - Arch-indep bits * Fix clean target * Dropped patches: patches/proposed_upstream__check_hgmerge_args.patch patches/proposed_upstream__type_is_not_posix.patch * patches/deb_specific__use_sensible-editor.patch: Rediff against mercurial 1.0 * hgmerge shell script is not provided anymore * contrib/favicon.ico is not provided anymore * Deleted obsolete link_hgit target from debian/rules * Added mergetools.hgrc to the examples directory * Added logo-droplets.svg to /usr/share/mercurial * Added new extensions to the hgext.rc file + hgext.color (not enabled by default) + hgext.highlight (not enabled by default) + hgext.inotify (enabled, Closes: #472583) + hgext.keyword (not enabled by default) * Removed extensions from the hgext.rc file + hgext.hbisect (now provided as a built-in command) * Added new suggested dependencies : + python-pygments (needed for hgext/highlight.py) + python-elementtree (for darcs conversion) [ Vincent Danjean ] * import mercurial in the Python Application Packaging Team project * debian/control: + add PAPT in the Uploaders field + add Vcs-* fields + add conflicts/replaces fields to ensure proper upgrade for mercurial-common * cleanup debian/ files + remove unneeded debian/*.{dirs} files * move examples/ in usr/share/doc/mercurial (in the mercurial-common package) * manage hgext.rc with ucf. Enabling some extensions only if their dependencies are present * put all usr/share/python-support/* in mercurial-common instead of mercurial. This trigger a lintian warning but this is an error (see #473428) [ Piotr Ożarowski ] * New recommended packages: + python-mysqldb (hgext/bugzilla.py) + python-openssl (hgweb/server.py) * New suggested packages: + python-flup (contrib/hgwebdir.fcgi, Closes: #466731) [ William Pitcock ] * patches/deb_specific__use_sensible-editor.patch: +Rediff against 1.0 branch. -- Vincent Danjean Mon, 07 Apr 2008 00:11:40 +0200 mercurial (0.9.5-3) unstable; urgency=low * [debian/control] + Recommends rcs first (and before kdiff3) as hgmerge use it in first (and does not use another program if it exists) (Closes: #460943) As an additionnal value, rcs has really fewer dependencies + Move Homepage: from description to source stanza + Suggest qct instead of commit-tool (better developed upstream) + Bump standard-version to 3.7.3 (no change needed) + Add python-elementtree to suggest (needed for hg convert with darcs repo) (Closes: 459353) Should be removed when debian will switch to python2.5 (as it is included in it) + move tk8.4 | wish from recommends to suggests as it is needed by an extension (hgk) and not by the core package * [debian/README] + document that extension dependencies are listed as Suggests: * [debian/patches/deb_specific__use_VISUAL_envvar.patch] Rewrite the patch using sensible-editor (Closes: 448376) and rename it to deb_specific__use_sensible-editor.patch * [debian/rule] + rewrite the fix for cdbs/dh_python so that we depend on the current python version (Closes: #456556) -- Vincent Danjean Mon, 21 Jan 2008 20:57:27 +0100 mercurial (0.9.5-2) unstable; urgency=low * Apply patch to change 'hgext/' into 'hgext.' when loading an extension Current config files use the documented syntax (ie 'hgext.extname=') Users can use 'hgext/extname=' in their hgrc if they want to (Closes: #447088) -- Vincent Danjean Fri, 02 Nov 2007 11:59:03 +0100 mercurial (0.9.5-1) unstable; urgency=low * New upstream release Closes: #435636 (erroneous multiple heads after commit) Closes: #427808 (hgweb/hgwebdir do not work with flup (FastCGI)) Closes: #418780 (partial hgweb listings) Closes: #440175 (please include record extension) Closes: #447663 (0.9.5 available) Closes: #427851 (RSS feeds have wrong URL with https) New features: * Handle symlinks on systems without symlink support * hg archive supports symlinks * Display executable/symlink bit with "hg manifest -v" (see UpgradeNotes) * Improved hg verify diagostics * Faster revlog handling * Faster handling of large directories * Greatly improved handling of large files * Atom syndication support in hgweb * Improved test suite with parallel execution Fixes: * Fixes for some file copy and rename corner cases * Allow moving newly-added files before commit * Improve hg diff whitespace handling * Disallow fast-forward merge with an ancestor * Fix adding untracked files on directory renames * Fix hg archive %r format specifier * Fix re: and glob: patterns in .hgignore * Improve hg executable path resolution * Many options and hgrc parsing improvements * Better handling of VFAT filesystems on Linux * Fix tgz archival on Windows * Fix hg serve on Windows requiring pywin32 modules * Fix --profile under Windows New extensions: * alias - allow user-defined command aliases * children - show the children of the given or working dir revision * imerge - incremental interactive merging * interhg - modify changelog text as in InterWiki * record - darcs-style interactive change selection during commit New extension features: * convert * Now supports Subversion, Darcs and Mercurial as source SCMs * Use clone's behaviour for the default destination name * Force encoding to UTF-8 for converted repository * Support new-style .cvspass file format * Filter the files and directories to import * Remap paths to new locations during import * hgk * Fix hgk stopping because of untrusted repository warnings * Handle filenames with spaces * Improved documentation * mq * Autodetect --git patches on qrefresh * Improve README.Debian about Emacs Closes: #446972 (mercurial.el: autoload) Thanks to Trent W. Buck for its explainations added to the README.Debian * Apply several patches to hgmerge: - use /bin/bash for hgmerge: 'type' is not POSIX (Closes: #447094) - patch hgmerge to do minimum check of its arguments (Closes: #443428) - use $VISUAL and default to 'editor' instead of 'vi' (Closes: #447095, #448376) [mercurial/command.py modified too] * Correct wrong link to web docs in README.Debian (Closes: #425841) * [debian/control] Recommends: meld (used to hgmerge) (Closes: #316347) -- Vincent Danjean Mon, 29 Oct 2007 10:22:45 +0100 mercurial (0.9.4-1) unstable; urgency=low * New upstream release (Closes: #430714) + New features: * support for symlinks * improved tag handling * improved merge handling of file and directory renames * improved named branch usability * numerous improvements to commands * generic pre- and post-command hooks * improved Windows support * basic BeOS and OpenVMS support * numerous bug fixes + New extensions and contributions: * extensions can now be specified in .hg/hgrc * new convert extension with CVS support * new graphlog extension * improved patchbomb extension * example FastCGI script -- Vincent Danjean Wed, 27 Jun 2007 00:33:27 +0200 mercurial (0.9.3-2) unstable; urgency=low * [debian/rule, debian/control] remove workaround for symlink support in python-support and bump dependency of python-support (>= 0.4.3) * [debian/rule] use default python interpreter as 2.4 is the default now * [debian/mercurial.postinst] remove old /usr/lib/python*/site-packages/{mercurial,hgext} directories if needed (Closes: #382252) * forgot to closes: #382185 since 0.9.2 upstream release (hgrc manual does not say [smtp] host is optional any more) -- Vincent Danjean Wed, 3 Jan 2007 14:22:10 +0100 mercurial (0.9.3-1) unstable; urgency=low * New upstream release + Bug fixes: - fix a merge copy/rename corner case - fix spurious new heads message with push -r - fix hg export %n sequence numbers - fix shell quoting on Windows - fix charset encoding for hgwebdir and obfuscated addresses - fix missing generated files for distribution tarball - fix convert-repo tag updates and transcoding of committer - add instructions for redoing failed merges + Documentation fixes: - hg cat, manifest, and tag default to current parent revision. - CGI stub comments clarified - corrected synopses for many commands - improve doc building and distribution - convert-repo: update usage information + Extension fixes: - mq: fix strip on Windows - mq: fix some guards corner cases - gpg: make 'hg sign' default to current parent -- Vincent Danjean Tue, 19 Dec 2006 11:25:55 +0100 mercurial (0.9.2-3) unstable; urgency=low * remove debian/patches/submitted_upstream__restore_hgk.py.patch as it is now included in the release (and avoid to use a old hgk.py with a recent hg) (Closes: #403282) -- Vincent Danjean Sat, 16 Dec 2006 15:51:13 +0100 mercurial (0.9.2-2) unstable; urgency=low * [debian/rules] add support for python2.5 * [README.Debian] update list of default extensions -- Vincent Danjean Thu, 14 Dec 2006 15:26:10 +0100 mercurial (0.9.2-1) unstable; urgency=low * New upstream release + New features: - merge now follows renames and copies - new layout protects against case-insensitivity issues - new branch and branches commands for managing named branches - push command accepts -r for pushing specified heads or named branches - proper storage of changelog and other metadata in UTF-8 - log, annotate and grep '--follow' follow renames and copies - date parsing is improved and log, update, and revert accept --date ranges - additional command options for log, status, addremove - improved schema for hgweb URLs - bundle can now use '-r' and '--base' removing the need of an base repository - support for git-style extended patches with --git option - new debuginstall command to check for common installation issues + New contributions and extensions: - mq - support for quilt-style guards - can import existing changesets into mq ('qimport -r') or commit mq patches as regular changesets ('qdel -f') - edit the log message with 'qrefresh -e' - rename patches with 'qrename' - qheader to display the patch header of particular patches, and '--summary' for qseries, qapplied, qunapplied and qtop - combine patches with 'qfold' - qrefresh supports pattern options to import only a subset of the changes into a patch, to help split changes into multiple patches - patch names for applied patches act like local tags, and can be used in the revision arguments of any hg command - hgk - browse a subset of the history with '--limit' and revision range arguments - shows revision numbers as well as node hashes - churn: graph lines of code changed per user over a range of history - patchbomb: generate inline attachments with '-a' + Behavior changes: - hg cat defaults to the working directory revision rather than tip - hg manifest no longer shows internal file revision hashes by default - hg revert now requires the -a flag to revert all files + Developer notes: - new high-level API functions in the 'hg' module - new context API simplifies many operations - The changelog can now include arbitrary metadata in key: value form * [debian]: include the churn extension and enable it by default -- Vincent Danjean Thu, 14 Dec 2006 13:05:01 +0100 mercurial (0.9.1+20061210+8c24b6fd5866-1) experimental; urgency=low * New upstream release snapshot before 0.9.2 release * [debian/control] : update maintainer field : I'am DD now :-) -- Vincent Danjean Sun, 10 Dec 2006 22:40:30 +0100 mercurial (0.9.1-1) unstable; urgency=low * New upstream release Major changes between Mercurial 0.9 and 0.9.1: New features: - You can now configure your 'hgweb' server to let remote users 'push' changes over http. - You can now 'import' a patch in a mail message by saving the mail message, and importing it. This works for patches sent either inline or as attachments. - The 'diff' command now accepts '-rA:B' syntax as a synonym for '-r A -r B', and adds '-b' and '-B' options. New contributions and extensions: - The 'acl' extension lets you lock down parts of a repository against incoming changes - The 'extdiff' extension lets you run your favourite graphical change viewer - Comprehensive integration with the 'vim' editor - A restricted shell for 'ssh'-hosted repositories - An importer for 'darcs' repositories New hooks added: - 'preupdate' is run before an update or merge in the working directory. - 'update' is run after an update or merge in the working directory. Behaviour changes: - NOTE: Mercurial as installed by the Windows binary installer no longer performs automatic line-ending conversion for Unix/Linux compatibility. To re-enable this feature, edit your 'mercurial.ini' file after you upgrade. - The Windows binary installer now automatically adds 'hg' to your '%PATH%'. - The 'backout' command now runs an editor by default, to let you modify the commit message for a backed-out changeset. - An earlier problem with parsing of tags has been fixed. This makes tag parsing slower but more reliable. Memory usage and performance improvements: - The 'remove' command has been rewritten to be hundreds of times faster in large repositories. - It is now possible to 'clone' a repository very quickly over a LAN, if the server is configured to allow it. See the new 'server' section in the 'hgrc' documentation. Other changes of note: - Mercurial will now print help for an extension if you type 'hg help EXT_NAME'. - The usual array of bug fixes and documentation improvements. - The integrated web server is now more WSGI-compliant. - Work has begun to solidify Mercurial's API for use by third-party packages. -- Vincent Danjean Tue, 25 Jul 2006 19:21:13 +0200 mercurial (0.9-9) unstable; urgency=low * Force the use of python2.4 with a sed command. A race condition on some autobuilders makes that workaround needed. (Really closes: #378835) -- Vincent Danjean Thu, 20 Jul 2006 17:59:35 +0200 mercurial (0.9-8) unstable; urgency=low * do not use default python but python2.4 instead for hg : most code is python2.3 compatible (so we still compile .py files for pyhton2.3) but "hg help" need features for python2.4 Closes: #378835 Thanks David Douard for reporting this. * adding missing manpage hgignore (Closes: #378502) Thanks Baruch Even for reporting this. * remove hack in postinst (dpkg not replacing directory by symlink) as it is no more useful (directory was in /usr/lib/python2.3, symlink in now in /usr/lib/python2.4) * Create symlinks for the templates directory within the mercurial directory (and not in another python serch path) (Closes: #378538) -- Vincent Danjean Wed, 19 Jul 2006 12:25:30 +0200 mercurial (0.9-7) unstable; urgency=low * mercurial will use the default python interpreter -- Vincent Danjean Tue, 11 Jul 2006 23:12:14 +0200 mercurial (0.9-6) unstable; urgency=low * update to the new python policy * reenable the fix for #362487 as python2.3 is useable again -- Vincent Danjean Tue, 4 Jul 2006 00:19:50 +0200 mercurial (0.9-5) unstable; urgency=low * call dh_python with -V 2.4 argument -- Vincent Danjean Mon, 29 May 2006 09:18:53 +0200 mercurial (0.9-4) unstable; urgency=low * [debian/copyright] add copyright for Debian packaging * [debian/NEWS] talk about python2.3->python2.4 transition -- Vincent Danjean Wed, 17 May 2006 00:28:48 +0200 mercurial (0.9-3) unstable; urgency=low * [debian/compat] debhelper compat version dumped to 5 -- Vincent Danjean Sun, 14 May 2006 21:27:43 +0200 mercurial (0.9-2) unstable; urgency=low * fix a bug in update/revert (patch from Vadim Gelfer already applied upstream) * [debian/control] build-depend on python as dh_python require it (package did not fail to build due to an indirect build-dependency but it is safer like that) -- Vincent Danjean Fri, 12 May 2006 19:30:44 +0200 mercurial (0.9-1) unstable; urgency=low * New upstream release Major changes between Mercurial 0.8.1 and 0.9: - The repository file format has been improved. - This has resulted in an average 40% reduction in disk space usage. - The new format (called RevlogNG) is now the default. - Mercurial works perfectly with both the old and new repository file formats. It can transfer changes transparently between repositories of either format. - To use the new repository format, simply use `hg clone --pull` to clone an existing repository. - Note: Versions 0.8.1 and earlier of Mercurial cannot read RevlogNG repositories directly, but they can `clone`, `pull` from, and `push` to servers that are serving RevlogNG repositories. - Memory usage has been improved by over 50% for many common operations. - Substantial performance improvements on large repositories. - New commands: - 'archive' - generate a directory tree snapshot, tarball, or zip file of a revision - Deprecated commands: - 'addremove' - replaced by 'add' and 'remove --after' - 'forget' - replaced by 'revert' - 'undo' - replaced by 'rollback' - New extensions: - Bugzilla integration hook - Email notification hook - Nested repositories are now supported. Mercurial will not recurse into a subdirectory that contains a '.hg' directory. It is treated as a separate repository. - The standalone web server, 'hg serve', is now threaded, so it can talk to multiple clients at a time. - The web server can now display a "message of the day". - Support added for hooks written in Python. - Many improvements and clarifications to built-in help. * [debian/control] set Standard-Version to 3.7.2 (no changes required) -- Vincent Danjean Thu, 11 May 2006 01:00:03 +0200 mercurial (0.8.1-6) unstable; urgency=low * cleanup patches applied on top of upstream sources send the interesting one to upstream before the 0.9 release -- Vincent Danjean Thu, 27 Apr 2006 03:20:24 +0200 mercurial (0.8.1-5) unstable; urgency=low * use python2.4 instead of standard python (2.3 for now): this allows to use hglib backend with tailor * several minor fixes so that tailor works with the 'hglib' backend these are submitted upstream * hardcode python interpreter in script instead of using /usr/bin/env as suggested by the python policy * remove previous hack (dpkg not replacing directory by symlink) as it is no more useful (directory was in /usr/lib/python2.3, symlink in now in /usr/lib/python2.4) -- Vincent Danjean Mon, 17 Apr 2006 12:21:24 +0200 mercurial (0.8.1-4) unstable; urgency=low * directory doesn't get replaced by symlink (Closes: #362487) and dpkg does not say anything ! Thanks Norbert Tretkowski -- Vincent Danjean Fri, 14 Apr 2006 00:38:10 +0200 mercurial (0.8.1-3) unstable; urgency=low * Really fix #361897 (Thanks Darren Salt again) -- Vincent Danjean Wed, 12 Apr 2006 20:33:45 +0200 mercurial (0.8.1-2) unstable; urgency=low * Fix new tag syntax for hgk. Thanks Darren Salt (Closes: #361897) -- Vincent Danjean Tue, 11 Apr 2006 13:25:04 +0200 mercurial (0.8.1-1) unstable; urgency=low * New upstream release Major changes from 0.8 to 0.8.1: - new extensions: mq (manage a queue of patches, like quilt only better) (Closes: #343824) email (send changes as series of email patches) - new command: merge (replaces "update -m") - improved commands: log (--limit option added), pull/push ("-r" works on specific revisions), revert (rewritten, much better) - comprehensive hook support - output templating added, supporting e.g. GNU changelog style - Windows, Mac OS X: prebuilt binary packages, better support - many reliability, performance, and memory usage improvements -- Vincent Danjean Mon, 10 Apr 2006 22:09:16 +0200 mercurial (0.8-3) unstable; urgency=low * Fix typo in long description -- Vincent Danjean Tue, 4 Apr 2006 03:30:22 +0200 mercurial (0.8-2) unstable; urgency=low * Add documentation about extensions packaged for Debian. -- Vincent Danjean Tue, 31 Jan 2006 11:14:52 +0100 mercurial (0.8-1) unstable; urgency=low * New upstream release Major changes from 0.7 to 0.8: - faster status, diff, and commit - reduced memory usage for push and pull - improved extension API - new bisect, gpg, hgk, and win32text extensions - short URLs, binary file handling, and optional gitweb skin for hgweb - numerous new command options including log --keyword and pull --rev - improved hooks and file filtering -- Vincent Danjean Mon, 30 Jan 2006 16:06:34 +0100 mercurial (0.7+20060110+0d36e3d7e2ea-1) experimental; urgency=low * package test to try upstream sources before 0.8 -- Vincent Danjean Tue, 10 Jan 2006 22:47:38 +0100 mercurial (0.7-8) unstable; urgency=low * Closes: #343459: correct FAQ URL * Closes: #343458: fix directory completion * Closes: #343472: clone does not work with path aliases (Thanks Daniel Kobras for these three bugreports with patch) -- Vincent Danjean Tue, 3 Jan 2006 21:13:23 +0100 mercurial (0.7-7) unstable; urgency=low * Add support for alias st for hg status (Closes: #340235) (backport from tip, thanks Michael Gebetsroither ) -- Vincent Danjean Tue, 22 Nov 2005 13:01:39 +0100 mercurial (0.7-6) unstable; urgency=low * Backport of the patch "fix handling of daylight saving time" from upstream (Closes: #336646) -- Vincent Danjean Wed, 2 Nov 2005 06:17:04 +0100 mercurial (0.7-5) unstable; urgency=low * Add hgweb.cgi and hgwebdir.cgi in examples (Closes: #332973) -- Vincent Danjean Sat, 15 Oct 2005 11:24:54 +0200 mercurial (0.7-4) unstable; urgency=low * backport from upstream of - use of 'hgext' directory for extensions - 'hgk.py' extension (was hgit before) => 'hg view' works ;-) * add 'Recommands: wish' for the hgk extension -- Vincent Danjean Fri, 23 Sep 2005 11:45:13 +0200 mercurial (0.7-3) unstable; urgency=low * Add system-wide config directory (so that extensions can be easyly added) * Enable hgit extension -- Vincent Danjean Tue, 20 Sep 2005 02:47:16 +0200 mercurial (0.7-2) unstable; urgency=low * Correct changelog.Debian (I forgot to add upstream changes in the previous entry) -- Vincent Danjean Sun, 18 Sep 2005 22:46:14 +0200 mercurial (0.7-1) unstable; urgency=low * New upstream release (Closes: #328725) core improved merge logic improved copy/rename support (still experimental) automatic binary file handling generic file filtering support various performance improvements command line new bundle/unbundle commands for exchanging native updates more natural support for remove, copy, and rename faster, more powerful log command new grep command for searching entire history support for plug-in extensions improved exception handling and debugging facilities hgweb optional downloading of tarballs and zip files Windows support hardlinking support newline conversion through file filtering contrib updated hgk * New package (a bit delayed due to a crash disk and a new job) * Upstream added support for options -h and --help (Closes: #324049) * renamming conffile 'bash_completion' to 'mercurial' (Closes: #325266) -- Vincent Danjean Sat, 17 Sep 2005 16:54:37 +0200 mercurial (0.6c-1) unstable; urgency=low * New upstream release What's new: core functionality ability to use tags to identify branches detect adding new heads with push protocol versioning for push/pull https: support minor merge fixes command line much more powerful path handling incoming/outgoing commands smarter import/export fewer long, confusing hashes to deal with many new command options and settings portability improved portability of test suite and support scripts improved Windows support web interface easy to set up multiple repository interface several new hgrc config options IPv6 support documentation improved built-in help and man pages a steadily growing wiki tutorial in multiple languages extras a highly functional bash auto-completion script a new Emacs mode -- Vincent Danjean Tue, 23 Aug 2005 11:01:36 +0200 mercurial (0.6b-2) unstable; urgency=low * Adds proper python dependencies * Recommends tkdiff or kdiff3 for merge purpose * Suggests meld as this is another merging program that can be used by mercurial (but this needs the user set the HGMERGE variable) * Closes: #316347: Please Recommands: meld -- Vincent Danjean Wed, 17 Aug 2005 10:33:33 +0200 mercurial (0.6b-1) unstable; urgency=low * New upstream release What's new: improved ui new clone command replaces mkdir+init+pull+update new revert command add range support and -p option to log to show patches tags command now supports local tags improved push and pull better exception and signal handling improved option parsing support for user-defined hooks (aka triggers) performance updates even faster import of large sets of patches faster delta generation faster annotate faster status and ignore improved web interface more conformant and compatible HTML output built-in RSS feeds better tags handling fast multiple keyword search portability work support for Windows is nearly complete should easily compile and install on any modern UNIX comes with RPM spec file and script and more doc and help updates improved test suite numerous bug fixes and cleanups -- Vincent Danjean Tue, 12 Jul 2005 11:45:13 +0200 mercurial (0.6-2) unstable; urgency=low * Add meld to Suggest as it is not used by default hgmerge (Closes: #316347: Please Recommands: meld) -- Vincent Danjean Thu, 30 Jun 2005 16:30:33 +0200 mercurial (0.6-1) unstable; urgency=low * New upstream release This release contains a huge number of improvements: improved source tracking multi-head support permission tracking rename and copy tracking improved tag handling friendlier, more robust command line interface integrated help faster startup better exception handling smarter three-way merge helper improved communication faster outstanding changeset detection SSH-based push support non-transparent proxy support improved configuration handling support for .hgrc and .hg/hgrc files save per-repo defaults for pull new delta extension faster, smaller, and simpler than GNU diff or xdiff faster commit, push/pull, and annotate improved interoperability convert-repo framework for importing from other SCMs can work with gitk and git-viz portability improvements tested on big and little-endian 32 and 64-bit UNIX platforms Windows support is nearly complete and much more numerous performance tweaks and bugfixes automated test suite updated docs and FAQ -- Vincent Danjean Sat, 25 Jun 2005 00:15:13 +0200 mercurial (0.5b+20050618-1) unstable; urgency=low * New upstream sources (tip 396:8f8bb77d560e70bcc95577e4dfa877df18d876ab) this fix a alignment bug reported on alpha * many others fix and improvments from upstream * Change short description Closes: #314577: Please spell out the abbreviation in the synopsis -- Vincent Danjean Sat, 18 Jun 2005 10:02:39 +0200 mercurial (0.5b+20050612-2) unstable; urgency=low * Fix spelling mistake (thanks Emanuele Aina) Closes: #314161: Small spelling error in documentation * New package that should solve the FTBFS due to the use of the boggus package debhelper 4.9.0 by autobuilders Closes: #313491: mercurial_0.5b+20050612-1: FTBFS: syntax error at /usr/bin/dh_strip line 191, near 'if' * Closes: #314577: Please spell out the abbreviation in the synopsis -- Vincent Danjean Fri, 17 Jun 2005 11:14:06 +0200 mercurial (0.5b+20050612-1) unstable; urgency=low * New upstream sources -- Vincent Danjean Sun, 12 Jun 2005 11:40:02 +0200 mercurial (0.5b-5) unstable; urgency=low * manually fix wrong build-dependencies that have been previously generated by cdbs (ie remove 'build-essential' and duplicates) -- Vincent Danjean Sat, 4 Jun 2005 09:16:40 +0200 mercurial (0.5b-4) unstable; urgency=low * remove automatic generation of control from control.in (with cdbs dependencies) as requested by ftpmaster to accept this NEW package (see still opened bugs #311724 for more information) -- Vincent Danjean Fri, 3 Jun 2005 08:57:06 +0200 mercurial (0.5b-3) unstable; urgency=low * First official Debian release. (Closes: #308873: ITP: mercurial -- scalable distributed SCM) -- Vincent Danjean Thu, 2 Jun 2005 08:55:53 +0200 mercurial (0.5b-2) unstable; urgency=low * package description improved from the mercurial ML * Add Homepage: to long description (thanks Anibal Monsalve Salazar) * Change Architecture from all to any as mercurial sources now have C files to compile (thanks Anibal Monsalve Salazar) * Update copyright (thanks Anibal Monsalve Salazar) * Add rcs and tkdiff to Recommands as hgmerge use it (only recommands and not depends because if the user set HGMERGE to kdiff3, he does not need them) * use hgmerge if HGMERGE is not set (patch submitted upstream) -- Vincent Danjean Wed, 1 Jun 2005 11:35:20 +0200 mercurial (0.5b-1) unstable; urgency=low * New upstream release -- Vincent Danjean Tue, 31 May 2005 00:00:29 +0200 mercurial (0.5-1) unstable; urgency=low * New upstream release -- Vincent Danjean Sun, 29 May 2005 21:36:55 +0200 mercurial (0.4f-1) unstable; urgency=low * New upstream release * english improved in description (thanks Jay Berkenbilt ) -- Vincent Danjean Sat, 14 May 2005 00:55:40 +0200 mercurial (0.4e-3) unstable; urgency=low * package description improved (thanks Bas Zoetekouw ) -- Vincent Danjean Fri, 13 May 2005 13:46:44 +0200 mercurial (0.4e-2) unstable; urgency=low * update description -- Vincent Danjean Thu, 12 May 2005 23:32:43 +0200 mercurial (0.4e-1) unstable; urgency=low * New upstream release -- Vincent Danjean Thu, 12 May 2005 23:13:54 +0200 mercurial (0.4b-2) unstable; urgency=low * add debian watch file * add depend on tkdiff * correct some lintian warnings -- Vincent Danjean Fri, 29 Apr 2005 12:59:33 +0200 mercurial (0.4b-1) unstable; urgency=low * Initial Release. -- Vincent Danjean Fri, 29 Apr 2005 08:54:25 +0200 debian/mercurial-common.manpages0000664000000000000000000000006312201757705014163 0ustar doc/hg.1 doc/hgrc.5 doc/hgignore.5 debian/hg-ssh.8 debian/watch0000664000000000000000000000031212261306601010212 0ustar # format version number, currently 3; this line is compulsory! version=3 opts="uversionmangle=s/-rc/~rc/,pgpsigurlmangle=s/$/.asc/" \ http://www.selenic.com/mercurial/release/mercurial-(.*)\.tar\.gz debian/source/0000775000000000000000000000000012261312155010466 5ustar debian/source/format0000664000000000000000000000001412201757715011705 0ustar 3.0 (quilt) debian/source/include-binaries0000664000000000000000000000004012261310077013621 0ustar debian/upstream-signing-key.pgp debian/hgext.rc.md5sums0000664000000000000000000000012212201757705012232 0ustar 4c808ced6b7ddc2e3c1514703bc238b9 0.9.5-3 80086669df3007b5b17d7d12efe03775 sarge debian/mercurial.install0000664000000000000000000000017312231000135012527 0ustar debian/tmp/usr/bin debian/tmp/usr/lib debian/hgext.rc usr/share/mercurial/ debian/hgext.rc.md5sums usr/share/mercurial/ debian/cacerts.hgrc0000664000000000000000000000026212201757705011467 0ustar [web] # user can disable this Debian default by overriding this option in ~/.hgrc # and/or using the --insecure command line switch cacerts = /etc/ssl/certs/ca-certificates.crt debian/README.source0000664000000000000000000000004712201757705011356 0ustar See /usr/share/doc/quilt/README.source debian/control0000664000000000000000000000502312266004045010572 0ustar Source: mercurial Section: vcs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Python Applications Packaging Team Uploaders: Vincent Danjean , Javi Merino , Tristan Seligmann Build-Depends: debhelper (>= 9), patchutils (>= 0.2.25), gettext, python-all-dev (>= 2.6.6-3~), python-docutils, python-roman, zip, unzip, bash-completion, netbase, Standards-Version: 3.9.5 Homepage: http://mercurial.selenic.com/ Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/ X-Python-Version: >= 2.4 XS-Testsuite: autopkgtest Package: mercurial-common Architecture: all Depends: ${misc:Depends}, ${python:Depends} Recommends: mercurial (>= ${source:Version}), ca-certificates Suggests: wish, python-mysqldb, python-pygments, python-openssl Breaks: mercurial (<< ${source:Version}) Replaces: mercurial (<< 1.4) Description: easy-to-use, scalable distributed version control system (common files) Mercurial is a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. . This package contains the architecture independent components of Mercurial, and is generally useless without the mercurial package. Package: mercurial Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020), mercurial-common (= ${source:Version}) Recommends: openssh-client, wish, Suggests: qct, vim | emacs, kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff Breaks: hgsubversion (<< 1.5~), hgview (<< 1.7.1-1~), mercurial-git (<< 0.4.0-1~), qct (<< 1.7-2~), Description: easy-to-use, scalable distributed version control system Mercurial is a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. . Its features include: * O(1) delta-compressed file storage and retrieval scheme * Complete cross-indexing of files and changesets for efficient exploration of project history * Robust SHA1-based integrity checking and append-only storage model * Decentralized development model with arbitrary merging between trees * High-speed HTTP-based network merge protocol * Easy-to-use command-line interface * Integrated stand-alone web interface * Small Python codebase . This package contains the architecture dependent files. debian/hgrc0000664000000000000000000000011612216001776010036 0ustar # system-wide mercurial configuration file # See hgrc(5) for more information debian/hgext.rc0000664000000000000000000000545512201757705010654 0ustar # mercurial configuration file for bundled hg extensions # See hgrc(5) for more information # Extensions included in Mercurial listed in alphabetical order [extensions] # changeset access control # hgext.acl = # allow user-defined command aliases # hgext.alias = # provides the 'bookmarks' command # hgext.bookmarks = # bugzilla integration # requires python-mysqldb # hgext.bugzilla = # show the children of the given or working dir revision # provides the 'children' command # hgext.children = # graph count of revisions grouped by template # provides the 'churn' command # hgext.churn = # add color output to status, qseries, and diff-related commands # hgext.color = # converts a foreign SCM to a Mercurial one # provides the 'convert' and 'debugsvnlog' commands # requires: # - bzr to convert from Bazaar # - cvs to convert from CVS # - python-celementtree or python-elementtree to convert from Darcs # - git-core to convert from Git # - tla to convert from GNU Arch # - monotone to convert from Monotone # - python-subversion to convert from Subversion # hgext.convert = # external diff program support # hgext.extdiff = # pull and merge remote changes # provides the 'fetch' command # hgext.fetch = # GnuPG signing # provides the 'sign', 'sigcheck' and 'sigs' commands # requires gnupg # hgext.gpg = # show revision graphs in terminal windows # provides the 'glog' command # hgext.graphlog = # CIA notification hook # hgext.hgcia = # allows browsing the history of a repository in a graphical way # provides the 'view' command # requires wish # hgext.hgk = # syntax highlighting in hgweb # requires python-pygments # hgext.highlight = # lets you split a merge into pieces # provides the 'imerge' command # hgext.imerge = # inotify-based status acceleration for Linux systems # provides the 'inserve' command # hgext.inotify = # allows you to change changelog and summary text # hgext.interhg = # CVS/RCS-like keyword expansion # hgext.keyword = # quilt-like patch queues # provides the 'q*' commands # hgext.mq = # email notifications # hgext.notify = # display output using a pager # hgext.pager = # make it easy to refer to the parent of a revision # hgext.parentrevspec = # send changes as series of email patches # provides the 'email' command # hgext.patchbomb = # removes files not known to mercurial # provides the 'purge' command # hgext.purge = # moves sets of revisions to a different ancestor # provides the 'rebase' command # hgext.rebase = # interactive change selection during commit # provides the 'record' command # hgext.record = # patch transplanting tool # provides the 'transplant' command # hgext.transplant = # non-Unicode MBCS filename support # hgext.win32mbcs = # Unix/Mac/DOS line ending conversion utilities # hgext.win32text = # mDNS/DNS-SD (Zeroconf) support for 'hg serve' # hgext.zeroconf = debian/tests/0000775000000000000000000000000012266004014010325 5ustar debian/tests/control0000664000000000000000000000034412266004014011731 0ustar Tests: testsuite Depends: @, zip, unzip, netbase, python-subversion, monotone, cvs, bzr, tla, darcs Restrictions: allow-stderr #Tests: hgsubversion #Depends: @, hgsubversion Tests: mercurial-git Depends: @, mercurial-git, git debian/tests/hgsubversion0000775000000000000000000000017212233556050012777 0ustar #!/bin/sh exec hg --config extensions.hgsubversion= clone svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/ debian/tests/testsuite0000775000000000000000000000007512227057340012315 0ustar #!/bin/sh exec make tests TESTFLAGS="--with-hg=/usr/bin/hg" debian/tests/mercurial-git0000775000000000000000000000024012244566475013037 0ustar #!/bin/sh git init try cd try git config user.email babar@jungle.org echo a >a git add a git commit -m a cd .. exec hg --config extensions.git= clone try try2 debian/mercurial.dirs0000664000000000000000000000003012216001776012031 0ustar usr/share/doc/mercurial