upstream/mercurial-mirror Commit - r9000:59bb11a9

README

0 +1 -1

              $ 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.

contrib/macosx/Readme.html

0 +2 -2

             <p class="p2"><br></p>
             <p class="p1"><b>Documentation</b></p>
             <p class="p2"><br></p>
-            <p class="p3">Visit the <a href="http://www.selenic.com/mercurial">Mercurial web site and wiki</a></p>
+            <p class="p3">Visit the <a href="http://mercurial.selenic.com/">Mercurial web site and wiki</a></p>
             <p class="p2"><br></p>
             <p class="p3">There's also a free book, <a href="http://hgbook.red-bean.com/">Distributed revision control with Mercurial</a></p>
             <p class="p2"><br></p>
             <p class="p1"><b>Reporting problems</b></p>
             <p class="p2"><br></p>
             <p class="p3">If you run into any problems, please file a bug online:</p>
-            <p class="p3"><a href="http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts</a></p>
+            <p class="p3"><a href="http://mercurial.selenic.com/bts/">http://mercurial.selenic.com/bts/</a></p>
             </body>
             </html>

contrib/macosx/Welcome.html

0 +2 -2

               </style>
             </head>
             <body>
-            <p class="p1">This is a prepackaged release of <a href="http://www.selenic.com/mercurial">Mercurial</a> for Mac OS X.</p>
+            <p class="p1">This is a prepackaged release of <a href="http://mercurial.selenic.com/">Mercurial</a> for Mac OS X.</p>
             <p class="p2"><br></p>
             <br>
             <p>
-            Please be sure to read the latest <a href="http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew">release notes</a>.</p>
+            Please be sure to read the latest <a href="http://mercurial.selenic.com/wiki/WhatsNew">release notes</a>.</p>
             </body>
             </html>

contrib/mercurial.spec

0 +22 -14

             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://mercurial.selenic.com/
-            URL: http://www.selenic.com/mercurial
+            Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
             BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
             # From the README:
             # 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 emacs_lispdir %{_datadir}/emacs/site-lisp
-            %define hgext %{_libdir}/python%{pythonver}/site-packages/hgext
             %description
             Mercurial is a fast, lightweight source control management system designed
             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 $RPM_BUILD_ROOT%{emacs_lispdir}
-            mkdir -p $lisp_dir
+            install contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}
-            install contrib/mercurial.el $lisp_dir
+            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
+            %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
-            %{_mandir}/man?/hg*.gz
+            %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
             %{_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}
+            %{_libdir}/python%{pythonver}/site-packages/%{name}
-            %{hgext}
+            %{_libdir}/python%{pythonver}/site-packages/hgext

contrib/vim/hgcommand.vim

0 +1 -1

             Author:  Mathieu Clabaut <mathieu.clabaut@gmail.com>
             Credits:  Bob Hiestand <bob.hiestand@gmail.com>
-            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.

contrib/win32/ReadMe.html

0 +4 -4

                 <p>
                   For documentation, please visit the <a
-                  href="http://www.selenic.com/mercurial">Mercurial web site</a>.
+                  href="http://mercurial.selenic.com/">Mercurial web site</a>.
                   You can also download a free book, <a
                   href="http://hgbook.red-bean.com/">Mercurial: The Definitive
                   Guide</a>.
                   By default, Mercurial will use the merge program defined by the
                   <tt>HGMERGE</tt> environment variable, or uses the one defined
                   in the <tt>mercurial.ini</tt> file. (see <a
-                  href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a>
+                  href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram</a>
                   on the Mercurial Wiki for more information)
                 </p>
                 <p>
                   Before you report any problems, please consult the <a
-                  href="http://www.selenic.com/mercurial">Mercurial web site</a>
+                  href="http://mercurial.selenic.com/">Mercurial web site</a>
                   and see if your question is already in our list of <a
-                  href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently
+                  href="http://mercurial.selenic.com/wiki/FAQ">Frequently
                   Answered Questions</a> (the "FAQ").
                 </p>

contrib/win32/mercurial.iss

0 +4 -4

             LicenseFile=COPYING
             ShowLanguageDialog=yes
             AppPublisher=Matt Mackall and others
-            AppPublisherURL=http://www.selenic.com/mercurial
+            AppPublisherURL=http://mercurial.selenic.com/
-            AppSupportURL=http://www.selenic.com/mercurial
+            AppSupportURL=http://mercurial.selenic.com/
-            AppUpdatesURL=http://www.selenic.com/mercurial
+            AppUpdatesURL=http://mercurial.selenic.com/
             AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
             AppContact=mercurial@selenic.com
             OutputBaseFilename=Mercurial-snapshot
             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

contrib/win32/postinstall.txt

0 +1 -1

@@ -6,4 +6,4 b' file that comes with this package.'
6		6
7	Also check the release notes at:	7	Also check the release notes at:
8		8
9	http://~~www~~.selenic.com/~~mercurial/~~wik~~i/index.cg~~i/WhatsNew	9	http://mercurial.selenic.com/wiki/WhatsNew

contrib/zsh_completion

0 +18 -6

@@ -13,13 +13,25 b''
13	# autoload -U compinit	13	# autoload -U compinit
14	# compinit	14	# compinit
15	#	15	#
16	# Copyright (C) 2005-6 Steve Borho	16	# Copyright (C) 2005, 2006 Steve Borho <steve@borho.org>
17	# Copyright (C) 2006-8 Brendan Cully <brendan@kublai.com>	17	# Copyright (C) 2006, 2007, 2008 Brendan Cully <brendan@kublai.com>
		18	#
		19	# Permission is hereby granted, without written agreement and without
		20	# licence or royalty fees, to use, copy, modify, and distribute this
		21	# software and to distribute modified versions of this software for any
		22	# purpose, provided that the above copyright notice and the following
		23	# two paragraphs appear in all copies of this software.
18	#	24	#
19	# This is free software; you can redistribute it and/or modify it under	25	# In no event shall the authors be liable to any party for direct,
20	# the terms of the GNU General Public License as published by the Free	26	# indirect, special, incidental, or consequential damages arising out of
21	# Software Foundation; either version 2 of the License, or (at your	27	# the use of this software and its documentation, even if the authors
22	# option) any later version.	28	# have been advised of the possibility of such damage.
		29	#
		30	# The authors specifically disclaim any warranties, including, but not
		31	# limited to, the implied warranties of merchantability and fitness for
		32	# a particular purpose. The software provided hereunder is on an "as
		33	# is" basis, and the authors have no obligation to provide maintenance,
		34	# support, updates, enhancements, or modifications.
