# HG changeset patch # User Vadim Gelfer # Date 1154016893 25200 # Node ID 8342c0286184e1871c084431093a2b5393d99fd3 # Parent 2ab464771b7d15c60014996d2853efc92cdb8465# Parent accadcb4e4b5615862d9bd6a52f04725b98b03d2 merge with crew. diff -r 2ab464771b7d -r 8342c0286184 MANIFEST.in --- a/MANIFEST.in Wed Jul 26 21:01:36 2006 +0200 +++ b/MANIFEST.in Thu Jul 27 09:14:53 2006 -0700 @@ -10,6 +10,7 @@ include templates/static/* include doc/README doc/Makefile doc/gendoc.py doc/*.txt doc/*.html doc/*.[0-9] recursive-include contrib * +recursive-include hgext * include README include CONTRIBUTORS include COPYING diff -r 2ab464771b7d -r 8342c0286184 doc/hgrc.5.txt --- a/doc/hgrc.5.txt Wed Jul 26 21:01:36 2006 +0200 +++ b/doc/hgrc.5.txt Thu Jul 27 09:14:53 2006 -0700 @@ -139,12 +139,13 @@ Optional. Email address to use in "From" header and SMTP envelope of outgoing messages. to;; - Optional. Email address(es) of recipient(s). + Optional. Comma-separated list of recipients' email addresses. cc;; - Optional. Email address(es) to send carbon copies to. + Optional. Comma-separated list of carbon copy recipients' + email addresses. bcc;; - Optional. Email address(es) to send blind carbon copies to. - Cannot be set interactively. + Optional. Comma-separated list of blind carbon copy + recipients' email addresses. Cannot be set interactively. method;; Optional. Method to use to send email messages. If value is "smtp" (default), use SMTP (see section "[smtp]" for diff -r 2ab464771b7d -r 8342c0286184 mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Wed Jul 26 21:01:36 2006 +0200 +++ b/mercurial/hgweb/hgweb_mod.py Thu Jul 27 09:14:53 2006 -0700 @@ -48,6 +48,7 @@ self.repo = hg.repository(self.repo.ui, self.repo.root) self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10)) self.stripecount = int(self.repo.ui.config("web", "stripes", 1)) + self.maxshortchanges = int(self.repo.ui.config("web", "maxshortchanges", 60)) self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10)) self.allowpull = self.repo.ui.configbool("web", "allowpull", True) @@ -160,7 +161,7 @@ ignorewsamount=ignorewsamount, ignoreblanklines=ignoreblanklines), f, tn) - def changelog(self, pos): + def changelog(self, pos, shortlog=False): def changenav(**map): def seq(factor, maxchanges=None): if maxchanges: @@ -175,8 +176,9 @@ l = [] last = 0 - for f in seq(1, self.maxchanges): - if f < self.maxchanges or f <= last: + maxchanges = shortlog and self.maxshortchanges or self.maxchanges + for f in seq(1, maxchanges): + if f < maxchanges or f <= last: continue if f > count: break @@ -221,14 +223,15 @@ for e in l: yield e + maxchanges = shortlog and self.maxshortchanges or self.maxchanges cl = self.repo.changelog mf = cl.read(cl.tip())[0] count = cl.count() - start = max(0, pos - self.maxchanges + 1) - end = min(count, start + self.maxchanges) + start = max(0, pos - maxchanges + 1) + end = min(count, start + maxchanges) pos = end - 1 - yield self.t('changelog', + yield self.t(shortlog and 'shortlog' or 'changelog', changenav=changenav, manifest=hex(mf), rev=pos, changesets=count, entries=changelist, @@ -611,7 +614,8 @@ lastchange = (0, 0), # FIXME manifest = hex(mf), tags = tagentries, - shortlog = changelist) + shortlog = changelist, + archives=self.archivelist("tip")) def filediff(self, file, changeset): cl = self.repo.changelog @@ -691,6 +695,7 @@ def expand_form(form): shortcuts = { 'cl': [('cmd', ['changelog']), ('rev', None)], + 'sl': [('cmd', ['shortlog']), ('rev', None)], 'cs': [('cmd', ['changeset']), ('node', None)], 'f': [('cmd', ['file']), ('filenode', None)], 'fl': [('cmd', ['filelog']), ('filenode', None)], @@ -773,6 +778,18 @@ req.write(self.changelog(hi)) + def do_shortlog(self, req): + hi = self.repo.changelog.count() - 1 + if req.form.has_key('rev'): + hi = req.form['rev'][0] + try: + hi = self.repo.changelog.rev(self.repo.lookup(hi)) + except hg.RepoError: + req.write(self.search(hi)) # XXX redirect to 404 page? + return + + req.write(self.changelog(hi, shortlog = True)) + def do_changeset(self, req): req.write(self.changeset(req.form['node'][0])) diff -r 2ab464771b7d -r 8342c0286184 templates/changelog-gitweb.tmpl --- a/templates/changelog-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/changelog-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -20,7 +20,7 @@
-summary | changelog | tags | manifest
+summary | shortlog | changelog | tags | manifest#archives%archiveentry#

#changenav%naventry#
diff -r 2ab464771b7d -r 8342c0286184 templates/changelog.tmpl --- a/templates/changelog.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/changelog.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -6,6 +6,7 @@
+shortlog tags manifest #archives%archiveentry# diff -r 2ab464771b7d -r 8342c0286184 templates/changeset-gitweb.tmpl --- a/templates/changeset-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/changeset-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | manifest | changeset | raw #archives%archiveentry#
+summary | shortlog | changelog | tags | manifest | changeset | raw #archives%archiveentry#
diff -r 2ab464771b7d -r 8342c0286184 templates/changeset.tmpl --- a/templates/changeset.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/changeset.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -5,6 +5,7 @@
changelog +shortlog tags manifest raw diff -r 2ab464771b7d -r 8342c0286184 templates/error-gitweb.tmpl --- a/templates/error-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/error-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | manifest
+summary | shortlog | changelog | tags | manifest
diff -r 2ab464771b7d -r 8342c0286184 templates/fileannotate-gitweb.tmpl --- a/templates/fileannotate-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/fileannotate-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | manifest | changeset | file | revisions | annotate | raw
+summary | shortlog | changelog | tags | manifest | changeset | file | revisions | annotate | raw
#file|escape#
diff -r 2ab464771b7d -r 8342c0286184 templates/fileannotate.tmpl --- a/templates/fileannotate.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/fileannotate.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -5,6 +5,7 @@
changelog +shortlog tags changeset manifest diff -r 2ab464771b7d -r 8342c0286184 templates/filediff.tmpl --- a/templates/filediff.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/filediff.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -5,6 +5,7 @@
changelog +shortlog tags changeset file diff -r 2ab464771b7d -r 8342c0286184 templates/filelog-gitweb.tmpl --- a/templates/filelog-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/filelog-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | file | revisions | annotate | rss
+summary | shortlog | changelog | tags | file | revisions | annotate | rss
#file|urlescape#
diff -r 2ab464771b7d -r 8342c0286184 templates/filelog.tmpl --- a/templates/filelog.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/filelog.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -8,6 +8,7 @@
changelog +shortlog tags file annotate diff -r 2ab464771b7d -r 8342c0286184 templates/filerevision-gitweb.tmpl --- a/templates/filerevision-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/filerevision-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | manifest | changeset | file | revisions | annotate | raw
+summary | shortlog | changelog | tags | manifest | changeset | file | revisions | annotate | raw
#file|escape#
diff -r 2ab464771b7d -r 8342c0286184 templates/filerevision.tmpl --- a/templates/filerevision.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/filerevision.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -5,6 +5,7 @@
changelog +shortlog tags changeset manifest diff -r 2ab464771b7d -r 8342c0286184 templates/manifest-gitweb.tmpl --- a/templates/manifest-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/manifest-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | manifest | changeset #archives%archiveentry#
+summary | shortlog | changelog | tags | manifest | changeset #archives%archiveentry#
#path|escape#
diff -r 2ab464771b7d -r 8342c0286184 templates/manifest.tmpl --- a/templates/manifest.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/manifest.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -5,6 +5,7 @@
changelog +shortlog tags changeset #archives%archiveentry# diff -r 2ab464771b7d -r 8342c0286184 templates/map --- a/templates/map Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/map Thu Jul 27 09:14:53 2006 -0700 @@ -3,7 +3,10 @@ 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 = '...' diff -r 2ab464771b7d -r 8342c0286184 templates/search-gitweb.tmpl --- a/templates/search-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/search-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -1,6 +1,6 @@ #header#
-summary | log | tags | manifest
+summary | shortlog | changelog | tags | manifest

searching for #query|escape#

diff -r 2ab464771b7d -r 8342c0286184 templates/search.tmpl --- a/templates/search.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/search.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -5,6 +5,7 @@
changelog +shortlog tags manifest
diff -r 2ab464771b7d -r 8342c0286184 templates/shortlog-gitweb.tmpl --- a/templates/shortlog-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/shortlog-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -1,13 +1,32 @@ #header# +#repo|escape#: Shortlog + + + +
+
Mercurial
#repo|escape# / shortlog +
+ +
+
+ + + + +
+
+
-summary | log | tags | manifest
+summary | shortlog | changelog | tags | manifest#archives%archiveentry#
+
-#changenav%naventry#
+#changenav%navshortentry#
-#entries# +#entries%shortlogentry#
#footer# diff -r 2ab464771b7d -r 8342c0286184 templates/shortlog.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/shortlog.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -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 2ab464771b7d -r 8342c0286184 templates/shortlogentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/shortlogentry.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -0,0 +1,7 @@ + + + + + + +
#date|age##author|obfuscate##desc|strip|firstline|escape#
diff -r 2ab464771b7d -r 8342c0286184 templates/static/style.css --- a/templates/static/style.css Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/static/style.css Thu Jul 27 09:14:53 2006 -0700 @@ -57,6 +57,12 @@ .logEntry th.age, .logEntry th.firstline { font-weight: bold; } .logEntry th.firstline { text-align: left; width: inherit; } +/* Shortlog entries */ +.slogEntry { width: 100%; font-size: smaller; } +.slogEntry .age { width: 7%; } +.slogEntry td { font-weight: normal; text-align: left; vertical-align: top; } +.slogEntry td.author { width: 35%; } + /* Tag entries */ #tagEntries { list-style: none; margin: 0; padding: 0; } #tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; } diff -r 2ab464771b7d -r 8342c0286184 templates/summary-gitweb.tmpl --- a/templates/summary-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/summary-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -9,7 +9,8 @@
Mercurial
#repo|escape# / summary
-summary | changelog | tags | manifest
+summary | shortlog | changelog | tags | manifest#archives%archiveentry# +
 
diff -r 2ab464771b7d -r 8342c0286184 templates/tags-gitweb.tmpl --- a/templates/tags-gitweb.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/tags-gitweb.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -10,7 +10,7 @@
-summary | changelog | tags | manifest +summary | shortlog | changelog | tags | manifest
diff -r 2ab464771b7d -r 8342c0286184 templates/tags.tmpl --- a/templates/tags.tmpl Wed Jul 26 21:01:36 2006 +0200 +++ b/templates/tags.tmpl Thu Jul 27 09:14:53 2006 -0700 @@ -7,6 +7,7 @@
changelog +shortlog manifest rss