# HG changeset patch # User mpm@selenic.com # Date 1117040094 28800 # Node ID 083c38bdfa6468113b31a7def64e89b00fbd6551 # Parent 1f6c61a6058644f4b51e84f81b026cb7a05fc958# Parent 1d5f799ebe1e5e7defd09b8a373caff009d058a4 Merge from hgweb diff --git a/hg b/hg diff --git a/mercurial/hg.py b/mercurial/hg.py diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py --- a/mercurial/hgweb.py +++ b/mercurial/hgweb.py @@ -516,8 +516,8 @@ class hgweb: if not args.has_key('cmd') or args['cmd'][0] == 'changelog': hi = self.repo.changelog.count() - if args.has_key('pos'): - hi = int(args['pos'][0]) + if args.has_key('rev'): + hi = int(args['rev'][0]) write(self.changelog(hi)) diff --git a/mercurial/revlog.py b/mercurial/revlog.py diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -16,4 +16,4 @@ setup(name='mercurial', license='GNU GPL', packages=['mercurial'], ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c'])], - scripts=['hg', 'hgweb.py']) + scripts=['hg']) diff --git a/templates/changelogentry.tmpl b/templates/changelogentry.tmpl --- a/templates/changelogentry.tmpl +++ b/templates/changelogentry.tmpl @@ -1,24 +1,24 @@ -
- +
+
- + - + #parent1# #parent2# - + - + - + - +
#age# ago: #age# ago:  #shortdesc#
revision: revision:  #rev#:#node#
manifest: manifest:  #rev#:#manifest#
author: author:  #author#
date: date:  #date#
files: files:  #files#
diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl --- a/templates/changeset.tmpl +++ b/templates/changeset.tmpl @@ -3,8 +3,8 @@ -
-changelog +
+changelog manifest
@@ -12,28 +12,28 @@ - + #parent1# #parent2# - + - + - + - + - +
revision:revision: #rev#:#node#
manifest:manifest: #rev#:#manifest#
author:author: #author#
date:date: #date#
files:files: #files#
description:description: #desc#
-
+
 #diff#
 

 
diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl
--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -3,36 +3,36 @@
 
 
 
-

-changelog
-changeset
-manifest
-file
-revisions
+

+changelog
+changeset
+manifest
+file
+revisions
 

 
 
Annotate #file# (#filenode#)

 
 
- 
+ 
 #parent1#
 #parent2#
 
- 
+ 
- 
+ 
- 
+ 

 
changeset:changeset:
  #rev#:#node#
manifest:manifest:
  #rev#:#manifest#

 
author:author:
  #author#

 
date:date:
  #date#

 

 
 

 
-
+

 #annotate#
 

 
diff --git a/templates/filediff.tmpl b/templates/filediff.tmpl
--- a/templates/filediff.tmpl
+++ b/templates/filediff.tmpl
@@ -3,26 +3,26 @@
 
 
 
-

-changelog
-changeset
-file
-revisions
-annotate
+

+changelog
+changeset
+file
+revisions
+annotate
 

 
 
#file#

 
 
- 
+ 
- 
+ 

 
revision:revision:
  #rev#:#node#

 
parent:parent:
  #p1rev#:#p1#

 

 
-
+
 #diff#
 

 
diff --git a/templates/filelog.tmpl b/templates/filelog.tmpl
--- a/templates/filelog.tmpl
+++ b/templates/filelog.tmpl
@@ -3,10 +3,10 @@
 
 
 
-

+

 changelog
-file
-annotate
+file
+annotate
 

 
 
#file# revision history

diff --git a/templates/filelogentry.tmpl b/templates/filelogentry.tmpl
--- a/templates/filelogentry.tmpl
+++ b/templates/filelogentry.tmpl
@@ -1,18 +1,18 @@
-
+

- 
+ 
- 
+ 
- 
+ 
- 
+ 

 
#age# ago: #age# ago: 
  #shortdesc#
 
revision: revision: 
  #filerev#:#filenode#
 (diff)
 (annotate)
 

 
author: author: 
  #author#

 
date: date: 
  #date#

 

 
diff --git a/templates/filerevision.tmpl b/templates/filerevision.tmpl
--- a/templates/filerevision.tmpl
+++ b/templates/filerevision.tmpl
@@ -3,30 +3,30 @@
 
 
 
-

-changelog
-changeset
-manifest
-revisions
-annotate
+

+changelog
+changeset
+manifest
+revisions
+annotate
 

 
 
#file# (revision #filenode#)

 
 
- 
+ 
 #parent1#
 #parent2#
 
- 
+ 
- 
+ 
- 
+ 

 
changeset:changeset:
  #rev#:#node#
manifest:manifest:
  #rev#:#manifest#

 
author:author:
  #author#

 
date:date:
  #date#

 

 
diff --git a/templates/header.tmpl b/templates/header.tmpl
--- a/templates/header.tmpl
+++ b/templates/header.tmpl
@@ -1,8 +1,8 @@
 Content-type: text/html
 
+
 
 
-
 
-
-
-
diff --git a/templates/manifest.tmpl b/templates/manifest.tmpl
--- a/templates/manifest.tmpl
+++ b/templates/manifest.tmpl
@@ -3,14 +3,14 @@
 
 
 
-

-changelog
-changeset
+

+changelog
+changeset
 

 
 
manifest: #path#

 
-
[up]

+
[up]

 #entries#
 
-#footer#
\ No newline at end of file
+#footer#
diff --git a/templates/map b/templates/map
--- a/templates/map
+++ b/templates/map
@@ -8,20 +8,20 @@ fileellipses = "..."
 changelogentry = changelogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
-manifestdirentry = "
#basename#/
"
-manifestfileentry = "
#basename#
"
+manifestdirentry = "
#basename#/
"
+manifestfileentry = "
#basename#
"
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
-fileline = "
#linenumber# #line#
"
+fileline = "
#linenumber# #line#
"
 filelogentry = filelogentry.tmpl
-annotateline = "#author#@#rev#
#line#
"
-difflineplus = "#line#"
-difflineminus = "#line#"
-difflineat = "#line#"
+annotateline = "#author#@#rev#
#line#
"
+difflineplus = "#line#"
+difflineminus = "#line#"
+difflineat = "#line#"
 diffline = "#line#"
-changelogparent = "parent: #rev#:#node#"
-changesetparent = "parent:#rev#:#node#"
-filerevparent = "parent:#rev#:#node#"
-fileannotateparent = "parent:#rev#:#node#"
+changelogparent = "parent: #rev#:#node#"
+changesetparent = "parent:#rev#:#node#"
+filerevparent = "parent:#rev#:#node#"
+fileannotateparent = "parent:#rev#:#node#"