23		35
24	emulate -LR zsh	36	emulate -LR zsh
25	setopt extendedglob	37	setopt extendedglob

doc/hg.1.txt

0 +1 -1

             RESOURCES
             ---------
-            http://selenic.com/mercurial[Main Web Site]
+            http://mercurial.selenic.com/[Main Web Site]
             http://selenic.com/hg[Source code repository]

doc/ja/hg.1.ja.txt

0 +1 -1

             情報源
             ---
-            http://selenic.com/mercurial[主なウェブサイト]
+            http://mercurial.selenic.com/[主なウェブサイト]
             http://www.serpentine.com/mercurial[Wiki サイト]

hgext/acl.py

0 +1 -1

             # 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.

hgext/bookmarks.py

0 +9 -9

                             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:
                                         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()
+                        node = self.changelog.tip()
-                        marks = parse(repo)
+                        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):
                             return self.tagscache
                         tagscache = super(bookmark_repo, self).tags()
-                        tagscache.update(parse(repo))
+                        tagscache.update(parse(self))
                         return tagscache
                 repo.__class__ = bookmark_repo

hgext/bugzilla.py

0 +1 -1

             # 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

hgext/children.py

0 +1 -1

             # 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

hgext/churn.py

0 +1 -1

             # 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

hgext/color.py

0 +26 -5

             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
                              '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)
+                    try:
-                    _setupcmd(ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects)
+                        # 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
                 ])
                 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

hgext/convert/__init__.py

0 +1 -1

             # 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

hgext/extdiff.py

0 +1 -1

             # 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

hgext/gpg.py

0 +1 -1

             # 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

hgext/graphlog.py

0 +1 -1

             # 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

hgext/hgcia.py

0 +1 -1

             # Copyright (C) 2007-8 Brendan Cully <brendan@kublai.com>
             # 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:

hgext/hgk.py

0 +2 -2

                 "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'))],
                       ('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...')),
             }

hgext/highlight/__init__.py

0 +1 -3

             # 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/
             pygments_style = <style>
             The default is 'colorful'.
-            -- Adam Hupp <adam@hupp.org>
             """
             import highlight

hgext/inotify/__init__.py

0 +2 -2

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''accelerate status report using system level services'''
+            '''accelerate status report using Linux's inotify service'''
             # todo: socket permissions
                       ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
                       ('t', 'idle-timeout', '', _('minutes to sit idle before exiting')),
                       ('', 'pid-file', '', _('name of file to write process ID to'))],
-                     _('hg inserve [OPT]...')),
+                     _('hg inserve [OPTION]...')),
                 }

hgext/inotify/server.py

0 +9 -9

                     self.add_watch(self.repo.path, inotify.IN_DELETE)
                     self.check_dirstate()
-                def wpath(self, evt):
-                    path = evt.fullpath
-                    if path == self.repo.root:
-                        return ''
-                    if path.startswith(self.wprefix):
-                        return path[len(self.wprefix):]
-                    raise 'wtf? ' + path
                 def dir(self, tree, path):
                     if path:
                         for name in path.split('/'):
                         self.ui.note(_('%s reading %d events\n') %
                                      (self.event_time(), len(events)))
                     for evt in events:
-                        wpath = self.wpath(evt)
+                        assert evt.fullpath.startswith(self.wprefix)
+                        wpath = evt.fullpath[len(self.wprefix):]
                         if evt.mask & inotify.IN_UNMOUNT:
                             self.process_unmount(wpath, evt)
                         elif evt.mask & (inotify.IN_MODIFY | inotify.IN_ATTRIB):
                     if version != common.version:
                         self.ui.warn(_('received query from incompatible client '
                                        'version %d\n') % version)
+                        try:
+                            # try to send back our version to the client
+                            # this way, the client too is informed of the mismatch
+                            sock.sendall(chr(common.version))
+                        except:
+                            pass
                         return
                     type = cs.read(4)

hgext/keyword.py

0 +28 -13

             # audience not running a version control system.
             #
             # For in-depth discussion refer to
-            # <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
+            # <http://mercurial.selenic.com/wiki/KeywordPlan>.
             #
             # Keyword expansion is based on Mercurial's changeset template mappings.
             #
                 Override current keyword template maps with "default" option.
                 '''
-                def demostatus(stat):
-                    ui.status(_('\n\t%s\n') % stat)
                 def demoitems(section, items):
                     ui.write('[%s]\n' % section)
                     for k, v in items:
                     if k.endswith('keyword'):
                         extension = '%s = %s' % (k, v)
                         break
-                demostatus('config using %s keyword template maps' % kwstatus)
+                ui.status(_('\n\tconfig using %s keyword template maps\n') % kwstatus)
                 ui.write('[extensions]\n%s\n' % extension)
                 demoitems('keyword', ui.configitems('keyword'))
                 demoitems('keywordmaps', kwmaps.iteritems())
                 ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
                 repo.commit(text=msg)
                 fmt = ui.verbose and ' in %s' % path or ''
-                demostatus('%s keywords expanded%s' % (kwstatus, fmt))
+                ui.status(_('\n\t%s keywords expanded%s\n') % (kwstatus, fmt))
                 ui.write(repo.wread(fn))
                 ui.debug(_('\nremoving temporary repository %s\n') % tmpdir)
                 shutil.rmtree(tmpdir, ignore_errors=True)
                 _kwfwrite(ui, repo, True, *pats, **opts)
             def files(ui, repo, *pats, **opts):
-                '''print files currently configured for keyword expansion
+                '''show files configured for keyword expansion
+                List which files in the working directory are matched by the
+                [keyword] configuration patterns.
+                Useful to prevent inadvertent keyword expansion and to speed up
+                execution by including only files that are actual candidates
+                for expansion.
-                Crosscheck which files in working directory are potential targets
+                See "hg help keyword" on how to construct patterns both for
-                for keyword expansion. That is, files matched by [keyword] config
+                inclusion and exclusion of files.
-                patterns but not symlinks.
+                Use -u/--untracked to list untracked files as well.
+                With -a/--all and -v/--verbose the codes used to show the status
+                of files are:
+                K = keyword expansion candidate
+                k = keyword expansion candidate (untracked)
+                I = ignored
+                i = ignored (untracked)
                 '''
                 kwt = kwtools['templater']
                 status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
                 modified, added, removed, deleted, unknown, ignored, clean = status
-                files = sorted(modified + added + clean + unknown)
+                files = sorted(modified + added + clean)
                 wctx = repo[None]
                 kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
+                kwuntracked = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
                 cwd = pats and repo.getcwd() or ''
-                kwfstats = not opts.get('ignore') and (('K', kwfiles),) or ()
+                kwfstats = (not opts.get('ignore') and
+                            (('K', kwfiles), ('k', kwuntracked),) or ())
                 if opts.get('all') or opts.get('ignore'):
-                    kwfstats += (('I', [f for f in files if f not in kwfiles]),)
+                    kwfstats += (('I', [f for f in files if f not in kwfiles]),
+                                 ('i', [f for f in unknown if f not in kwuntracked]),)
                 for char, filenames in kwfstats:
                     fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
                     for f in filenames:

hgext/mq.py

0 +4 -7

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''work with a stack of patches
+            '''manage a stack of patches
             This extension lets you work with a stack of patches in a Mercurial
             repository. It manages two stacks of patches - all known patches, and
             def delete(ui, repo, *patches, **opts):
                 """remove patches from queue
