# HG changeset patch # User Matt Mackall # Date 1160172858 18000 # Node ID 45b639607e52b3a1c3db8e37790d8333d1b06189 # Parent ae85272b59a4e76b06d97de966388d6f85d6578a# Parent 4b2d3c8a6195895a5234c82aebbdd110661ccfad Merge with crew diff -r ae85272b59a4 -r 45b639607e52 doc/Makefile --- a/doc/Makefile Fri Oct 06 16:55:11 2006 -0500 +++ b/doc/Makefile Fri Oct 06 17:14:18 2006 -0500 @@ -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 diff -r ae85272b59a4 -r 45b639607e52 doc/hg.1.txt --- a/doc/hg.1.txt Fri Oct 06 16:55:11 2006 -0500 +++ b/doc/hg.1.txt Fri Oct 06 17:14:18 2006 -0500 @@ -127,6 +127,42 @@ A range acts as a closed interval. This means that a range of 3:5 gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. +DATE FORMATS +------------ + + Some commands (backout, commit, tag) allow the user to specify a date. + Possible formats for dates are: + +YYYY-mm-dd \HH:MM[:SS] [(+|-)NNNN]:: + This is a subset of ISO 8601, allowing just the recommended notations + for date and time. The last part represents the timezone; if omitted, + local time is assumed. Examples: + + "2005-08-22 03:27 -0700" + + "2006-04-19 21:39:51" + +aaa bbb dd HH:MM:SS YYYY [(+|-)NNNN]:: + This is the date format used by the C library. Here, aaa stands for + abbreviated weekday name and bbb for abbreviated month name. The last + part represents the timezone; if omitted, local time is assumed. + Examples: + + "Mon Aug 22 03:27:00 2005 -0700" + + "Wed Apr 19 21:39:51 2006" + +unixtime offset:: + This is the internal representation format for dates. unixtime is + the number of seconds since the epoch (1970-01-01 00:00 UTC). offset + is the offset of the local timezone, in seconds west of UTC (negative + if the timezone is east of UTC). + Examples: + + "1124706420 25200" (2005-08-22 03:27:00 -0700) + + "1145475591 -7200" (2006-04-19 21:39:51 +0200) + ENVIRONMENT VARIABLES --------------------- diff -r ae85272b59a4 -r 45b639607e52 hgext/patchbomb.py --- a/hgext/patchbomb.py Fri Oct 06 16:55:11 2006 -0500 +++ b/hgext/patchbomb.py Fri Oct 06 17:14:18 2006 -0500 @@ -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: diff -r ae85272b59a4 -r 45b639607e52 mercurial/commands.py --- a/mercurial/commands.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/commands.py Fri Oct 06 17:14:18 2006 -0500 @@ -1134,7 +1134,7 @@ error = _(".hg/dirstate inconsistent with current parent's manifest") raise util.Abort(error) -def debugconfig(ui, repo, *values): +def showconfig(ui, repo, *values): """show combined config settings from all hgrc files With no args, print names and values of all config items. @@ -2834,7 +2834,6 @@ [('r', 'rev', '', _('revision to rebuild to'))], _('debugrebuildstate [-r REV] [REV]')), "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), - "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')), "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), "debugstate": (debugstate, [], _('debugstate')), "debugdata": (debugdata, [], _('debugdata FILE REV')), @@ -3017,6 +3016,7 @@ _('hg revert [-r REV] [NAME]...')), "rollback": (rollback, [], _('hg rollback')), "root": (root, [], _('hg root')), + "showconfig|debugconfig": (showconfig, [], _('showconfig [NAME]...')), "^serve": (serve, [('A', 'accesslog', '', _('name of access log file to write to')), @@ -3086,7 +3086,7 @@ norepo = ("clone init version help debugancestor debugcomplete debugdata" " debugindex debugindexdot") -optionalrepo = ("paths serve debugconfig") +optionalrepo = ("paths serve showconfig") def findpossible(ui, cmd): """ @@ -3283,6 +3283,8 @@ path = u.expandpath(options["repository"]) or "" repo = path and hg.repository(u, path=path) or None + if repo and not repo.local(): + raise util.Abort(_("repository '%s' is not local") % path) if options['help']: return help_(u, cmd, options['version']) diff -r ae85272b59a4 -r 45b639607e52 mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/hgweb/common.py Fri Oct 06 17:14:18 2006 -0500 @@ -42,3 +42,20 @@ except (TypeError, OSError): # illegal fname or unreadable file return "" + +def style_map(templatepath, style): + """Return path to mapfile for a given style. + + Searches mapfile in the following locations: + 1. templatepath/style/map + 2. templatepath/map-style + 3. templatepath/map + """ + locations = style and [os.path.join(style, "map"), "map-"+style] or [] + locations.append("map") + for location in locations: + mapfile = os.path.join(templatepath, location) + if os.path.isfile(mapfile): + return mapfile + raise RuntimeError("No hgweb templates found in %r" % templatepath) + diff -r ae85272b59a4 -r 45b639607e52 mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/hgweb/hgweb_mod.py Fri Oct 06 17:14:18 2006 -0500 @@ -11,9 +11,10 @@ import mimetypes from mercurial.demandload import demandload demandload(globals(), "re zlib ConfigParser mimetools cStringIO sys tempfile") +demandload(globals(), 'urllib') demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,streamclone,patch") demandload(globals(), "mercurial:templater") -demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile") +demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile,style_map") from mercurial.node import * from mercurial.i18n import gettext as _ @@ -54,9 +55,9 @@ def archivelist(self, nodeid): allowed = self.repo.ui.configlist("web", "allow_archive") - for i in self.archives: + for i, spec in self.archive_specs.iteritems(): if i in allowed or self.repo.ui.configbool("web", "allow" + i): - yield {"type" : i, "node" : nodeid, "url": ""} + yield {"type" : i, "extension" : spec[2], "node" : nodeid} def listfiles(self, files, mf): for f in files[:self.maxfiles]: @@ -645,36 +646,129 @@ form[name] = value del form[k] + def rewrite_request(req): + '''translate new web interface to traditional format''' + + def spliturl(req): + def firstitem(query): + return query.split('&', 1)[0].split(';', 1)[0] + + root = req.env.get('REQUEST_URI', '').split('?', 1)[0] + pi = req.env.get('PATH_INFO', '') + if pi: + root = root[:-len(pi)] + + if req.env.has_key('REPO_NAME'): + base = '/' + req.env['REPO_NAME'] + else: + base = root + + if pi: + while pi.startswith('//'): + pi = pi[1:] + if pi.startswith(base): + if len(pi) > len(base): + base += '/' + query = pi[len(base):] + else: + if req.env.has_key('REPO_NAME'): + # We are using hgwebdir + base += '/' + else: + base += '?' + query = firstitem(req.env['QUERY_STRING']) + else: + base += '/' + query = pi[1:] + else: + base += '?' + query = firstitem(req.env['QUERY_STRING']) + + return (root + base, query) + + req.url, query = spliturl(req) + + if req.form.has_key('cmd'): + # old style + return + + args = query.split('/', 2) + if not args or not args[0]: + return + + cmd = args.pop(0) + style = cmd.rfind('-') + if style != -1: + req.form['style'] = [cmd[:style]] + cmd = cmd[style+1:] + # avoid accepting e.g. style parameter as command + if hasattr(self, 'do_' + cmd): + req.form['cmd'] = [cmd] + + if args and args[0]: + node = args.pop(0) + req.form['node'] = [node] + if args: + req.form['file'] = args + + if cmd == 'static': + req.form['file'] = req.form['node'] + elif cmd == 'archive': + fn = req.form['node'][0] + for type_, spec in self.archive_specs.iteritems(): + ext = spec[2] + if fn.endswith(ext): + req.form['node'] = [fn[:-len(ext)]] + req.form['type'] = [type_] + + def queryprefix(**map): + return req.url[-1] == '?' and ';' or '?' + + def getentries(**map): + fields = {} + if req.form.has_key('style'): + style = req.form['style'][0] + if style != self.repo.ui.config('web', 'style', ''): + fields['style'] = style + + if fields: + fields = ['%s=%s' % (k, urllib.quote(v)) + for k, v in fields.iteritems()] + yield '%s%s' % (queryprefix(), ';'.join(fields)) + else: + yield '' + self.refresh() expand_form(req.form) + rewrite_request(req) - m = os.path.join(self.templatepath, "map") style = self.repo.ui.config("web", "style", "") if req.form.has_key('style'): style = req.form['style'][0] - if style: - b = os.path.basename("map-" + style) - p = os.path.join(self.templatepath, b) - if os.path.isfile(p): - m = p + mapfile = style_map(self.templatepath, style) - port = req.env["SERVER_PORT"] - port = port != "80" and (":" + port) or "" - uri = req.env["REQUEST_URI"] - if "?" in uri: - uri = uri.split("?")[0] - url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri) + if not req.url: + port = req.env["SERVER_PORT"] + port = port != "80" and (":" + port) or "" + uri = req.env["REQUEST_URI"] + if "?" in uri: + uri = uri.split("?")[0] + req.url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri) + if not self.reponame: self.reponame = (self.repo.ui.config("web", "name") - or uri.strip('/') or self.repo.root) + or req.env.get('REPO_NAME') + or req.url.strip('/') or self.repo.root) - self.t = templater.templater(m, templater.common_filters, - defaults={"url": url, + self.t = templater.templater(mapfile, templater.common_filters, + defaults={"url": req.url, "repo": self.reponame, "header": header, "footer": footer, "rawfileheader": rawfileheader, + "queryprefix": queryprefix, + "getentries": getentries }) if not req.form.has_key('cmd'): @@ -723,6 +817,30 @@ else: return 0 + def do_log(self, req): + if req.form.has_key('file') and req.form['file'][0]: + self.do_filelog(req) + else: + self.do_changelog(req) + + def do_rev(self, req): + self.do_changeset(req) + + def do_file(self, req): + path = req.form.get('file', [''])[0] + if path: + try: + req.write(self.filerevision(self.filectx(req))) + return + except hg.RepoError: + pass + path = self.cleanpath(path) + + req.write(self.manifest(self.changectx(req), '/' + path)) + + def do_diff(self, req): + self.do_filediff(req) + def do_changelog(self, req, shortlog = False): if req.form.has_key('node'): ctx = self.changectx(req) @@ -759,9 +877,6 @@ def do_filediff(self, req): req.write(self.filediff(self.filectx(req))) - def do_file(self, req): - req.write(self.filerevision(self.filectx(req))) - def do_annotate(self, req): req.write(self.fileannotate(self.filectx(req))) diff -r ae85272b59a4 -r 45b639607e52 mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/hgweb/hgwebdir_mod.py Fri Oct 06 17:14:18 2006 -0500 @@ -11,7 +11,7 @@ demandload(globals(), "ConfigParser mimetools cStringIO") demandload(globals(), "mercurial:ui,hg,util,templater") demandload(globals(), "mercurial.hgweb.hgweb_mod:hgweb") -demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile") +demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile,style_map") from mercurial.i18n import gettext as _ # This is a stopgap @@ -69,25 +69,20 @@ def footer(**map): yield tmpl("footer", motd=self.motd, **map) - m = os.path.join(templater.templatepath(), "map") style = self.style if req.form.has_key('style'): style = req.form['style'][0] - if style != "": - b = os.path.basename("map-" + style) - p = os.path.join(templater.templatepath(), b) - if os.path.isfile(p): - m = p - - tmpl = templater.templater(m, templater.common_filters, + mapfile = style_map(templater.templatepath(), style) + tmpl = templater.templater(mapfile, templater.common_filters, defaults={"header": header, "footer": footer}) def archivelist(ui, nodeid, url): allowed = ui.configlist("web", "allow_archive") - for i in ['zip', 'gz', 'bz2']: - if i in allowed or ui.configbool("web", "allow" + i): - yield {"type" : i, "node": nodeid, "url": url} + for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]: + if i[0] in allowed or ui.configbool("web", "allow" + i[0]): + yield {"type" : i[0], "extension": i[1], + "node": nodeid, "url": url} def entries(sortcolumn="", descending=False, **map): rows = [] @@ -101,7 +96,7 @@ get = u.config url = ('/'.join([req.env["REQUEST_URI"].split('?')[0], name]) - .replace("//", "/")) + .replace("//", "/")) + '/' # update time with local timezone try: @@ -142,9 +137,22 @@ yield row virtual = req.env.get("PATH_INFO", "").strip('/') - if virtual: - real = dict(self.repos).get(virtual) + if virtual.startswith('static/'): + static = os.path.join(templater.templatepath(), 'static') + fname = virtual[7:] + req.write(staticfile(static, fname, req) or + tmpl('error', error='%r not found' % fname)) + elif virtual: + while virtual: + real = dict(self.repos).get(virtual) + if real: + break + up = virtual.rfind('/') + if up < 0: + break + virtual = virtual[:up] if real: + req.env['REPO_NAME'] = virtual try: hgweb(real).run_wsgi(req) except IOError, inst: diff -r ae85272b59a4 -r 45b639607e52 mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/hgweb/server.py Fri Oct 06 17:14:18 2006 -0500 @@ -71,7 +71,7 @@ env['REQUEST_METHOD'] = self.command env['SERVER_NAME'] = self.server.server_name env['SERVER_PORT'] = str(self.server.server_port) - env['REQUEST_URI'] = "/" + env['REQUEST_URI'] = self.path env['PATH_INFO'] = path_info if query: env['QUERY_STRING'] = query diff -r ae85272b59a4 -r 45b639607e52 mercurial/sshrepo.py --- a/mercurial/sshrepo.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/sshrepo.py Fri Oct 06 17:14:18 2006 -0500 @@ -70,7 +70,7 @@ lines.append(l) max_noise -= 1 else: - raise hg.RepoError(_("no response from remote hg")) + raise hg.RepoError(_("no suitable response from remote hg")) self.capabilities = () lines.reverse() diff -r ae85272b59a4 -r 45b639607e52 mercurial/util.py --- a/mercurial/util.py Fri Oct 06 16:55:11 2006 -0500 +++ b/mercurial/util.py Fri Oct 06 17:14:18 2006 -0500 @@ -15,7 +15,7 @@ from i18n import gettext as _ from demandload import * demandload(globals(), "cStringIO errno getpass popen2 re shutil sys tempfile") -demandload(globals(), "os threading time") +demandload(globals(), "os threading time calendar") # used by parsedate defaultdateformats = ('%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M', @@ -903,14 +903,22 @@ (string[-5] == '+' or string[-5] == '-') and string[-6].isspace()) + # NOTE: unixtime = localunixtime + offset if hastimezone(string): date, tz = string[:-6], string[-5:] tz = int(tz) offset = - 3600 * (tz / 100) - 60 * (tz % 100) else: - date, offset = string, 0 - when = int(time.mktime(time.strptime(date, format))) + offset - return when, offset + date, offset = string, None + timetuple = time.strptime(date, format) + localunixtime = int(calendar.timegm(timetuple)) + if offset is None: + # local timezone + unixtime = int(time.mktime(timetuple)) + offset = unixtime - localunixtime + else: + unixtime = localunixtime + offset + return unixtime, offset def parsedate(string, formats=None): """parse a localized time string and return a (unixtime, offset) tuple. @@ -929,7 +937,9 @@ else: break else: - raise ValueError(_('invalid date: %r') % string) + raise ValueError(_('invalid date: %r ' + 'see hg(1) manual page for details') + % string) # validate explicit (probably user-specified) date and # time zone offset. values must fit in signed 32 bits for # current 32-bit linux runtimes. timezones go from UTC-12 diff -r ae85272b59a4 -r 45b639607e52 templates/changelog.tmpl --- a/templates/changelog.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/changelog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,24 +1,23 @@ #header# #repo|escape#: changelog + href="#url#rss-log" title="RSS feed for #repo|escape#">
-shortlog -tags -manifest +shortlog +tags +manifest #archives%archiveentry# -rss +rss

