Mercurial > hg
comparison mercurial/hgweb/webcommands.py @ 10264:d6512b3e9ac0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Jan 2010 22:45:09 -0600 |
parents | e8c7410371e0 25e572394f5c |
children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
10260:fe699ca08a45 | 10264:d6512b3e9ac0 |
---|---|
1 # | 1 # |
2 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> | 2 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
4 # | 4 # |
5 # This software may be used and distributed according to the terms of the | 5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2, incorporated herein by reference. | 6 # GNU General Public License version 2 or any later version. |
7 | 7 |
8 import os, mimetypes, re, cgi, copy | 8 import os, mimetypes, re, cgi, copy |
9 import webutil | 9 import webutil |
10 from mercurial import error, archival, templater, templatefilters | 10 from mercurial import error, archival, templater, templatefilters |
11 from mercurial.node import short, hex | 11 from mercurial.node import short, hex |