-                The patches must not be applied, and at least one patch is
+                The patches must not be applied, and at least one patch is required. With
-                required.
+                -k/--keep, the patch files are preserved in the patch directory.
-                With -k/--keep, the patch files are preserved in the patch
-                directory.
                 To stop managing a patch and move it into permanent history,
                 use the qfinish command."""
                 "qfinish":
                     (finish,
                      [('a', 'applied', None, _('finish all applied changesets'))],
-                     _('hg qfinish [-a] [REV...]')),
+                     _('hg qfinish [-a] [REV]...')),
             }

hgext/notify.py

0 +1 -1

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''send e-mail notifications for commits/pushes
+            '''hooks for sending email notifications at commit/push time
             Subscriptions can be managed through hgrc. Default mode is to print
             messages to stdout, for testing and configuring.

hgext/patchbomb.py

0 +1 -1

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''send Mercurial changesets as a series of patch e-mails
+            '''command to send changesets as (a series of) patch emails
             The series is started off with a "[PATCH 0 of N]" introduction, which
             describes the series as a whole.

hgext/purge.py

0 +2 -2

             # Copyright (C) 2006 - Marco Barisione <marco@barisione.org>
             #
-            # This is a small extension for Mercurial (http://www.selenic.com/mercurial)
+            # This is a small extension for Mercurial (http://mercurial.selenic.com/)
             # that removes files not known to mercurial
             #
             # This program was inspired by the "cvspurge" script contained in CVS utilities
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-            '''delete files not tracked from the working directory'''
+            '''command to delete untracked files from the working directory'''
             from mercurial import util, commands, cmdutil
             from mercurial.i18n import _

hgext/rebase.py

0 +2 -2

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''move sets of revisions to a different ancestor
+            '''command to move sets of revisions to a different ancestor
             This extension lets you rebase changesets in an existing Mercurial
             repository.
             For more information:
-            http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject
+            http://mercurial.selenic.com/wiki/RebaseProject
             '''
             from mercurial import util, repair, merge, cmdutil, commands, error

hgext/record.py

0 +1 -1

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''interactively select which sets of changes to commit/qrefresh'''
+            '''commands to interactively select changes for commit/qrefresh'''
             from mercurial.i18n import gettext, _
             from mercurial import cmdutil, commands, extensions, hg, mdiff, patch

hgext/transplant.py

0 +1 -1

             # This software may be used and distributed according to the terms of the
             # GNU General Public License version 2, incorporated herein by reference.
-            '''transplant changesets from another branch
+            '''command to transplant changesets from another branch
             This extension allows you to transplant patches from another branch.

hgext/win32mbcs.py

0 +1 -1

             # GNU General Public License version 2, incorporated herein by reference.
             #
-            '''allow the use of MBCS paths with problematic encoding
+            '''allow the use of MBCS paths with problematic encodings
             Some MBCS encodings are not good for some path operations (i.e.
             splitting path, case conversion, etc.) with its encoded bytes. We call

hgext/win32text.py

0 +1 -1

                 # warn if already has 'newline' in repository.
                 # it might cause unexpected eol conversion.
                 # see issue 302:
-                #   http://www.selenic.com/mercurial/bts/issue302
+                #   http://mercurial.selenic.com/bts/issue302
                 if newline in s and ui and filename and repo:
                     ui.warn(_('WARNING: %s already has %s line endings\n'
                               'and does not need EOL conversion by the win32text plugin.\n'

mercurial/cmdutil.py

0 +2 -4

                     repo.add(add)
                 if similarity > 0:
                     for old, new, score in findrenames(repo, m, similarity):
-                        oldexact, newexact = m.exact(old), m.exact(new)
+                        if repo.ui.verbose or not m.exact(old) or not m.exact(new):
-                        if repo.ui.verbose or not oldexact or not newexact:
-                            oldrel, newrel = m.rel(old), m.rel(new)
                             repo.ui.status(_('recording removal of %s as rename to %s '
                                              '(%d%% similar)\n') %
-                                           (oldrel, newrel, score * 100))
+                                           (m.rel(old), m.rel(new), score * 100))
                         if not dry_run:
                             repo.copy(old, new)

mercurial/commands.py

0 +11 -13

             from node import hex, nullid, nullrev, short
             from lock import release
             from i18n import _, gettext
-            import os, re, sys, textwrap, subprocess, difflib, time
+            import os, re, sys, subprocess, difflib, time
             import hg, util, revlog, bundlerepo, extensions, copies, context, error
             import patch, help, mdiff, tempfile, url, encoding
             import archival, changegroup, cmdutil, sshserver, hbisect
                 """list repository named branches
                 List the repository's named branches, indicating which ones are
-                inactive. If active is specified, only show active branches.
+                inactive. If -a/--active is specified, only show active branches.
                 A branch is considered active if it contains repository heads.
                 parameters. To create a bundle containing all changesets, use
                 -a/--all (or --base null).
-                To change the compression method applied, use the -t/--type
+                You can change compression method with the -t/--type option.
-                option. The available compression methods are: none, bzip2, and
+                The available compression methods are: none, bzip2, and
                 gzip (by default, bundles are compressed using bzip2).
                 The bundle file can then be transferred using conventional means
                                    " or misconfigured. Please check your .hgrc file)\n"))
                     else:
                         ui.write(_(" Internal patcher failure, please report this error"
-                                   " to http://www.selenic.com/mercurial/bts\n"))
+                                   " to http://mercurial.selenic.com/bts/\n"))
                 problems += patchproblems
                 os.unlink(fa)
                 branch is called the revision's branch tag.
                 Branch heads are revisions on a given named branch that do not have
-                any children on the same branch. A branch head could be a true head
+                any descendants on the same branch. A branch head could be a true head
                 or it could be the last changeset on a branch before a new branch
                 was created. If none of the branch heads are true heads, the branch
                 is considered inactive.
                             commands = cmds[f].replace("|",", ")
                             ui.write(" %s:\n      %s\n"%(commands, h[f]))
                         else:
-                            ui.write(' %-*s   %s\n' % (m, f, h[f]))
+                            ui.write(' %-*s   %s\n' % (m, f, util.wrap(h[f], m + 4)))
                     if name != 'shortlist':
                         exts, maxlength = extensions.enabled()
                     opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
                     for first, second in opt_output:
                         if second:
-                            # wrap descriptions at 70 characters, just like the
+                            second = util.wrap(second, opts_len + 3)
-                            # main help texts
+                            ui.write(" %-*s  %s\n" % (opts_len, first, second))
-                            second = textwrap.wrap(second, width=70 - opts_len - 3)
-                            pad = '\n' + ' ' * (opts_len + 3)
-                            ui.write(" %-*s  %s\n" % (opts_len, first, pad.join(second)))
                         else:
                             ui.write("%s\n" % first)
                 With -s/--similarity, hg will attempt to discover renames and
                 copies in the patch in the same way as 'addremove'.
-                To read a patch from standard input, use "-" as the patch name.
+                To read a patch from standard input, use "-" as the patch name. If
+                a URL is specified, the patch will be downloaded from it.
                 See 'hg help dates' for a list of formats valid for -d/--date.
                 """
                 patches = (patch1,) + patches

mercurial/dispatch.py

0 +1 -1

                 except:
                     ui.warn(_("** unknown exception encountered, details follow\n"))
                     ui.warn(_("** report bug details to "
-                             "http://www.selenic.com/mercurial/bts\n"))
+                             "http://mercurial.selenic.com/bts/\n"))
                     ui.warn(_("** or mercurial@selenic.com\n"))
                     ui.warn(_("** Mercurial Distributed SCM (version %s)\n")
                            % util.version())

mercurial/extensions.py

0 +6 -1

                 import hgext
                 extpath = os.path.dirname(os.path.abspath(hgext.__file__))
+                try: # might not be a filesystem path
+                    files = os.listdir(extpath)
+                except OSError:
+                    return None, 0
                 exts = {}
                 maxlength = 0
-                for e in os.listdir(extpath):
+                for e in files:
                     if e.endswith('.py'):
                         name = e.rsplit('.', 1)[0]

mercurial/help.py

0 +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.
-            import textwrap
             from i18n import _
-            import extensions
+            import extensions, util
             def moduledoc(file):
                     return ''
                 result = '\n%s\n\n' % header
                 for name, desc in sorted(exts.iteritems()):
-                    # wrap desc at 70 characters, just like the main help texts
+                    desc = util.wrap(desc, maxlength + 4)
-                    desc = textwrap.wrap(desc, width=70 - maxlength - 4)
+                    result += ' %s   %s\n' % (name.ljust(maxlength), desc)
-                    pad = '\n' + ' ' * (maxlength + 4)
-                    result += ' %s   %s\n' % (name.ljust(maxlength),
-                                              pad.join(desc))
                 return result
             def extshelp():

mercurial/localrepo.py

0 +22 -7

@@ -454,15 +454,30 b' class localrepository(repo.repository):'
454	pass	454	pass
455		455
456	def _updatebranchcache(self, partial, start, end):	456	def _updatebranchcache(self, partial, start, end):
		457	# collect new branch entries
		458	newbranches = {}
457	for r in xrange(start, end):	459	for r in xrange(start, end):
458	c = self[r]	460	c = self[r]
459	b = c.branch()	461	newbranches.setdefault(c.branch(), []).append(c.node())
460	bheads = partial.setdefault(b, [])	462	# if older branchheads are reachable from new ones, they aren't
461	bheads.append(c.node())	463	# really branchheads. Note checking parents is insufficient:
462	for p in c.parents():	464	# 1 (branch a) -> 2 (branch b) -> 3 (branch a)
463	pn = p.node()	465	for branch, newnodes in newbranches.iteritems():
464	if pn in bheads:	466	bheads = partial.setdefault(branch, [])
465	bheads.~~remove~~(pn)	467	bheads.extend(newnodes)
		468	if len(bheads) < 2:
		469	continue
		470	newbheads = []
		471	# starting from tip means fewer passes over reachable
		472	while newnodes:
		473	latest = newnodes.pop()
		474	if latest not in bheads:
		475	continue
		476	reachable = self.changelog.reachable(latest, bheads[0])
		477	bheads = [b for b in bheads if b not in reachable]
		478	newbheads.insert(0, latest)
		479	bheads.extend(newbheads)
		480	partial[branch] = bheads
466		481
467	def lookup(self, key):	482	def lookup(self, key):
468	if isinstance(key, int):	483	if isinstance(key, int):

mercurial/ui.py

0 +1 -1

                     insensitive. If ui is not interactive, the default is returned.
                     """
                     if not self.interactive():
-                        self.note(msg, ' ', default, "\n")
+                        self.write(msg, ' ', default, "\n")
                         return default
                     while True:
                         try:

mercurial/util.py