changelog for #repo|escape#

-
+

- navigate: #changenav%naventry#

@@ -26,10 +25,9 @@ #entries%changelogentry# - +

- navigate: #changenav%naventry#

diff -r ae85272b59a4 -r 45b639607e52 templates/changelogentry.tmpl --- a/templates/changelogentry.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/changelogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -5,7 +5,7 @@ changeset #rev#: - #node|short# + #node|short# #parent%changelogparent# #child%changelogchild# @@ -19,7 +19,7 @@ #date|date# - files: + files: #files# diff -r ae85272b59a4 -r 45b639607e52 templates/changeset.tmpl --- a/templates/changeset.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/changeset.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,11 +4,11 @@
-changelog -shortlog -tags -manifest -raw +changelog +shortlog +tags +manifest +raw #archives%archiveentry#
@@ -17,7 +17,7 @@ - + #parent%changesetparent# #child%changesetchild# diff -r ae85272b59a4 -r 45b639607e52 templates/fileannotate.tmpl --- a/templates/fileannotate.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/fileannotate.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,14 +4,14 @@

Annotate #file|escape#

@@ -19,7 +19,7 @@
changeset #rev#:#node|short##node|short#
- + #rename%filerename# #parent%fileannotateparent# #child%fileannotatechild# diff -r ae85272b59a4 -r 45b639607e52 templates/filediff.tmpl --- a/templates/filediff.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/filediff.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,14 +4,14 @@

