Mercurial > hg
changeset 10538:5203a324ba73 stable
Merge with hg-i18n
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 24 Feb 2010 09:26:31 +0100 |
| parents | a957038218cd (diff) a7274a832d60 (current diff) |
| children | fc5908d01ed7 |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Wed Feb 24 09:25:55 2010 +0100 +++ b/mercurial/filemerge.py Wed Feb 24 09:26:31 2010 +0100 @@ -205,7 +205,7 @@ out, a = a, back # read input from backup, write to original replace = dict(local=a, base=b, other=c, output=out) args = re.sub("\$(local|base|other|output)", - lambda x: '"%s"' % replace[x.group()[1:]], args) + lambda x: '"%s"' % util.localpath(replace[x.group()[1:]]), args) r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env) if not r and _toolbool(ui, tool, "checkconflicts"):
--- a/mercurial/hgweb/protocol.py Wed Feb 24 09:25:55 2010 +0100 +++ b/mercurial/hgweb/protocol.py Wed Feb 24 09:26:31 2010 +0100 @@ -62,13 +62,9 @@ yield resp def between(repo, req): - if 'pairs' in req.form: - pairs = [map(bin, p.split("-")) - for p in req.form['pairs'][0].split(" ")] - resp = cStringIO.StringIO() - for b in repo.between(pairs): - resp.write(" ".join(map(hex, b)) + "\n") - resp = resp.getvalue() + pairs = [map(bin, p.split("-")) + for p in req.form['pairs'][0].split(" ")] + resp = ''.join(" ".join(map(hex, b)) + "\n" for b in repo.between(pairs)) req.respond(HTTP_OK, HGTYPE, length=len(resp)) yield resp
--- a/mercurial/url.py Wed Feb 24 09:25:55 2010 +0100 +++ b/mercurial/url.py Wed Feb 24 09:26:31 2010 +0100 @@ -140,6 +140,9 @@ # Read configuration config = dict() for key, val in self.ui.configitems('auth'): + if '.' not in key: + self.ui.warn(_("ignoring invalid [auth] key '%s'\n" % key)) + continue group, setting = key.split('.', 1) gdict = config.setdefault(group, dict()) gdict[setting] = val