0 +5 -1

             from i18n import _
             import error, osutil
             import cStringIO, errno, re, shutil, sys, tempfile, traceback
-            import os, stat, time, calendar, random
+            import os, stat, time, calendar, random, textwrap
             import imp
             # Python compatibility
                     pass
                 return 80
+            def wrap(line, hangindent, width=78):
+                padding = '\n' + ' ' * hangindent
+                return padding.join(textwrap.wrap(line, width=width - hangindent))
             def iterlines(iterator):
                 for chunk in iterator:
                     for line in chunk.splitlines():

mercurial/win32.py

0 +3 -137

@@ -20,139 +20,6 b' import winerror'
20	import osutil, encoding	20	import osutil, encoding
21	from win32com.shell import shell,shellcon	21	from win32com.shell import shell,shellcon
22		22
23	class WinError(Exception):
24	winerror_map = {
25	winerror.ERROR_ACCESS_DENIED: errno.EACCES,
26	winerror.ERROR_ACCOUNT_DISABLED: errno.EACCES,
27	winerror.ERROR_ACCOUNT_RESTRICTION: errno.EACCES,
28	winerror.ERROR_ALREADY_ASSIGNED: errno.EBUSY,
29	winerror.ERROR_ALREADY_EXISTS: errno.EEXIST,
30	winerror.ERROR_ARITHMETIC_OVERFLOW: errno.ERANGE,
31	winerror.ERROR_BAD_COMMAND: errno.EIO,
32	winerror.ERROR_BAD_DEVICE: errno.ENODEV,
33	winerror.ERROR_BAD_DRIVER_LEVEL: errno.ENXIO,
34	winerror.ERROR_BAD_EXE_FORMAT: errno.ENOEXEC,
35	winerror.ERROR_BAD_FORMAT: errno.ENOEXEC,
36	winerror.ERROR_BAD_LENGTH: errno.EINVAL,
37	winerror.ERROR_BAD_PATHNAME: errno.ENOENT,
38	winerror.ERROR_BAD_PIPE: errno.EPIPE,
39	winerror.ERROR_BAD_UNIT: errno.ENODEV,
40	winerror.ERROR_BAD_USERNAME: errno.EINVAL,
41	winerror.ERROR_BROKEN_PIPE: errno.EPIPE,
42	winerror.ERROR_BUFFER_OVERFLOW: errno.ENAMETOOLONG,
43	winerror.ERROR_BUSY: errno.EBUSY,
44	winerror.ERROR_BUSY_DRIVE: errno.EBUSY,
45	winerror.ERROR_CALL_NOT_IMPLEMENTED: errno.ENOSYS,
46	winerror.ERROR_CANNOT_MAKE: errno.EACCES,
47	winerror.ERROR_CANTOPEN: errno.EIO,
48	winerror.ERROR_CANTREAD: errno.EIO,
49	winerror.ERROR_CANTWRITE: errno.EIO,
50	winerror.ERROR_CRC: errno.EIO,
51	winerror.ERROR_CURRENT_DIRECTORY: errno.EACCES,
52	winerror.ERROR_DEVICE_IN_USE: errno.EBUSY,
53	winerror.ERROR_DEV_NOT_EXIST: errno.ENODEV,
54	winerror.ERROR_DIRECTORY: errno.EINVAL,
55	winerror.ERROR_DIR_NOT_EMPTY: errno.ENOTEMPTY,
56	winerror.ERROR_DISK_CHANGE: errno.EIO,
57	winerror.ERROR_DISK_FULL: errno.ENOSPC,
58	winerror.ERROR_DRIVE_LOCKED: errno.EBUSY,
59	winerror.ERROR_ENVVAR_NOT_FOUND: errno.EINVAL,
60	winerror.ERROR_EXE_MARKED_INVALID: errno.ENOEXEC,
61	winerror.ERROR_FILENAME_EXCED_RANGE: errno.ENAMETOOLONG,
62	winerror.ERROR_FILE_EXISTS: errno.EEXIST,
63	winerror.ERROR_FILE_INVALID: errno.ENODEV,
64	winerror.ERROR_FILE_NOT_FOUND: errno.ENOENT,
65	winerror.ERROR_GEN_FAILURE: errno.EIO,
66	winerror.ERROR_HANDLE_DISK_FULL: errno.ENOSPC,
67	winerror.ERROR_INSUFFICIENT_BUFFER: errno.ENOMEM,
68	winerror.ERROR_INVALID_ACCESS: errno.EACCES,
69	winerror.ERROR_INVALID_ADDRESS: errno.EFAULT,
70	winerror.ERROR_INVALID_BLOCK: errno.EFAULT,
71	winerror.ERROR_INVALID_DATA: errno.EINVAL,
72	winerror.ERROR_INVALID_DRIVE: errno.ENODEV,
73	winerror.ERROR_INVALID_EXE_SIGNATURE: errno.ENOEXEC,
74	winerror.ERROR_INVALID_FLAGS: errno.EINVAL,
75	winerror.ERROR_INVALID_FUNCTION: errno.ENOSYS,
76	winerror.ERROR_INVALID_HANDLE: errno.EBADF,
77	winerror.ERROR_INVALID_LOGON_HOURS: errno.EACCES,
78	winerror.ERROR_INVALID_NAME: errno.EINVAL,
79	winerror.ERROR_INVALID_OWNER: errno.EINVAL,
80	winerror.ERROR_INVALID_PARAMETER: errno.EINVAL,
81	winerror.ERROR_INVALID_PASSWORD: errno.EPERM,
82	winerror.ERROR_INVALID_PRIMARY_GROUP: errno.EINVAL,
83	winerror.ERROR_INVALID_SIGNAL_NUMBER: errno.EINVAL,
84	winerror.ERROR_INVALID_TARGET_HANDLE: errno.EIO,
85	winerror.ERROR_INVALID_WORKSTATION: errno.EACCES,
86	winerror.ERROR_IO_DEVICE: errno.EIO,
87	winerror.ERROR_IO_INCOMPLETE: errno.EINTR,
88	winerror.ERROR_LOCKED: errno.EBUSY,
89	winerror.ERROR_LOCK_VIOLATION: errno.EACCES,
90	winerror.ERROR_LOGON_FAILURE: errno.EACCES,
91	winerror.ERROR_MAPPED_ALIGNMENT: errno.EINVAL,
92	winerror.ERROR_META_EXPANSION_TOO_LONG: errno.E2BIG,
93	winerror.ERROR_MORE_DATA: errno.EPIPE,
94	winerror.ERROR_NEGATIVE_SEEK: errno.ESPIPE,
95	winerror.ERROR_NOACCESS: errno.EFAULT,
96	winerror.ERROR_NONE_MAPPED: errno.EINVAL,
97	winerror.ERROR_NOT_ENOUGH_MEMORY: errno.ENOMEM,
98	winerror.ERROR_NOT_READY: errno.EAGAIN,
99	winerror.ERROR_NOT_SAME_DEVICE: errno.EXDEV,
100	winerror.ERROR_NO_DATA: errno.EPIPE,
101	winerror.ERROR_NO_MORE_SEARCH_HANDLES: errno.EIO,
102	winerror.ERROR_NO_PROC_SLOTS: errno.EAGAIN,
103	winerror.ERROR_NO_SUCH_PRIVILEGE: errno.EACCES,
104	winerror.ERROR_OPEN_FAILED: errno.EIO,
105	winerror.ERROR_OPEN_FILES: errno.EBUSY,
106	winerror.ERROR_OPERATION_ABORTED: errno.EINTR,
107	winerror.ERROR_OUTOFMEMORY: errno.ENOMEM,
108	winerror.ERROR_PASSWORD_EXPIRED: errno.EACCES,
109	winerror.ERROR_PATH_BUSY: errno.EBUSY,
110	winerror.ERROR_PATH_NOT_FOUND: errno.ENOENT,
111	winerror.ERROR_PIPE_BUSY: errno.EBUSY,
112	winerror.ERROR_PIPE_CONNECTED: errno.EPIPE,
113	winerror.ERROR_PIPE_LISTENING: errno.EPIPE,
114	winerror.ERROR_PIPE_NOT_CONNECTED: errno.EPIPE,
115	winerror.ERROR_PRIVILEGE_NOT_HELD: errno.EACCES,
116	winerror.ERROR_READ_FAULT: errno.EIO,
117	winerror.ERROR_SEEK: errno.EIO,
118	winerror.ERROR_SEEK_ON_DEVICE: errno.ESPIPE,
119	winerror.ERROR_SHARING_BUFFER_EXCEEDED: errno.ENFILE,
120	winerror.ERROR_SHARING_VIOLATION: errno.EACCES,
121	winerror.ERROR_STACK_OVERFLOW: errno.ENOMEM,
122	winerror.ERROR_SWAPERROR: errno.ENOENT,
123	winerror.ERROR_TOO_MANY_MODULES: errno.EMFILE,
124	winerror.ERROR_TOO_MANY_OPEN_FILES: errno.EMFILE,
125	winerror.ERROR_UNRECOGNIZED_MEDIA: errno.ENXIO,
126	winerror.ERROR_UNRECOGNIZED_VOLUME: errno.ENODEV,
127	winerror.ERROR_WAIT_NO_CHILDREN: errno.ECHILD,
128	winerror.ERROR_WRITE_FAULT: errno.EIO,
129	winerror.ERROR_WRITE_PROTECT: errno.EROFS,
130	}
131
132	def __init__(self, err):
133	try:
134	# unpack a pywintypes.error tuple
135	self.win_errno, self.win_function, self.win_strerror = err
136	except ValueError:
137	# get attributes from a WindowsError
138	self.win_errno = err.winerror
139	self.win_function = None
140	self.win_strerror = err.strerror
141	self.win_strerror = self.win_strerror.rstrip('.')
142
143	class WinIOError(WinError, IOError):
144	def __init__(self, err, filename=None):
145	WinError.__init__(self, err)
146	IOError.__init__(self, self.winerror_map.get(self.win_errno, 0),
147	self.win_strerror)
148	self.filename = filename
149
150	class WinOSError(WinError, OSError):
151	def __init__(self, err):
152	WinError.__init__(self, err)
153	OSError.__init__(self, self.winerror_map.get(self.win_errno, 0),
154	self.win_strerror)
155
156	def os_link(src, dst):	23	def os_link(src, dst):
157	try:	24	try:
158	win32file.CreateHardLink(dst, src)	25	win32file.CreateHardLink(dst, src)
@@ -164,12 +31,11 b' def os_link(src, dst):'
164	except:	31	except:
165	pass	32	pass
166	# Fake hardlinking error	33	# Fake hardlinking error
167	raise ~~Win~~OSError((18, '~~CreateHardLink~~', ~~'The system cannot '~~	34	raise OSError(errno.EINVAL, 'Hardlinking not supported')
168	'move the file to a different disk drive'))
169	except pywintypes.error, details:	35	except pywintypes.error, details:
170	raise WinOSError(details)	36	raise OSError(errno.EINVAL, 'target implements hardlinks improperly')
171	except NotImplementedError: # Another fake error win Win98	37	except NotImplementedError: # Another fake error win Win98
172	raise ~~Win~~OSError((18, ~~'CreateHardLink'~~, 'Hardlinking not supported'))	38	raise OSError(errno.EINVAL, 'Hardlinking not supported')
173		39
174	def nlinks(pathname):	40	def nlinks(pathname):
175	"""Return number of hardlinks for the given file."""	41	"""Return number of hardlinks for the given file."""

mercurial/windows.py

0 +1 -1

                 try:
                     return osutil.posixfile(name, mode, buffering)
                 except WindowsError, err:
-                    raise WinIOError(err)
+                    raise IOError(err.errno, err.strerror)
             posixfile.__doc__ = osutil.posixfile.__doc__
             class winstdout(object):

setup.py

0 +1 -1

                   version=version,
                   author='Matt Mackall',
                   author_email='mpm@selenic.com',
-                  url='http://selenic.com/mercurial',
+                  url='http://mercurial.selenic.com/',
                   description='Scalable distributed SCM',
                   license='GNU GPL',
                   scripts=scripts,

templates/atom/error.tmpl

0 +1 -1

              <updated>1970-01-01T00:00:00+00:00</updated>
              <entry>
               <title>Error</title>
-              <id>http://www.selenic.com/mercurial/#error</id>
+              <id>http://mercurial.selenic.com/#error</id>
               <author>
                 <name>mercurial</name>
               </author>

templates/atom/filelog.tmpl

0 +1 -1

             {header}
              <id>{urlbase}{url}atom-log/tip/{file|escape}</id>
-             <link rel="self" href="{urlbase}{url}atom-log/tip/{file|escape}"/>
+             <link rel="self" href="{urlbase}{url}atom-log/tip/{file|urlescape}"/>
              <title>{repo|escape}: {file|escape} history</title>
              {latestentry%feedupdated}

templates/gitweb/branches.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
             </div>
             <div class="page_nav">

templates/gitweb/changelog.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
             </div>
             <form action="{url}log">

templates/gitweb/changeset.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset
             </div>
             <div class="page_nav">

templates/gitweb/error.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
             </div>
             <div class="page_nav">

templates/gitweb/fileannotate.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
             </div>
             <div class="page_nav">

templates/gitweb/filediff.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
             </div>
             <div class="page_nav">

templates/gitweb/filelog.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revisions
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revisions
             </div>
             <div class="page_nav">

templates/gitweb/filerevision.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision
             </div>
             <div class="page_nav">

templates/gitweb/graph.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
             </div>
             <form action="{url}log">

templates/gitweb/index.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-                <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a>
+                <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a>
                 Repositories list
             </div>

templates/gitweb/manifest.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files
             </div>
             <div class="page_nav">

templates/gitweb/notfound.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
             </div>
             <div class="page_body">

templates/gitweb/search.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / search
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / search
             <form action="{url}log">
             {sessionvars%hiddenformentry}

templates/gitweb/shortlog.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / shortlog
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / shortlog
             </div>
             <form action="{url}log">

templates/gitweb/summary.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
             <form action="{url}log">
             {sessionvars%hiddenformentry}

templates/gitweb/tags.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags
             </div>
             <div class="page_nav">

templates/monoblue/footer.tmpl

0 +1 -1

                 </div>
                 <div id="powered-by">
-                    <p><a href="http://www.selenic.com/mercurial/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
+                    <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
                 </div>
                 <div id="corner-top-left"></div>

templates/monoblue/index.tmpl

0 +1 -1

                 </div>
                 <div id="powered-by">
-                    <p><a href="http://www.selenic.com/mercurial/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
+                    <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
                 </div>
                 <div id="corner-top-left"></div>

templates/paper/branches.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/changeset.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/error.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/fileannotate.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/filediff.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/filelog.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/filerevision.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/graph.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/index.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <div class="main">

templates/paper/manifest.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/search.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
             </div>
             <ul>

templates/paper/shortlog.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/paper/tags.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

templates/rss/error.tmpl

0 +1 -1

                 <item>
                   <title>Error</title>
                   <description>{error|escape}</description>
-                  <guid>http://www.selenic.com/mercurial/#error</guid>
+                  <guid>http://mercurial.selenic.com/#error</guid>
                 </item>
               </channel>
             </rss>

templates/spartan/footer.tmpl

0 +1 -1

             {motd}
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
             </div>

tests/README

0 +1 -1

             cd tests/
             python run-tests.py
-            See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for
+            See http://mercurial.selenic.com/wiki/WritingTests for
             more information on writing tests.

tests/run-tests.py

0 +3 -1

                 pure = options.pure and "--pure" or ""
                 # Run installer in hg root
-                os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+                script = os.path.realpath(sys.argv[0])
+                hgroot = os.path.dirname(os.path.dirname(script))
+                os.chdir(hgroot)
                 cmd = ('%s setup.py %s clean --all'
                        ' install --force --prefix="%s" --install-lib="%s"'
                        ' --install-scripts="%s" >%s 2>&1'

tests/test-bundle

0 +2 -2

             hg -R full-clone heads
             rm -r full-clone
-            # test for http://www.selenic.com/mercurial/bts/issue216
+            # test for http://mercurial.selenic.com/bts/issue216
             echo "====== Unbundle incremental bundles into fresh empty in one go"
             rm -r empty
             hg init empty
             hg incoming ../bundle.hg
             cd ..
-            # test for http://www.selenic.com/mercurial/bts/issue1144
+            # test for http://mercurial.selenic.com/bts/issue1144
             echo "===== test that verify bundle does not traceback"
             # partial history bundle, fails w/ unkown parent
             hg -R bundle.hg verify

tests/test-convert-cvs-branch

0 +2 -2

             #!/bin/sh
-            # This is http://www.selenic.com/mercurial/bts/issue1148
+            # This is http://mercurial.selenic.com/bts/issue1148
-            #     and http://www.selenic.com/mercurial/bts/issue1447
+            #     and http://mercurial.selenic.com/bts/issue1447
             "$TESTDIR/hghave" cvs || exit 80

tests/test-extension.out

0 +1 -2

             global options:
              -R --repository      repository root directory or symbolic path name
                 --cwd             change working directory
-             -y --noninteractive  do not prompt, assume 'yes' for any required
+             -y --noninteractive  do not prompt, assume 'yes' for any required answers
-                                  answers
              -q --quiet           suppress output
              -v --verbose         enable additional output
                 --config          set/override config option

tests/test-globalopts.out

0 +4 -4

             %% earlygetopt with illegal abbreviations
             abort: Option --config may not be abbreviated!
             abort: Option --cwd may not be abbreviated!
-            abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
+            abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
-            abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
+            abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
-            abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
+            abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
-            abort: Option -R has to be separated from other options (i.e. not -qR) and --repository may only be abbreviated as --repo!
+            abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
             %% --cwd
             changeset:   0:8580ff50825a
             tag:         tip

tests/test-hgweb-commands.out

0 +6 -6

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <body>
             <div class="page_header">
-            <a href="http://127.0.0.1/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / branches
+            <a href="http://127.0.0.1/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / branches
             </div>
             <div class="page_nav">
             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / summary
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / summary
             <form action="/log">
             <input type="hidden" name="style" value="gitweb" />
             <body>
             <div class="page_header">
-            <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / graph
+            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / graph
             </div>
             <form action="/log">

tests/test-hgweb-descend-empties.out

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

tests/test-hgweb-diffs.out

0 +4 -4

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

tests/test-hgweb-empty.out

0 +4 -4

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

tests/test-hgweb-filelog.out

0 +6 -6

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <ul>
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
             </div>

tests/test-hgweb-removed.out

0 +2 -2

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

tests/test-hgweb.out

0 +2 -2

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <ul>

tests/test-hgwebdir.out

0 +2 -2

             <div class="container">
             <div class="menu">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <div class="main">
             <div class="container">
             <div class="menu">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <div class="main">

tests/test-highlight.out

0 +3 -3

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>
             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://www.selenic.com/mercurial/">
+            <a href="http://mercurial.selenic.com/">
             <img src="/static/hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

tests/test-issue322

0 +1 -1

             #!/bin/sh
-            # http://www.selenic.com/mercurial/bts/issue322
+            # http://mercurial.selenic.com/bts/issue322
             echo % file replaced with directory

tests/test-issue352

0 +1 -1

             #!/bin/sh
-            # http://www.selenic.com/mercurial/bts/issue352
+            # http://mercurial.selenic.com/bts/issue352
             "$TESTDIR/hghave" eol-in-paths || exit 80

tests/test-issue433

0 +1 -1

             #!/bin/sh
-            # http://www.selenic.com/mercurial/bts/issue433
+            # http://mercurial.selenic.com/bts/issue433
             hg init a
             cd a

tests/test-issue660

0 +1 -1

             #!/bin/sh
-            # http://www.selenic.com/mercurial/bts/issue660
+            # http://mercurial.selenic.com/bts/issue660
             hg init a

tests/test-keyword.out

0 +3 -3

              kwdemo     print [keywordmaps] configuration and an expansion example
              kwexpand   expand keywords in the working directory
-             kwfiles    print files currently configured for keyword expansion
+             kwfiles    show files configured for keyword expansion
              kwshrink   revert expanded keywords in the working directory
             enabled extensions:
              keyword   expand keywords in tracked files
-             mq        work with a stack of patches
+             mq        manage a stack of patches
-             notify    send e-mail notifications for commits/pushes
+             notify    hooks for sending email notifications at commit/push time
             use "hg -v help keyword" to show aliases and global options
             % hg kwdemo

tests/test-merge-prompt.out

0 +4 0

             created new head
             # non-interactive merge
+             local changed file1 which remote deleted
+            use (c)hanged version or (d)elete? c
+            remote changed file2 which local deleted
+            use (c)hanged version or leave (d)eleted? c
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             status:

tests/test-merge-tools.out

0 +4 0

             true.executable=cat
             # hg update -C 1
             # hg merge -r 2 --config ui.merge=internal:prompt
+             no tool found to merge f
+            keep (l)ocal or take (o)ther? l
 files updated, 1 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             # cat f
             revision 2
             space
             merging f
+             output file f appears unchanged
+            was merge successful (yn)? n
             merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
             use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon

tests/test-mq.out

0 +2 -2

             % help
-            mq extension - work with a stack of patches
+            mq extension - manage a stack of patches
             This extension lets you work with a stack of patches in a Mercurial
             repository. It manages two stacks of patches - all known patches, and
             enabled extensions:
-             mq   work with a stack of patches
+             mq   manage a stack of patches
             use "hg -v help mq" to show aliases and global options
             adding a

tests/test-newbranch

0 +3 0

             hg branch -f default
             hg ci -m "clear branch name" -d "1000000 0"
+            echo % there should be only one default branch head
+            hg heads .
             hg co foo
             hg branch
             echo bleah > a

tests/test-newbranch.out

0 +7 -2

             % branch shadowing
             abort: a branch of the same name already exists (use --force to override)
             marked working directory as branch default
+            % there should be only one default branch head
+            changeset:   3:bf1bc2f45e83
+            tag:         tip
+            user:        test
+            date:        Mon Jan 12 13:46:40 1970 +0000
+            summary:     clear branch name
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             foo
             created new head
 :4909a3732169
 a3732169c0c20011c4f4b8fdff4e3d89b23f 4
-            be8523e69bf892e25817fc97187516b3c0804ae4 default
             bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
 a3732169c0c20011c4f4b8fdff4e3d89b23f foo
 ec16bde7f1575d523313b9bca000f6a6f12dca bar
             be8523e69bf892e25817fc97187516b3c0804ae4 default
             % pushing everything
 a3732169c0c20011c4f4b8fdff4e3d89b23f 4
-            be8523e69bf892e25817fc97187516b3c0804ae4 default
             bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
 a3732169c0c20011c4f4b8fdff4e3d89b23f foo
 ec16bde7f1575d523313b9bca000f6a6f12dca bar

tests/test-notify.out

0 +1 -1

-            notify extension - send e-mail notifications for commits/pushes
+            notify extension - hooks for sending email notifications at commit/push time
             Subscriptions can be managed through hgrc. Default mode is to print
             messages to stdout, for testing and configuring.

tests/test-record.out

0 +2 -4

             options:
-             -A --addremove     mark new/missing files as added/removed before
+             -A --addremove     mark new/missing files as added/removed before committing
-                                committing
+                --close-branch  mark a branch as closed, hiding it from the branch list
-                --close-branch  mark a branch as closed, hiding it from the branch
-                                list
              -I --include       include names matching the given patterns
              -X --exclude       exclude names matching the given patterns
              -m --message       use <text> as commit message

tests/test-status-color

0 +3 0

             rm deleted
             hg copy modified copied
+            echo "% test unknown color"
+            hg --config color.status.modified=periwinkle status --color=always
             # Run status with 2 different flags.
             # Check if result is the same or different.
             # If result is not as expected, raise error

tests/test-status-color.out

0 +8 0

@@ -124,3 +124,11 b' adding .hgignore'
124	adding deleted	124	adding deleted
125	adding modified	125	adding modified
126	adding removed	126	adding removed
		127	% test unknown color
		128	ignoring unknown color/effect 'periwinkle' (configured in color.status.modified)
		129	M modified
		130	[0;32;1mA added[0m
		131	[0;32;1mA copied[0m
		132	[0;31;1mR removed[0m
		133	[0;36;1;4m! deleted[0m
		134	[0;35;1;4m? unknown[0m

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages