small changes for mercurial

[Florian La Roche]

Below some fixups I've found for tip:

- PKG-INFO: update version number
- contrib/mercurial.spec: cleanup and more robust
- doc/hg.1.txt: file names -> filenames
- mercurial/hgweb.py:
    - fix typo maxchanges -> maxfiles
    - convert maxchanges/maxfiles into integers

Thanks for mercurial and congrats to the 0.7 release,

Florian La Roche




--- a/PKG-INFO	Sat Sep 17 07:37:14 2005
+++ b/PKG-INFO	Sun Sep 18 13:48:35 2005
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: mercurial
-Version: 0.6
+Version: 0.7
 Summary: scalable distributed SCM
 Home-page: http://selenic.com/mercurial
 Author: Matt Mackall
--- a/contrib/mercurial.spec	Sat Sep 17 07:37:14 2005
+++ b/contrib/mercurial.spec	Sun Sep 18 13:48:35 2005
@@ -1,35 +1,28 @@
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
-Version: 0.6
+Version: 0.7
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Development/Tools
-Distribution: RedHat
 Source: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-Packager: Arun Sharma <arun at sharma-home.net>
-Prefix: /usr
+URL: http://www.selenic.com/mercurial
 BuildRoot: /tmp/build.%{name}-%{version}-%{release}
 
 %define pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))')
 %define pythonlib %{_libdir}/python%{pythonver}/site-packages/%{name}
 
 %description
-
 Mercurial is a fast, lightweight source control management system designed
 for efficient handling of very large distributed projects.
 
 %prep
-
 rm -rf $RPM_BUILD_ROOT
-
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
-
 python setup.py build
 
 %install
-
 python setup.py install --root $RPM_BUILD_ROOT
 
 %clean
@@ -37,11 +30,10 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc
+%doc doc/* contrib/patchbomb *.cgi
 %dir %{pythonlib}
 %{_bindir}/hgmerge
 %{_bindir}/hg
 %{pythonlib}/templates
-%{pythonlib}/*.pyc
-%{pythonlib}/*.py
+%{pythonlib}/*.py*
 %{pythonlib}/*.so
--- a/doc/hg.1.txt	Sat Sep 17 07:37:14 2005
+++ b/doc/hg.1.txt	Sun Sep 18 13:48:35 2005
@@ -274,7 +274,7 @@
     -X, --exclude <pat>       exclude names matching the given patterns
         --all                 print all revisions that match
     -i, --ignore-case         ignore case when matching
-    -l, --files-with-matches  print only file names and revs that match
+    -l, --files-with-matches  print only filenames and revs that match
     -n, --line-number         print matching line numbers
     -r <rev>, --rev <rev>     search in given revision range
     -u, --user                print user who committed change
@@ -347,7 +347,7 @@
     If you want to feed the output of this command into the "xargs"
     command, use the "-0" option to both this command and "xargs".
     This will avoid the problem of "xargs" treating single filenames
-    that contain white space as multiple file names.
+    that contain white space as multiple filenames.
 
     options:
 
@@ -631,9 +631,9 @@
 ------------------
 
     Mercurial accepts several notations for identifying one or more
-    file at a time.
-
-    By default, Mercurial treats file names as shell-style extended
+    files at a time.
+
+    By default, Mercurial treats filenames as shell-style extended
     glob patterns.
 
     Alternate pattern notations must be specified explicitly.
--- a/mercurial/hgweb.py	Sat Sep 17 07:37:14 2005
+++ b/mercurial/hgweb.py	Sun Sep 18 13:48:35 2005
@@ -184,8 +184,8 @@
         if s.st_mtime != self.mtime:
             self.mtime = s.st_mtime
             self.repo = hg.repository(self.repo.ui, self.repo.root)
-            self.maxchanges = self.repo.ui.config("web", "maxchanges", 10)
-            self.maxfiles = self.repo.ui.config("web", "maxchanges", 10)
+            self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10))
+            self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10))
             self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
 
     def date(self, cs):