#file|escape#

@@ -19,7 +19,7 @@
changeset #rev#:#node|short#
#node|short#
- + #parent%filediffparent# #child%filediffchild# diff -r ae85272b59a4 -r 45b639607e52 templates/filelog.tmpl --- a/templates/filelog.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/filelog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,18 +1,18 @@ #header# #repo|escape#: #file|escape# history + href="#url#rss-log/tip/#file|urlescape#" title="RSS feed for #repo|escape#:#file#">

#file|escape# revision history

diff -r ae85272b59a4 -r 45b639607e52 templates/filelogentry.tmpl --- a/templates/filelogentry.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/filelogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,14 +1,14 @@
revision #rev#:#node|short##node|short#
- + #rename%filelogrename# diff -r ae85272b59a4 -r 45b639607e52 templates/filerevision.tmpl --- a/templates/filerevision.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/filerevision.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,14 +4,14 @@

#file|escape#

@@ -19,7 +19,7 @@
#date|age# ago:#desc|strip|firstline|escape##desc|strip|firstline|escape#
revision #filerev#: - #node|short# - (diff) - (annotate) + #node|short# + (diff) + (annotate)
- + #rename%filerename# #parent%filerevparent# #child%filerevchild# diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/changelog.tmpl --- a/templates/gitweb/changelog.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/changelog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,26 +1,24 @@ #header# #repo|escape#: Changelog + href="{url}rss-log" title="RSS feed for #repo|escape#"> - + diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/changelogentry.tmpl --- a/templates/gitweb/changelogentry.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/changelogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,9 +1,9 @@
-#date|age# ago#desc|strip|firstline|escape# +#date|age# ago#desc|strip|firstline|escape#
#author|obfuscate# [#date|rfc822date#] rev #rev#
diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/changeset.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,27 +1,27 @@ #header# #repo|escape#: Changeset + href="{url}rss-log" title="RSS feed for #repo|escape#">
-#desc|strip|escape|firstline# +#desc|strip|escape|firstline#
changeset #rev#:#node|short#
#node|short#
- + #parent%changesetparent# #child%changesetchild# #changesettag# diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/error.tmpl --- a/templates/gitweb/error.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/error.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,16 +1,16 @@ #header# #repo|escape#: Error + href="{url}rss-log" title="RSS feed for #repo|escape#">
diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/fileannotate.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,16 +1,24 @@ #header# #repo|escape#: Annotate + href="{url}rss-log" title="RSS feed for #repo|escape#">
#file|escape#
@@ -18,13 +26,13 @@
author#author|obfuscate#
#date|date# (#date|age# ago)
changeset#node|short#
manifest#node|short#
manifest#node|short#
- + #rename%filerename# #parent%fileannotateparent# #child%fileannotatechild# - + diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/filelog.tmpl --- a/templates/gitweb/filelog.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/filelog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,16 +1,23 @@ #header# #repo|escape#: File revisions + href="{url}rss-log" title="RSS feed for #repo|escape#">
#file|urlescape#
diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/filerevision.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,16 +1,25 @@ #header# #repo|escape#: File revision + href="{url}rss-log" title="RSS feed for #repo|escape#">
#file|escape#
@@ -18,13 +27,13 @@
changeset #rev#:#node|short#
#node|short#
manifest:#node|short#
#node|short#
author: #author|obfuscate#
- + #rename%filerename# #parent%fileannotateparent# #child%fileannotatechild# - + diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/footer.tmpl --- a/templates/gitweb/footer.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/footer.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,6 +1,6 @@ diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/header.tmpl --- a/templates/gitweb/header.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/header.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,8 +4,8 @@ - + - + diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/manifest.tmpl --- a/templates/gitweb/manifest.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/manifest.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,16 +1,21 @@ #header# #repo|escape#: Manifest + href="{url}rss-log" title="RSS feed for #repo|escape#">
#path|escape#
@@ -18,7 +23,7 @@
changeset #rev#:#node|short#
#node|short#
manifest:#node|short#
#node|short#
author: #author|obfuscate#
- + #dentries%manifestdirentry# diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/gitweb/map Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,52 @@ +default = 'summary' +header = header.tmpl +footer = footer.tmpl +search = search.tmpl +changelog = changelog.tmpl +summary = summary.tmpl +error = error.tmpl +naventry = '#label|escape# ' +navshortentry = '#label|escape# ' +filedifflink = '#file|escape# ' +filenodelink = '' +fileellipses = '...' +changelogentry = changelogentry.tmpl +searchentry = changelogentry.tmpl +changeset = changeset.tmpl +manifest = manifest.tmpl +manifestdirentry = '' +manifestfileentry = '' +filerevision = filerevision.tmpl +fileannotate = fileannotate.tmpl +filelog = filelog.tmpl +fileline = '
   #linenumber# #line|escape#
