Mercurial > hg-stable
changeset 3258:03acd01520ac
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 05 Oct 2006 00:14:21 +0200 |
| parents | c9cd63a6fce9 (current diff) 168485fa44ba (diff) |
| children | 53d6bcccdbef 1f1af9b273e8 |
| files | |
| diffstat | 5 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/Makefile Tue Oct 03 12:33:22 2006 +0200 +++ b/doc/Makefile Thu Oct 05 00:14:21 2006 +0200 @@ -28,7 +28,7 @@ install: man for i in $(MAN) ; do \ - subdir=`echo $$i | sed -n 's/.\+\(\.[0-9]\)$$/man\1/p'` ; \ + subdir=`echo $$i | sed -n 's/.\+\.\([0-9]\)$$/man\1/p'` ; \ mkdir -p $(MANDIR)/$$subdir ; \ $(INSTALL) $$i $(MANDIR)/$$subdir ; \ done
--- a/hgext/patchbomb.py Tue Oct 03 12:33:22 2006 +0200 +++ b/hgext/patchbomb.py Thu Oct 05 00:14:21 2006 +0200 @@ -65,7 +65,7 @@ from mercurial.demandload import * demandload(globals(), '''email.MIMEMultipart email.MIMEText email.Utils - mercurial:commands,hg,mail,ui,patch + mercurial:cmdutil,commands,hg,mail,ui,patch os errno popen2 socket sys tempfile time''') from mercurial.i18n import gettext as _ from mercurial.node import * @@ -146,10 +146,10 @@ if patchname: patchname = patchname[0] elif total > 1: - patchname = commands.make_filename(repo, '%b-%n.patch', + patchname = cmdutil.make_filename(repo, '%b-%n.patch', binnode, idx, total) else: - patchname = commands.make_filename(repo, '%b.patch', binnode) + patchname = cmdutil.make_filename(repo, '%b.patch', binnode) p['Content-Disposition'] = 'inline; filename=' + patchname msg.attach(p) else:
--- a/mercurial/hgweb/common.py Tue Oct 03 12:33:22 2006 +0200 +++ b/mercurial/hgweb/common.py Thu Oct 05 00:14:21 2006 +0200 @@ -38,7 +38,7 @@ ct = mimetypes.guess_type(path)[0] or "text/plain" req.header([('Content-type', ct), ('Content-length', os.path.getsize(path))]) - return file(path).read() + return file(path, 'rb').read() except (TypeError, OSError): # illegal fname or unreadable file return ""
--- a/mercurial/merge.py Tue Oct 03 12:33:22 2006 +0200 +++ b/mercurial/merge.py Thu Oct 05 00:14:21 2006 +0200 @@ -379,8 +379,8 @@ # update dirstate if not partial: + recordupdates(repo, action, branchmerge) repo.dirstate.setparents(p1.node(), p2.node()) - recordupdates(repo, action, branchmerge) if show_stats: stats = ((updated, _("updated")),
--- a/templates/gitweb/summary.tmpl Tue Oct 03 12:33:22 2006 +0200 +++ b/templates/gitweb/summary.tmpl Thu Oct 05 00:14:21 2006 +0200 @@ -9,7 +9,7 @@ <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / summary </div> <div class="page_nav"> -summary | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=mf=#node|short#;path=/;style=gitweb">manifest</a>#archives%archiveentry# +summary | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=/;style=gitweb">manifest</a>#archives%archiveentry# <br/> </div>