# HG changeset patch # User Martin Geisler # Date 1246396677 -7200 # Node ID 59bb11a97fe5f61e814bff15729977908f00a250 # Parent 159283d79e69ebc1fc69dae3b1578200eed4f971# Parent 09c6735e388087841e21e443601e00b389fa1b07 Merge with mpm diff -r 159283d79e69 -r 59bb11a97fe5 README --- a/README Tue Jun 30 23:16:38 2009 +0200 +++ b/README Tue Jun 30 23:17:57 2009 +0200 @@ -5,6 +5,6 @@ $ hg debuginstall # sanity-check setup $ hg # see help -See http://www.selenic.com/mercurial/ for detailed installation +See http://mercurial.selenic.com/ for detailed installation instructions, platform-specific notes, and Mercurial user information. diff -r 159283d79e69 -r 59bb11a97fe5 contrib/macosx/Readme.html --- a/contrib/macosx/Readme.html Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/macosx/Readme.html Tue Jun 30 23:17:57 2009 +0200 @@ -25,13 +25,13 @@

Documentation

Visit the Mercurial web site and wiki

There's also a free book, Distributed revision control with Mercurial

Reporting problems

If you run into any problems, please file a bug online:

http://www.selenic.com/mercurial/bts

http://mercurial.selenic.com/bts/

diff -r 159283d79e69 -r 59bb11a97fe5 contrib/macosx/Welcome.html --- a/contrib/macosx/Welcome.html Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/macosx/Welcome.html Tue Jun 30 23:17:57 2009 +0200 @@ -11,10 +11,10 @@ -

This is a prepackaged release of Mercurial for Mac OS X.

-Please be sure to read the latest release notes.

+Please be sure to read the latest release notes.

diff -r 159283d79e69 -r 59bb11a97fe5 contrib/mercurial.spec --- a/contrib/mercurial.spec Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/mercurial.spec Tue Jun 30 23:17:57 2009 +0200 @@ -2,10 +2,10 @@ Name: mercurial Version: snapshot Release: 0 -License: GPL +License: GPLv2 Group: Development/Tools -Source: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz -URL: http://www.selenic.com/mercurial +URL: http://mercurial.selenic.com/ +Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # From the README: @@ -18,10 +18,10 @@ # run-time dependency. # BuildRequires: python >= 2.4, python-devel, make, gcc, asciidoc, xmlto +Provides: hg = %{version}-%{release} %define pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))') -%define pythonlib %{_libdir}/python%{pythonver}/site-packages/%{name} -%define hgext %{_libdir}/python%{pythonver}/site-packages/hgext +%define emacs_lispdir %{_datadir}/emacs/site-lisp %description Mercurial is a fast, lightweight source control management system designed @@ -45,23 +45,26 @@ bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mkdir -p $bash_completion_dir -install contrib/bash_completion $bash_completion_dir/mercurial.sh +install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions mkdir -p $zsh_completion_dir -install contrib/zsh_completion $zsh_completion_dir/_mercurial +install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial -lisp_dir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -mkdir -p $lisp_dir -install contrib/mercurial.el $lisp_dir +mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} +install contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir} + +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d +install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi -%{_mandir}/man?/hg*.gz +%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi +%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz +%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc %{_sysconfdir}/bash_completion.d/mercurial.sh %{_datadir}/zsh/site-functions/_mercurial %{_datadir}/emacs/site-lisp/mercurial.el @@ -71,8 +74,13 @@ %{_bindir}/hg-viz %{_bindir}/git-rev-tree %{_bindir}/mercurial-convert-repo +%dir %{_sysconfdir}/bash_completion.d/ +%dir %{_datadir}/zsh/site-functions/ +%dir %{_sysconfdir}/mercurial +%dir %{_sysconfdir}/mercurial/hgrc.d +%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %if "%{?pythonver}" != "2.4" %{_libdir}/python%{pythonver}/site-packages/%{name}-*-py%{pythonver}.egg-info %endif -%{pythonlib} -%{hgext} +%{_libdir}/python%{pythonver}/site-packages/%{name} +%{_libdir}/python%{pythonver}/site-packages/hgext diff -r 159283d79e69 -r 59bb11a97fe5 contrib/vim/hgcommand.vim --- a/contrib/vim/hgcommand.vim Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/vim/hgcommand.vim Tue Jun 30 23:17:57 2009 +0200 @@ -1226,7 +1226,7 @@ Author: Mathieu Clabaut Credits: Bob Hiestand -Mercurial: http://www.selenic.com/mercurial +Mercurial: http://mercurial.selenic.com/ Mercurial (noted Hg) is a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. diff -r 159283d79e69 -r 59bb11a97fe5 contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/win32/ReadMe.html Tue Jun 30 23:17:57 2009 +0200 @@ -49,7 +49,7 @@

For documentation, please visit the Mercurial web site. + href="http://mercurial.selenic.com/">Mercurial web site. You can also download a free book, Mercurial: The Definitive Guide. @@ -100,7 +100,7 @@ By default, Mercurial will use the merge program defined by the HGMERGE environment variable, or uses the one defined in the mercurial.ini file. (see MergeProgram + href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram on the Mercurial Wiki for more information)

@@ -108,9 +108,9 @@

Before you report any problems, please consult the Mercurial web site + href="http://mercurial.selenic.com/">Mercurial web site and see if your question is already in our list of Frequently + href="http://mercurial.selenic.com/wiki/FAQ">Frequently Answered Questions (the "FAQ").

diff -r 159283d79e69 -r 59bb11a97fe5 contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/win32/mercurial.iss Tue Jun 30 23:17:57 2009 +0200 @@ -8,9 +8,9 @@ LicenseFile=COPYING ShowLanguageDialog=yes AppPublisher=Matt Mackall and others -AppPublisherURL=http://www.selenic.com/mercurial -AppSupportURL=http://www.selenic.com/mercurial -AppUpdatesURL=http://www.selenic.com/mercurial +AppPublisherURL=http://mercurial.selenic.com/ +AppSupportURL=http://mercurial.selenic.com/ +AppUpdatesURL=http://mercurial.selenic.com/ AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} AppContact=mercurial@selenic.com OutputBaseFilename=Mercurial-snapshot @@ -51,7 +51,7 @@ Source: COPYING; DestDir: {app}; DestName: Copying.txt [INI] -Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/ +Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/ [UninstallDelete] Type: files; Name: {app}\Mercurial.url diff -r 159283d79e69 -r 59bb11a97fe5 contrib/win32/postinstall.txt --- a/contrib/win32/postinstall.txt Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/win32/postinstall.txt Tue Jun 30 23:17:57 2009 +0200 @@ -6,4 +6,4 @@ Also check the release notes at: - http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew + http://mercurial.selenic.com/wiki/WhatsNew diff -r 159283d79e69 -r 59bb11a97fe5 contrib/zsh_completion --- a/contrib/zsh_completion Tue Jun 30 23:16:38 2009 +0200 +++ b/contrib/zsh_completion Tue Jun 30 23:17:57 2009 +0200 @@ -13,13 +13,25 @@ # autoload -U compinit # compinit # -# Copyright (C) 2005-6 Steve Borho -# Copyright (C) 2006-8 Brendan Cully +# Copyright (C) 2005, 2006 Steve Borho +# Copyright (C) 2006, 2007, 2008 Brendan Cully +# +# Permission is hereby granted, without written agreement and without +# licence or royalty fees, to use, copy, modify, and distribute this +# software and to distribute modified versions of this software for any +# purpose, provided that the above copyright notice and the following +# two paragraphs appear in all copies of this software. # -# This is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your -# option) any later version. +# In no event shall the authors be liable to any party for direct, +# indirect, special, incidental, or consequential damages arising out of +# the use of this software and its documentation, even if the authors +# have been advised of the possibility of such damage. +# +# The authors specifically disclaim any warranties, including, but not +# limited to, the implied warranties of merchantability and fitness for +# a particular purpose. The software provided hereunder is on an "as +# is" basis, and the authors have no obligation to provide maintenance, +# support, updates, enhancements, or modifications. emulate -LR zsh setopt extendedglob diff -r 159283d79e69 -r 59bb11a97fe5 doc/hg.1.txt --- a/doc/hg.1.txt Tue Jun 30 23:16:38 2009 +0200 +++ b/doc/hg.1.txt Tue Jun 30 23:17:57 2009 +0200 @@ -75,7 +75,7 @@ RESOURCES --------- -http://selenic.com/mercurial[Main Web Site] +http://mercurial.selenic.com/[Main Web Site] http://selenic.com/hg[Source code repository] diff -r 159283d79e69 -r 59bb11a97fe5 doc/ja/hg.1.ja.txt --- a/doc/ja/hg.1.ja.txt Tue Jun 30 23:16:38 2009 +0200 +++ b/doc/ja/hg.1.ja.txt Tue Jun 30 23:17:57 2009 +0200 @@ -852,7 +852,7 @@ 情報源 --- -http://selenic.com/mercurial[主なウェブサイト] +http://mercurial.selenic.com/[主なウェブサイト] http://www.serpentine.com/mercurial[Wiki サイト] diff -r 159283d79e69 -r 59bb11a97fe5 hgext/acl.py --- a/hgext/acl.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/acl.py Tue Jun 30 23:17:57 2009 +0200 @@ -6,7 +6,7 @@ # GNU General Public License version 2, incorporated herein by reference. # -'''control access to a repository using simple hooks +'''hooks for controlling repository access This hook makes it possible to allow or deny write access to portions of a repository when receiving incoming changesets. diff -r 159283d79e69 -r 59bb11a97fe5 hgext/bookmarks.py --- a/hgext/bookmarks.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/bookmarks.py Tue Jun 30 23:17:57 2009 +0200 @@ -257,14 +257,14 @@ node = super(bookmark_repo, self).commit(*k, **kw) if node is None: return None - parents = repo.changelog.parents(node) + parents = self.changelog.parents(node) if parents[1] == nullid: parents = (parents[0],) - marks = parse(repo) + marks = parse(self) update = False for mark, n in marks.items(): if ui.configbool('bookmarks', 'track.current'): - if mark == current(repo) and n in parents: + if mark == current(self) and n in parents: marks[mark] = node update = True else: @@ -272,28 +272,28 @@ marks[mark] = node update = True if update: - write(repo, marks) + write(self, marks) return node finally: wlock.release() def addchangegroup(self, source, srctype, url, emptyok=False): - parents = repo.dirstate.parents() + parents = self.dirstate.parents() result = super(bookmark_repo, self).addchangegroup( source, srctype, url, emptyok) if result > 1: # We have more heads than before return result - node = repo.changelog.tip() - marks = parse(repo) + node = self.changelog.tip() + marks = parse(self) update = False for mark, n in marks.items(): if n in parents: marks[mark] = node update = True if update: - write(repo, marks) + write(self, marks) return result def tags(self): @@ -302,7 +302,7 @@ return self.tagscache tagscache = super(bookmark_repo, self).tags() - tagscache.update(parse(repo)) + tagscache.update(parse(self)) return tagscache repo.__class__ = bookmark_repo diff -r 159283d79e69 -r 59bb11a97fe5 hgext/bugzilla.py --- a/hgext/bugzilla.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/bugzilla.py Tue Jun 30 23:17:57 2009 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''integrate Mercurial with a Bugzilla bug tracker +'''hooks for integrating with the Bugzilla bug tracker This hook extension adds comments on bugs in Bugzilla when changesets that refer to bugs by Bugzilla ID are seen. The hook does not change diff -r 159283d79e69 -r 59bb11a97fe5 hgext/children.py --- a/hgext/children.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/children.py Tue Jun 30 23:17:57 2009 +0200 @@ -8,7 +8,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''display children changesets''' +'''command to display child changesets''' from mercurial import cmdutil from mercurial.commands import templateopts diff -r 159283d79e69 -r 59bb11a97fe5 hgext/churn.py --- a/hgext/churn.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/churn.py Tue Jun 30 23:17:57 2009 +0200 @@ -6,7 +6,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''display statistics about repository history''' +'''command to display statistics about repository history''' from mercurial.i18n import _ from mercurial import patch, cmdutil, util, templater diff -r 159283d79e69 -r 59bb11a97fe5 hgext/color.py --- a/hgext/color.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/color.py Tue Jun 30 23:17:57 2009 +0200 @@ -60,7 +60,7 @@ import os, sys -from mercurial import cmdutil, commands, extensions +from mercurial import cmdutil, commands, extensions, error from mercurial.i18n import _ # start and stop parameters for effects @@ -220,18 +220,30 @@ 'changed': ['white'], 'trailingwhitespace': ['bold', 'red_background']} +_ui = None + def uisetup(ui): '''Initialize the extension.''' + global _ui + _ui = ui _setupcmd(ui, 'diff', commands.table, colordiff, _diff_effects) _setupcmd(ui, 'incoming', commands.table, None, _diff_effects) _setupcmd(ui, 'log', commands.table, None, _diff_effects) _setupcmd(ui, 'outgoing', commands.table, None, _diff_effects) _setupcmd(ui, 'tip', commands.table, None, _diff_effects) _setupcmd(ui, 'status', commands.table, colorstatus, _status_effects) + +def extsetup(): try: mq = extensions.find('mq') - _setupcmd(ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects) - _setupcmd(ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects) + try: + # If we are loaded after mq, we must wrap commands.table + _setupcmd(_ui, 'qdiff', commands.table, colordiff, _diff_effects) + _setupcmd(_ui, 'qseries', commands.table, colorqseries, _patch_effects) + except error.UnknownCommand: + # Otherwise we wrap mq.cmdtable + _setupcmd(_ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects) + _setupcmd(_ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects) except KeyError: # The mq extension is not enabled pass @@ -261,6 +273,15 @@ ]) for status in effectsmap: - effects = ui.configlist('color', cmd + '.' + status) + configkey = cmd + '.' + status + effects = ui.configlist('color', configkey) if effects: - effectsmap[status] = effects + good = [] + for e in effects: + if e in _effect_params: + good.append(e) + else: + ui.warn(_("ignoring unknown color/effect %r " + "(configured in color.%s)\n") + % (e, configkey)) + effectsmap[status] = good diff -r 159283d79e69 -r 59bb11a97fe5 hgext/convert/__init__.py --- a/hgext/convert/__init__.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/convert/__init__.py Tue Jun 30 23:17:57 2009 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''import from foreign VCS repositories into Mercurial''' +'''import revisions from foreign VCS repositories into Mercurial''' import convcmd import cvsps diff -r 159283d79e69 -r 59bb11a97fe5 hgext/extdiff.py --- a/hgext/extdiff.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/extdiff.py Tue Jun 30 23:17:57 2009 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''allow external programs to compare revisions +'''command to allow external programs to compare revisions The `extdiff' Mercurial extension allows you to use external programs to compare revisions, or revision with working directory. The external diff diff -r 159283d79e69 -r 59bb11a97fe5 hgext/gpg.py --- a/hgext/gpg.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/gpg.py Tue Jun 30 23:17:57 2009 +0200 @@ -3,7 +3,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''sign and verify changesets''' +'''commands to sign and verify changesets''' import os, tempfile, binascii from mercurial import util, commands, match diff -r 159283d79e69 -r 59bb11a97fe5 hgext/graphlog.py --- a/hgext/graphlog.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/graphlog.py Tue Jun 30 23:17:57 2009 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -'''show revision graphs in terminals +'''command to view revision graphs from a shell This extension adds a --graph option to the incoming, outgoing and log commands. When this options is given, an ASCII representation of the diff -r 159283d79e69 -r 59bb11a97fe5 hgext/hgcia.py --- a/hgext/hgcia.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/hgcia.py Tue Jun 30 23:17:57 2009 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2007-8 Brendan Cully # Published under the GNU GPL -"""integrate Mercurial with a CIA notification service +"""hooks for integrating with the CIA.vc notification service This is meant to be run as a changegroup or incoming hook. To configure it, set the following options in your hgrc: diff -r 159283d79e69 -r 59bb11a97fe5 hgext/hgk.py --- a/hgext/hgk.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/hgk.py Tue Jun 30 23:17:57 2009 +0200 @@ -331,7 +331,7 @@ "debug-config": (config, [], _('hg debug-config')), "debug-merge-base": - (base, [], _('hg debug-merge-base node node')), + (base, [], _('hg debug-merge-base REV REV')), "debug-rev-parse": (revparse, [('', 'default', '', _('ignored'))], @@ -342,5 +342,5 @@ ('t', 'topo-order', None, _('topo-order')), ('p', 'parents', None, _('parents')), ('n', 'max-count', 0, _('max-count'))], - _('hg debug-rev-list [options] revs')), + _('hg debug-rev-list [OPTION]... REV...')), } diff -r 159283d79e69 -r 59bb11a97fe5 hgext/highlight/__init__.py --- a/hgext/highlight/__init__.py Tue Jun 30 23:16:38 2009 +0200 +++ b/hgext/highlight/__init__.py Tue Jun 30 23:17:57 2009 +0200 @@ -8,7 +8,7 @@ # The original module was split in an interface and an implementation # file to defer pygments loading and speedup extension setup. -"""syntax highlighting for hgweb +"""syntax highlighting for hgweb (requires Pygments) It depends on the Pygments syntax highlighting library: http://pygments.org/ @@ -19,8 +19,6 @@ pygments_style =