' +annotateline = '' +difflineplus = '
#line|escape#
' +difflineminus = '
#line|escape#
' +difflineat = '
#line|escape#
' +diffline = '
#line|escape#
' +changelogparent = '' +changesetparent = '' +filerevparent = '' +filerename = '' +filelogrename = '| base' +fileannotateparent = '' +changelogchild = '' +changesetchild = '' +filerevchild = '' +fileannotatechild = '' +tags = tags.tmpl +tagentry = '' +diffblock = '
#lines#
' +changelogtag = '' +changesettag = '' +filediffparent = '' +filelogparent = '' +filediffchild = '' +filelogchild = '' +shortlog = shortlog.tmpl +shortlogentry = '' +filelogentry = '' +archiveentry = ' | #type|escape# ' +indexentry = '' +index = index.tmpl diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/search.tmpl --- a/templates/gitweb/search.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/search.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,22 +1,24 @@ #header#

searching for #query|escape#

- + search: - #entries# - + search: - diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/shortlog.tmpl --- a/templates/gitweb/shortlog.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/shortlog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,25 +1,27 @@ #header# #repo|escape#: Shortlog + href="{url}rss-log" title="RSS feed for #repo|escape#"> - +
drwxr-xr-x[up][up]
#file|escape#
drwxr-xr-x#basename|escape#/
#permissions|permissions##basename|escape#
#author|obfuscate#@#rev#
#line|escape#
parent #rev#:#node|short#
parent#node|short#
parent:#node|short#
parent:#file|escape#@#node|short#
parent:#node|short#
child #rev#:#node|short#
child#node|short#
child:#node|short#
child:#node|short#
#date|age# ago#tag|escape#
tag:#tag|escape#
tag#tag|escape#
parent #rev#:#node|short#
parent #rev#: #node|short#
child #rev#:#node|short#
child #rev#: #node|short#
#date|age# ago#author##desc|strip|firstline|escape#
#date|age# ago#desc|strip|firstline|escape#
#name|escape##description##contact|obfuscate##lastchange|age# ago
-
changes
+
changes
#shortlog# - +
...
...
-
tags
+
tags
#tags# - +
...
...
#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/gitweb/tags.tmpl --- a/templates/gitweb/tags.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/gitweb/tags.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,16 +1,20 @@ #header# #repo|escape#: Tags + href="{url}rss-log" title="RSS feed for #repo|escape#"> diff -r ae85272b59a4 -r 45b639607e52 templates/header.tmpl --- a/templates/header.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/header.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -3,6 +3,6 @@ - + - + diff -r ae85272b59a4 -r 45b639607e52 templates/manifest.tmpl --- a/templates/manifest.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/manifest.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,10 +4,10 @@
-changelog -shortlog -tags -changeset +changelog +shortlog +tags +changeset #archives%archiveentry#
@@ -16,7 +16,7 @@
drwxr-xr-x  - [up] + [up] #dentries%manifestdirentry# #fentries%manifestfileentry#
diff -r ae85272b59a4 -r 45b639607e52 templates/map --- a/templates/map Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/map Fri Oct 06 17:14:18 2006 -0500 @@ -5,49 +5,49 @@ changelog = changelog.tmpl shortlog = shortlog.tmpl shortlogentry = shortlogentry.tmpl -naventry = '#label|escape# ' -navshortentry = '#label|escape# ' -filedifflink = '#file|escape# ' -filenodelink = '#file|escape# ' +naventry = '#label|escape# ' +navshortentry = '#label|escape# ' +filedifflink = '#file|escape# ' +filenodelink = '#file|escape# ' fileellipses = '...' changelogentry = changelogentry.tmpl searchentry = changelogentry.tmpl changeset = changeset.tmpl manifest = manifest.tmpl -manifestdirentry = 'drwxr-xr-x #basename|escape#/' -manifestfileentry = '#permissions|permissions# #basename|escape#' +manifestdirentry = 'drwxr-xr-x #basename|escape#/' +manifestfileentry = '#permissions|permissions# #basename|escape#' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl filelog = filelog.tmpl fileline = '
#linenumber##line|escape#
' filelogentry = filelogentry.tmpl -annotateline = '#author|obfuscate#@#rev#
#line|escape#
' +annotateline = '#author|obfuscate#@#rev#
#line|escape#
' difflineplus = '#line|escape#' difflineminus = '#line|escape#' difflineat = '#line|escape#' diffline = '#line|escape#' -changelogparent = 'parent #rev#:#node|short#' -changesetparent = 'parent #rev#:#node|short#' -filerevparent = 'parent:#node|short#' -filerename = 'parent:#file|escape#@#node|short#' -filelogrename = 'base:#file|escape#@#node|short#' -fileannotateparent = 'parent:#node|short#' -changesetchild = 'child #rev#:#node|short#' -changelogchild = 'child #rev#:#node|short#' -filerevchild = 'child:#node|short#' -fileannotatechild = 'child:#node|short#' +changelogparent = 'parent #rev#:#node|short#' +changesetparent = 'parent #rev#:#node|short#' +filerevparent = 'parent:#node|short#' +filerename = 'parent:#file|escape#@#node|short#' +filelogrename = 'base:#file|escape#@#node|short#' +fileannotateparent = 'parent:#node|short#' +changesetchild = 'child #rev#:#node|short#' +changelogchild = 'child #rev#:#node|short#' +filerevchild = 'child:#node|short#' +fileannotatechild = 'child:#node|short#' tags = tags.tmpl -tagentry = '
  • #node# #tag|escape#
  • ' +tagentry = '
  • #node# #tag|escape#
  • ' diffblock = '
    #lines#
    ' changelogtag = 'tag:#tag|escape#' changesettag = 'tag:#tag|escape#' -filediffparent = 'parent #rev#:#node|short#' -filelogparent = 'parent #rev#:#node|short#' -filediffchild = 'child #rev#:#node|short#' -filelogchild = 'child #rev#:#node|short#' -indexentry = '#name|escape##description##contact|obfuscate##lastchange|age# agoRSS #archives%archiveentry#' +filediffparent = 'parent #rev#:#node|short#' +filelogparent = 'parent #rev#:#node|short#' +filediffchild = 'child #rev#:#node|short#' +filelogchild = 'child #rev#:#node|short#' +indexentry = '#name|escape##description##contact|obfuscate##lastchange|age# agoRSS #archives%archiveentry#' index = index.tmpl -archiveentry = '#type|escape# ' +archiveentry = '#type|escape# ' notfound = notfound.tmpl error = error.tmpl diff -r ae85272b59a4 -r 45b639607e52 templates/map-gitweb --- a/templates/map-gitweb Fri Oct 06 16:55:11 2006 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -default = 'summary' -header = gitweb/header.tmpl -footer = gitweb/footer.tmpl -search = gitweb/search.tmpl -changelog = gitweb/changelog.tmpl -summary = gitweb/summary.tmpl -error = gitweb/error.tmpl -naventry = '#label|escape# ' -navshortentry = '#label|escape# ' -filedifflink = '#file|escape# ' -filenodelink = '#file|escape#file | annotate | revisions' -fileellipses = '...' -changelogentry = gitweb/changelogentry.tmpl -searchentry = gitweb/changelogentry.tmpl -changeset = gitweb/changeset.tmpl -manifest = gitweb/manifest.tmpl -manifestdirentry = 'drwxr-xr-x#basename|escape#/manifest' -manifestfileentry = '#permissions|permissions##basename|escape#file | revisions | annotate' -filerevision = gitweb/filerevision.tmpl -fileannotate = gitweb/fileannotate.tmpl -filelog = gitweb/filelog.tmpl -fileline = '
       #linenumber# #line|escape#
    ' -annotateline = '#author|obfuscate#@#rev#
    #line|escape#
    ' -difflineplus = '
    #line|escape#
    ' -difflineminus = '
    #line|escape#
    ' -difflineat = '
    #line|escape#
    ' -diffline = '
    #line|escape#
    ' -changelogparent = 'parent #rev#:#node|short#' -changesetparent = 'parent#node|short#' -filerevparent = 'parent:#node|short#' -filerename = 'parent:#file|escape#@#node|short#' -filelogrename = '| base' -fileannotateparent = 'parent:#node|short#' -changelogchild = 'child #rev#:#node|short#' -changesetchild = 'child#node|short#' -filerevchild = 'child:#node|short#' -fileannotatechild = 'child:#node|short#' -tags = gitweb/tags.tmpl -tagentry = '#date|age# ago#tag|escape#changeset | changelog | manifest' -diffblock = '
    #lines#
    ' -changelogtag = 'tag:#tag|escape#' -changesettag = 'tag#tag|escape#' -filediffparent = 'parent #rev#:#node|short#' -filelogparent = 'parent #rev#: #node|short#' -filediffchild = 'child #rev#:#node|short#' -filelogchild = 'child #rev#: #node|short#' -shortlog = gitweb/shortlog.tmpl -shortlogentry = '#date|age# ago#author##desc|strip|firstline|escape#changeset | manifest' -filelogentry = '#date|age# ago#desc|strip|firstline|escape#file | annotate #rename%filelogrename#' -archiveentry = ' | #type|escape# ' -indexentry = '#name|escape##description##contact|obfuscate##lastchange|age# ago #archives%archiveentry#' -index = gitweb/index.tmpl diff -r ae85272b59a4 -r 45b639607e52 templates/map-raw --- a/templates/map-raw Fri Oct 06 16:55:11 2006 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -header = raw/header.tmpl -footer = '' -changeset = raw/changeset.tmpl -difflineplus = '#line#' -difflineminus = '#line#' -difflineat = '#line#' -diffline = '#line#' -changesetparent = '# Parent #node#' -changesetchild = '# Child #node#' -filenodelink = '' -filerevision = '#rawfileheader##raw#' -fileline = '#line#' -diffblock = '#lines#' -filediff = raw/filediff.tmpl -fileannotate = raw/fileannotate.tmpl -annotateline = '#author#@#rev#: #line#' diff -r ae85272b59a4 -r 45b639607e52 templates/map-rss --- a/templates/map-rss Fri Oct 06 16:55:11 2006 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -default = 'changelog' -header = rss/header.tmpl -changelog = rss/changelog.tmpl -changelogentry = rss/changelogentry.tmpl -filelog = rss/filelog.tmpl -filelogentry = rss/filelogentry.tmpl -tags = rss/tags.tmpl -tagentry = rss/tagentry.tmpl diff -r ae85272b59a4 -r 45b639607e52 templates/old/changelog.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/changelog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,38 @@ +#header# +#repo|escape#: changelog + + + + +
    +shortlog +tags +manifest +#archives%archiveentry# +rss +
    + +

    changelog for #repo|escape#

    + +
    +

    + + + +navigate: #changenav%naventry# +

    +
    + +#entries%changelogentry# + +
    +

    + + + +navigate: #changenav%naventry# +

    +
    + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/changelogentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/changelogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,25 @@ + + + + + + + + + + #parent%changelogparent# + #child%changelogchild# + #changelogtag# + + + + + + + + + + + + +
    #date|age# ago:#desc|strip|firstline|escape#
    changeset #rev#:#node|short#
    author:#author|obfuscate#
    date:#date|date#
    files:#files#
    diff -r ae85272b59a4 -r 45b639607e52 templates/old/changeset.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/changeset.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,47 @@ +#header# +#repo|escape#: changeset #node|short# + + + +
    +changelog +shortlog +tags +manifest +raw +#archives%archiveentry# +
    + +

    changeset: #desc|strip|escape|firstline#

    + + + + + + +#parent%changesetparent# +#child%changesetchild# +#changesettag# + + + + + + + + + + + + + + +
    changeset #rev#:#node|short#
    author:#author|obfuscate#
    date:#date|date# (#date|age# ago)
    files:#files#
    description:#desc|strip|escape|addbreaks#
    + +
    +#diff# +
    + +#footer# + + diff -r ae85272b59a4 -r 45b639607e52 templates/old/fileannotate.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/fileannotate.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,43 @@ +#header# +#repo|escape#: #file|escape# annotate + + + + + +

    Annotate #file|escape#

    + + + + + +#rename%filerename# +#parent%fileannotateparent# +#child%fileannotatechild# + + + + + + + + + +
    changeset #rev#:#node|short#
    author:#author|obfuscate#
    date:#date|date# (#date|age# ago)
    permissions:#permissions|permissions#
    + +
    + + +#annotate%annotateline# +
    + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/filediff.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/filediff.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,34 @@ +#header# +#repo|escape#: #file|escape# diff + + + + + +

    #file|escape#

    + + + + + + +#parent%filediffparent# +#child%filediffchild# +
    revision #rev#:#node|short#
    + +
    +#diff# +
    + +#footer# + + diff -r ae85272b59a4 -r 45b639607e52 templates/old/filelog.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/filelog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,22 @@ +#header# +#repo|escape#: #file|escape# history + + + + + + + +

    #file|escape# revision history

    + +#entries%filelogentry# + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/filelogentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/filelogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,25 @@ + + + + + + + + + #rename%filelogrename# + + + + + + + + +
    #date|age# ago:#desc|strip|firstline|escape#
    revision #filerev#: + + #node|short# + (diff) + (annotate) +
    author:#author|obfuscate#
    date:#date|date#
    + + diff -r ae85272b59a4 -r 45b639607e52 templates/old/filerevision.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/filerevision.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,41 @@ +#header# +#repo|escape#:#file|escape# + + + + + +

    #file|escape#

    + + + + + +#rename%filerename# +#parent%filerevparent# +#child%filerevchild# + + + + + + + + + +
    changeset #rev#:#node|short#
    author:#author|obfuscate#
    date:#date|date# (#date|age# ago)
    permissions:#permissions|permissions#
    + +
    +#text%fileline#
    +
    + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/header.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/header.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,8 @@ +Content-type: text/html + + + + + + + diff -r ae85272b59a4 -r 45b639607e52 templates/old/manifest.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/manifest.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,23 @@ +#header# +#repo|escape#: manifest for changeset #node|short# + + + +
    +changelog +shortlog +tags +changeset +#archives%archiveentry# +
    + +

    manifest for changeset #node|short#: #path|escape#

    + + + +
    drwxr-xr-x  + [up] +#dentries%manifestdirentry# +#fentries%manifestfileentry# +
    +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/map Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,53 @@ +default = 'changelog' +header = header.tmpl +footer = footer.tmpl +search = search.tmpl +changelog = changelog.tmpl +shortlog = shortlog.tmpl +shortlogentry = shortlogentry.tmpl +naventry = '#label|escape# ' +navshortentry = '#label|escape# ' +filedifflink = '#file|escape# ' +filenodelink = '#file|escape# ' +fileellipses = '...' +changelogentry = changelogentry.tmpl +searchentry = changelogentry.tmpl +changeset = changeset.tmpl +manifest = manifest.tmpl +manifestdirentry = 'drwxr-xr-x #basename|escape#/' +manifestfileentry = '#permissions|permissions# #basename|escape#' +filerevision = filerevision.tmpl +fileannotate = fileannotate.tmpl +filediff = filediff.tmpl +filelog = filelog.tmpl +fileline = '
    #linenumber##line|escape#
    ' +filelogentry = filelogentry.tmpl +annotateline = '#author|obfuscate#@#rev#
    #line|escape#
    ' +difflineplus = '#line|escape#' +difflineminus = '#line|escape#' +difflineat = '#line|escape#' +diffline = '#line|escape#' +changelogparent = 'parent #rev#:#node|short#' +changesetparent = 'parent #rev#:#node|short#' +filerevparent = 'parent:#node|short#' +filerename = 'parent:#file|escape#@#node|short#' +filelogrename = 'base:#file|escape#@#node|short#' +fileannotateparent = 'parent:#node|short#' +changesetchild = 'child #rev#:#node|short#' +changelogchild = 'child #rev#:#node|short#' +filerevchild = 'child:#node|short#' +fileannotatechild = 'child:#node|short#' +tags = tags.tmpl +tagentry = '
  • #node# #tag|escape#
  • ' +diffblock = '
    #lines#
    ' +changelogtag = 'tag:#tag|escape#' +changesettag = 'tag:#tag|escape#' +filediffparent = 'parent #rev#:#node|short#' +filelogparent = 'parent #rev#:#node|short#' +filediffchild = 'child #rev#:#node|short#' +filelogchild = 'child #rev#:#node|short#' +indexentry = '#name|escape##description##contact|obfuscate##lastchange|age# agoRSS #archives%archiveentry#' +index = index.tmpl +archiveentry = '#type|escape# ' +notfound = notfound.tmpl +error = error.tmpl diff -r ae85272b59a4 -r 45b639607e52 templates/old/search.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/search.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,33 @@ +#header# +#repo|escape#: searching for #query|escape# + + + + + +

    searching for #query|escape#

    + +
    +

    +search: + + +

    +
    + +#entries# + +
    +

    +search: + + +

    +
    + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/shortlog.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/shortlog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,38 @@ +#header# +#repo|escape#: shortlog + + + + +
    +changelog +tags +manifest +#archives%archiveentry# +rss +
    + +

    shortlog for #repo|escape#

    + +
    +

    + + + +navigate: #changenav%navshortentry# +

    +
    + +#entries%shortlogentry# + +
    +

    + + + +navigate: #changenav%navshortentry# +

    +
    + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/old/shortlogentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/shortlogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,7 @@ + + + + + + +
    #date|age##author|obfuscate##desc|strip|firstline|escape#
    diff -r ae85272b59a4 -r 45b639607e52 templates/old/tags.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/old/tags.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,21 @@ +#header# +#repo|escape#: tags + + + + + + +

    tags:

    + + + +#footer# diff -r ae85272b59a4 -r 45b639607e52 templates/raw/map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/raw/map Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,16 @@ +header = header.tmpl +footer = '' +changeset = changeset.tmpl +difflineplus = '#line#' +difflineminus = '#line#' +difflineat = '#line#' +diffline = '#line#' +changesetparent = '# Parent #node#' +changesetchild = '# Child #node#' +filenodelink = '' +filerevision = '#rawfileheader##raw#' +fileline = '#line#' +diffblock = '#lines#' +filediff = filediff.tmpl +fileannotate = fileannotate.tmpl +annotateline = '#author#@#rev#: #line#' diff -r ae85272b59a4 -r 45b639607e52 templates/rss/map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/rss/map Fri Oct 06 17:14:18 2006 -0500 @@ -0,0 +1,8 @@ +default = 'changelog' +header = header.tmpl +changelog = changelog.tmpl +changelogentry = changelogentry.tmpl +filelog = filelog.tmpl +filelogentry = filelogentry.tmpl +tags = tags.tmpl +tagentry = tagentry.tmpl diff -r ae85272b59a4 -r 45b639607e52 templates/search.tmpl --- a/templates/search.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/search.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -4,10 +4,10 @@

    searching for #query|escape#

    @@ -15,7 +15,6 @@

    search: -

    @@ -25,7 +24,6 @@

    search: -

    diff -r ae85272b59a4 -r 45b639607e52 templates/shortlog.tmpl --- a/templates/shortlog.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/shortlog.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,24 +1,23 @@ #header# #repo|escape#: shortlog + href="#url#rss-log" title="RSS feed for #repo|escape#">
    -changelog -tags -manifest +changelog +tags +manifest #archives%archiveentry# -rss +rss

    shortlog for #repo|escape#

    -
    +

    - navigate: #changenav%navshortentry#

    @@ -26,10 +25,9 @@ #entries%shortlogentry# - +

    - navigate: #changenav%navshortentry#

    diff -r ae85272b59a4 -r 45b639607e52 templates/shortlogentry.tmpl --- a/templates/shortlogentry.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/shortlogentry.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -2,6 +2,6 @@ #date|age# #author|obfuscate# - #desc|strip|firstline|escape# + #desc|strip|firstline|escape# diff -r ae85272b59a4 -r 45b639607e52 templates/tags.tmpl --- a/templates/tags.tmpl Fri Oct 06 16:55:11 2006 -0500 +++ b/templates/tags.tmpl Fri Oct 06 17:14:18 2006 -0500 @@ -1,15 +1,15 @@ #header# #repo|escape#: tags + href="#url#rss-tags" title="RSS feed for #repo|escape#: tags">

    tags:

    diff -r ae85272b59a4 -r 45b639607e52 tests/test-commit.out --- a/tests/test-commit.out Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-commit.out Fri Oct 06 17:14:18 2006 -0500 @@ -1,13 +1,13 @@ abort: impossible time zone offset: 4444444 transaction abort! rollback completed -abort: invalid date: '1\t15.1' +abort: invalid date: '1\t15.1' see hg(1) manual page for details transaction abort! rollback completed -abort: invalid date: 'foo bar' +abort: invalid date: 'foo bar' see hg(1) manual page for details transaction abort! rollback completed -abort: invalid date: ' 1 4444' +abort: invalid date: ' 1 4444' see hg(1) manual page for details transaction abort! rollback completed abort: date exceeds 32 bits: 111111111111 diff -r ae85272b59a4 -r 45b639607e52 tests/test-globalopts.out --- a/tests/test-globalopts.out Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-globalopts.out Fri Oct 06 17:14:18 2006 -0500 @@ -114,94 +114,96 @@ list of commands (use "hg help -v" to show aliases and global options): - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information per file line - archive create unversioned archive of a repository revision - backout reverse effect of earlier changeset - bundle create a changegroup file - cat output the latest or given revisions of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - grep search for a pattern in specified files and revisions - heads show current repository heads - help show help for a command, extension, or list of commands - identify print information about the working copy - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest - merge Merge working directory with another revision - outgoing show changesets not found in destination - parents show the parents of the working dir or revision - paths show definition of symbolic path names - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - revert revert files or dirs to their states as of some revision - rollback roll back the last transaction in this repository - root print the root (top) of the current working dir - serve export the repository via HTTP - status show changed files in the working directory - tag add a tag for the current tip or a given revision - tags list repository tags - tip show the tip revision - unbundle apply a changegroup file - update update or merge working directory - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information per file line + archive create unversioned archive of a repository revision + backout reverse effect of earlier changeset + bundle create a changegroup file + cat output the latest or given revisions of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + grep search for a pattern in specified files and revisions + heads show current repository heads + help show help for a command, extension, or list of commands + identify print information about the working copy + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the latest or given revision of the project manifest + merge Merge working directory with another revision + outgoing show changesets not found in destination + parents show the parents of the working dir or revision + paths show definition of symbolic path names + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + revert revert files or dirs to their states as of some revision + rollback roll back the last transaction in this repository + root print the root (top) of the current working dir + serve export the repository via HTTP + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + tag add a tag for the current tip or a given revision + tags list repository tags + tip show the tip revision + unbundle apply a changegroup file + update update or merge working directory + verify verify the integrity of the repository + version output version and copyright information Mercurial Distributed SCM list of commands (use "hg help -v" to show aliases and global options): - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information per file line - archive create unversioned archive of a repository revision - backout reverse effect of earlier changeset - bundle create a changegroup file - cat output the latest or given revisions of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - grep search for a pattern in specified files and revisions - heads show current repository heads - help show help for a command, extension, or list of commands - identify print information about the working copy - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest - merge Merge working directory with another revision - outgoing show changesets not found in destination - parents show the parents of the working dir or revision - paths show definition of symbolic path names - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - revert revert files or dirs to their states as of some revision - rollback roll back the last transaction in this repository - root print the root (top) of the current working dir - serve export the repository via HTTP - status show changed files in the working directory - tag add a tag for the current tip or a given revision - tags list repository tags - tip show the tip revision - unbundle apply a changegroup file - update update or merge working directory - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information per file line + archive create unversioned archive of a repository revision + backout reverse effect of earlier changeset + bundle create a changegroup file + cat output the latest or given revisions of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + grep search for a pattern in specified files and revisions + heads show current repository heads + help show help for a command, extension, or list of commands + identify print information about the working copy + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the latest or given revision of the project manifest + merge Merge working directory with another revision + outgoing show changesets not found in destination + parents show the parents of the working dir or revision + paths show definition of symbolic path names + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + revert revert files or dirs to their states as of some revision + rollback roll back the last transaction in this repository + root print the root (top) of the current working dir + serve export the repository via HTTP + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + tag add a tag for the current tip or a given revision + tags list repository tags + tip show the tip revision + unbundle apply a changegroup file + update update or merge working directory + verify verify the integrity of the repository + version output version and copyright information %% not tested: --debugger diff -r ae85272b59a4 -r 45b639607e52 tests/test-help.out --- a/tests/test-help.out Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-help.out Fri Oct 06 17:14:18 2006 -0500 @@ -38,92 +38,94 @@ list of commands (use "hg help -v" to show aliases and global options): - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information per file line - archive create unversioned archive of a repository revision - backout reverse effect of earlier changeset - bundle create a changegroup file - cat output the latest or given revisions of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - grep search for a pattern in specified files and revisions - heads show current repository heads - help show help for a command, extension, or list of commands - identify print information about the working copy - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest - merge Merge working directory with another revision - outgoing show changesets not found in destination - parents show the parents of the working dir or revision - paths show definition of symbolic path names - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - revert revert files or dirs to their states as of some revision - rollback roll back the last transaction in this repository - root print the root (top) of the current working dir - serve export the repository via HTTP - status show changed files in the working directory - tag add a tag for the current tip or a given revision - tags list repository tags - tip show the tip revision - unbundle apply a changegroup file - update update or merge working directory - verify verify the integrity of the repository - version output version and copyright information - add add the specified files on the next commit - addremove add all new files, delete all missing files - annotate show changeset information per file line - archive create unversioned archive of a repository revision - backout reverse effect of earlier changeset - bundle create a changegroup file - cat output the latest or given revisions of files - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - copy mark files as copied for the next commit - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - grep search for a pattern in specified files and revisions - heads show current repository heads - help show help for a command, extension, or list of commands - identify print information about the working copy - import import an ordered set of patches - incoming show new changesets found in source - init create a new repository in the given directory - locate locate files matching specific patterns - log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest - merge Merge working directory with another revision - outgoing show changesets not found in destination - parents show the parents of the working dir or revision - paths show definition of symbolic path names - pull pull changes from the specified source - push push changes to the specified destination - recover roll back an interrupted transaction - remove remove the specified files on the next commit - rename rename files; equivalent of copy + remove - revert revert files or dirs to their states as of some revision - rollback roll back the last transaction in this repository - root print the root (top) of the current working dir - serve export the repository via HTTP - status show changed files in the working directory - tag add a tag for the current tip or a given revision - tags list repository tags - tip show the tip revision - unbundle apply a changegroup file - update update or merge working directory - verify verify the integrity of the repository - version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information per file line + archive create unversioned archive of a repository revision + backout reverse effect of earlier changeset + bundle create a changegroup file + cat output the latest or given revisions of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + grep search for a pattern in specified files and revisions + heads show current repository heads + help show help for a command, extension, or list of commands + identify print information about the working copy + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the latest or given revision of the project manifest + merge Merge working directory with another revision + outgoing show changesets not found in destination + parents show the parents of the working dir or revision + paths show definition of symbolic path names + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + revert revert files or dirs to their states as of some revision + rollback roll back the last transaction in this repository + root print the root (top) of the current working dir + serve export the repository via HTTP + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + tag add a tag for the current tip or a given revision + tags list repository tags + tip show the tip revision + unbundle apply a changegroup file + update update or merge working directory + verify verify the integrity of the repository + version output version and copyright information + add add the specified files on the next commit + addremove add all new files, delete all missing files + annotate show changeset information per file line + archive create unversioned archive of a repository revision + backout reverse effect of earlier changeset + bundle create a changegroup file + cat output the latest or given revisions of files + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + copy mark files as copied for the next commit + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + grep search for a pattern in specified files and revisions + heads show current repository heads + help show help for a command, extension, or list of commands + identify print information about the working copy + import import an ordered set of patches + incoming show new changesets found in source + init create a new repository in the given directory + locate locate files matching specific patterns + log show revision history of entire repository or files + manifest output the latest or given revision of the project manifest + merge Merge working directory with another revision + outgoing show changesets not found in destination + parents show the parents of the working dir or revision + paths show definition of symbolic path names + pull pull changes from the specified source + push push changes to the specified destination + recover roll back an interrupted transaction + remove remove the specified files on the next commit + rename rename files; equivalent of copy + remove + revert revert files or dirs to their states as of some revision + rollback roll back the last transaction in this repository + root print the root (top) of the current working dir + serve export the repository via HTTP + showconfig show combined config settings from all hgrc files + status show changed files in the working directory + tag add a tag for the current tip or a given revision + tags list repository tags + tip show the tip revision + unbundle apply a changegroup file + update update or merge working directory + verify verify the integrity of the repository + version output version and copyright information hg add [OPTION]... [FILE]... add the specified files on the next commit diff -r ae85272b59a4 -r 45b639607e52 tests/test-parse-date --- a/tests/test-parse-date Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-parse-date Fri Oct 06 17:14:18 2006 -0500 @@ -1,5 +1,6 @@ #!/bin/sh +# This runs with TZ="GMT" hg init echo "test-parse-date" > a hg add a @@ -13,4 +14,21 @@ hg ci -d "should fail" -m "fail" hg ci -d "100000000000000000 1400" -m "fail" hg ci -d "100000 1400000" -m "fail" + +# Check with local timezone other than GMT and with DST +TZ="PST+8PDT" +export TZ +# PST=UTC-8 / PDT=UTC-7 +hg debugrebuildstate +echo "a" > a +hg ci -d "2006-07-15 13:30" -m "summer@UTC-7" +hg debugrebuildstate +echo "b" > a +hg ci -d "2006-07-15 13:30 +0500" -m "summer@UTC+5" +hg debugrebuildstate +echo "c" > a +hg ci -d "2006-01-15 13:30" -m "winter@UTC-8" +hg debugrebuildstate +echo "d" > a +hg ci -d "2006-01-15 13:30 +0500" -m "winter@UTC+5" hg log --template '{date|date}\n' diff -r ae85272b59a4 -r 45b639607e52 tests/test-parse-date.out --- a/tests/test-parse-date.out Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-parse-date.out Fri Oct 06 17:14:18 2006 -0500 @@ -3,7 +3,7 @@ merging with changeset 2:e6c3abc120e7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -abort: invalid date: 'should fail' +abort: invalid date: 'should fail' see hg(1) manual page for details transaction abort! rollback completed abort: date exceeds 32 bits: 100000000000000000 @@ -12,6 +12,10 @@ abort: impossible time zone offset: 1400000 transaction abort! rollback completed +Sun Jan 15 13:30:00 2006 +0500 +Sun Jan 15 13:30:00 2006 -0800 +Sat Jul 15 13:30:00 2006 +0500 +Sat Jul 15 13:30:00 2006 -0700 Sun Jun 11 00:26:40 2006 -0400 Sat Apr 15 13:30:00 2006 +0200 Sat Apr 15 13:30:00 2006 +0000 diff -r ae85272b59a4 -r 45b639607e52 tests/test-ssh --- a/tests/test-ssh Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-ssh Fri Oct 06 17:14:18 2006 -0500 @@ -36,6 +36,9 @@ cd .. +echo "# repo not found error" +hg clone -e ./dummyssh ssh://user@dummy/nonexistent local + echo "# clone remote via stream" hg clone -e ./dummyssh --uncompressed ssh://user@dummy/remote local-stream 2>&1 | \ sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/' diff -r ae85272b59a4 -r 45b639607e52 tests/test-ssh.out --- a/tests/test-ssh.out Fri Oct 06 16:55:11 2006 -0500 +++ b/tests/test-ssh.out Fri Oct 06 17:14:18 2006 -0500 @@ -1,4 +1,7 @@ # creating 'remote' +# repo not found error +abort: no suitable response from remote hg! +remote: abort: repository nonexistent not found! # clone remote via stream streaming all changes XXX files to transfer, XXX bytes of data @@ -77,6 +80,7 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files +Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio 3: 4: 5: Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: