--- a/hgext/fetch.py Wed Jul 22 17:59:11 2009 -0500
+++ b/hgext/fetch.py Wed Jul 22 18:08:02 2009 -0500
@@ -121,8 +121,9 @@
err = hg.merge(repo, secondparent, remind=False)
if not err:
+ # we don't translate commit messages
message = (cmdutil.logmessage(opts) or
- (_('Automated merge with %s') %
+ ('Automated merge with %s' %
url.removeauth(other.url())))
editor = cmdutil.commiteditor
if opts.get('force_editor') or opts.get('edit'):
--- a/hgext/gpg.py Wed Jul 22 17:59:11 2009 -0500
+++ b/hgext/gpg.py Wed Jul 22 18:08:02 2009 -0500
@@ -251,7 +251,8 @@
message = opts['message']
if not message:
- message = "\n".join([_("Added signature for changeset %s")
+ # we don't translate commit messages
+ message = "\n".join(["Added signature for changeset %s"
% hgnode.short(n)
for n in nodes])
try:
--- a/hgext/rebase.py Wed Jul 22 17:59:11 2009 -0500
+++ b/hgext/rebase.py Wed Jul 22 18:08:02 2009 -0500
@@ -163,6 +163,7 @@
newrev = nullrev
try:
if last:
+ # we don't translate commit messages
commitmsg = 'Collapsed revision'
for rebased in state:
if rebased not in skipped:
--- a/hgext/transplant.py Wed Jul 22 17:59:11 2009 -0500
+++ b/hgext/transplant.py Wed Jul 22 18:08:02 2009 -0500
@@ -206,6 +206,7 @@
(user, date, message) = self.filter(filter, cl, patchfile)
if log:
+ # we don't translate messages inserted into commits
message += '\n(transplanted from %s)' % revlog.hex(node)
self.ui.status(_('applying %s\n') % revlog.short(node))
--- a/mercurial/commands.py Wed Jul 22 17:59:11 2009 -0500
+++ b/mercurial/commands.py Wed Jul 22 18:08:02 2009 -0500
@@ -246,7 +246,8 @@
commit_opts = opts.copy()
commit_opts['addremove'] = False
if not commit_opts['message'] and not commit_opts['logfile']:
- commit_opts['message'] = _("Backed out changeset %s") % (short(node))
+ # we don't translate commit messages
+ commit_opts['message'] = "Backed out changeset %s" % (short(node))
commit_opts['force_editor'] = True
commit(ui, repo, **commit_opts)
def nice(node):
@@ -2914,7 +2915,8 @@
raise util.Abort(_('tag \'%s\' is not a local tag') % n)
rev_ = nullid
if not message:
- message = _('Removed tag %s') % ', '.join(names)
+ # we don't translate commit messages
+ message = 'Removed tag %s' % ', '.join(names)
elif not opts.get('force'):
for n in names:
if n in repo.tags():
@@ -2926,7 +2928,8 @@
r = repo[rev_].node()
if not message:
- message = (_('Added tag %s for changeset %s') %
+ # we don't translate commit messages
+ message = ('Added tag %s for changeset %s' %
(', '.join(names), short(r)))
date = opts.get('date')
--- a/mercurial/hgweb/hgwebdir_mod.py Wed Jul 22 17:59:11 2009 -0500
+++ b/mercurial/hgweb/hgwebdir_mod.py Wed Jul 22 18:08:02 2009 -0500
@@ -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.
-import os, time
+import os, re, time
from mercurial.i18n import _
from mercurial import ui, hg, util, templater
from mercurial import error, encoding
@@ -225,7 +225,9 @@
parts.insert(0, req.env['PATH_INFO'].rstrip('/'))
if req.env['SCRIPT_NAME']:
parts.insert(0, req.env['SCRIPT_NAME'])
- url = ('/'.join(parts).replace("//", "/")) + '/'
+ m = re.match('((?:https?://)?)(.*)', '/'.join(parts))
+ # squish repeated slashes out of the path component
+ url = m.group(1) + re.sub('/+', '/', m.group(2)) + '/'
# update time with local timezone
try:
--- a/tests/test-hgwebdir Wed Jul 22 17:59:11 2009 -0500
+++ b/tests/test-hgwebdir Wed Jul 22 18:08:02 2009 -0500
@@ -88,7 +88,8 @@
$root=$root
EOF
-hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections.conf \
+hg serve --config web.baseurl=http://hg.example.com:8080/ -p $HGPORT2 -d \
+ --pid-file=hg.pid --webdir-conf collections.conf \
-A access-collections.log -E error-collections.log
cat hg.pid >> $DAEMON_PIDS
--- a/tests/test-hgwebdir.out Wed Jul 22 17:59:11 2009 -0500
+++ b/tests/test-hgwebdir.out Wed Jul 22 18:08:02 2009 -0500
@@ -311,10 +311,10 @@
200 Script output follows
-/a/
-/a/.hg/patches/
-/b/
-/c/
+http://hg.example.com:8080/a/
+http://hg.example.com:8080/a/.hg/patches/
+http://hg.example.com:8080/b/
+http://hg.example.com:8080/c/
200 Script output follows