Compare commits

...

No commits in common. "c8-stream-4.8" and "stream-mercurial-4.8-rhel-8.10.0" have entirely different histories.

10 changed files with 156 additions and 2 deletions

65
.gitignore vendored
View File

@ -1 +1,64 @@
SOURCES/mercurial-4.8.2.tar.gz
mercurial-1.6.tar.gz
mercurial-1.6.2.tar.gz
*~
/mercurial-1.6.3.tar.gz
/mercurial-1.6.4.tar.gz
/mercurial-1.7.tar.gz
/mercurial-1.7.1.tar.gz
/mercurial-1.7.2.tar.gz
/mercurial-1.7.3.tar.gz
/mercurial-1.7.5.tar.gz
/mercurial-1.8.tar.gz
/mercurial-1.8.1.tar.gz
/mercurial-1.8.2.tar.gz
/mercurial-1.8.4.tar.gz
/mercurial-1.9.tar.gz
/mercurial-1.9.1.tar.gz
/mercurial-1.9.2.tar.gz
/mercurial-1.9.3.tar.gz
/mercurial-2.0.tar.gz
/mercurial-2.0.2.tar.gz
/mercurial-2.1-rc.tar.gz
/mercurial-2.1.tar.gz
/mercurial-2.1.1.tar.gz
/mercurial-2.1.2.tar.gz
/mercurial-2.2.tar.gz
/mercurial-2.2.1.tar.gz
/mercurial-2.2.2.tar.gz
/mercurial-2.2.3.tar.gz
/mercurial-2.3.tar.gz
/mercurial-2.3.1.tar.gz
/mercurial-2.4.tar.gz
/mercurial-2.4.1.tar.gz
/mercurial-2.5.tar.gz
/mercurial-2.5.1.tar.gz
/mercurial-2.5.2.tar.gz
/mercurial-2.6.tar.gz
/mercurial-2.6.2.tar.gz
/mercurial-2.6.3.tar.gz
/mercurial-2.8.tar.gz
/mercurial-2.8.1.tar.gz
/mercurial-2.9.tar.gz
/mercurial-3.0.tar.gz
/mercurial-3.2.2.tar.gz
/mercurial-3.2.3.tar.gz
/mercurial-3.2.4.tar.gz
/mercurial-3.3.2.tar.gz
/mercurial-3.3.3.tar.gz
/mercurial-3.4.1.tar.gz
/mercurial-3.5.tar.gz
/mercurial-3.5.1.tar.gz
/mercurial-3.6.2.tar.gz
/mercurial-3.6.3.tar.gz
/mercurial-3.7.1.tar.gz
/mercurial-3.7.3.tar.gz
/mercurial-3.8.1.tar.gz
/mercurial-4.0.1.tar.gz
/mercurial-4.1.tar.gz
/mercurial-4.2.tar.gz
/mercurial-4.2.1.tar.gz
/mercurial-4.2.3.tar.gz
/mercurial-4.4.2.tar.gz
/mercurial-4.6.2.tar.gz
/mercurial-4.8.tar.gz
/mercurial-4.8.2.tar.gz

View File

@ -1 +0,0 @@
f2389e708db2358e43d35d37a16fb08cfc6e1284 SOURCES/mercurial-4.8.2.tar.gz

25
docutils-0.8.patch Normal file
View File

@ -0,0 +1,25 @@
------------------------
diff -r 6c54df68d1de doc/hgmanpage.py
--- a/doc/hgmanpage.py Thu Jun 02 08:41:01 2011 -0500
+++ b/doc/hgmanpage.py Thu Jun 02 08:45:18 2011 -0500
@@ -48,6 +48,7 @@
from docutils import nodes, writers, languages
import roman
+import inspect
FIELD_LIST_INDENT = 7
DEFINITION_LIST_INDENT = 7
@@ -160,7 +161,11 @@
nodes.NodeVisitor.__init__(self, document)
self.settings = settings = document.settings
lcode = settings.language_code
- self.language = languages.get_language(lcode)
+ arglen=len(inspect.getargspec(languages.get_language)[0])
+ if arglen == 2:
+ self.language = languages.get_language(lcode,self.document.reporter)
+ else:
+ self.language = languages.get_language(lcode)
self.head = []
self.body = []
self.foot = []

19
mercurial-i18n.patch Normal file
View File

@ -0,0 +1,19 @@
*** /tmp/ediff2864wKI 2010-10-06 08:30:42.639138469 -0400
--- mercurial/i18n.py 2010-10-06 08:29:26.720138409 -0400
***************
*** 15,21 ****
module = __file__
base = os.path.dirname(module)
! for dir in ('.', '..'):
localedir = os.path.join(base, dir, 'locale')
if os.path.isdir(localedir):
break
--- 15,21 ----
module = __file__
base = os.path.dirname(module)
! for dir in ('.', '..', '/usr/share'):
localedir = os.path.join(base, dir, 'locale')
if os.path.isdir(localedir):
break

View File

@ -0,0 +1,35 @@
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py 2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py 2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
mercurial.version.remember_version(version)
cmdclass = {'install_data': install_package_data}
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = [] # default
+if os.name in ['posix']:
+ contrib_files = [(os.path.join('/usr/share/mercurial', root),
+ [os.path.join(root, file_) for file_ in files])
+ for root, dirs, files in os.walk('contrib')]
+ contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
+ ['hgwebdir.cgi', 'hgweb.cgi'])]
+
setup(name='mercurial',
version=mercurial.version.get_version(),
author='Matt Mackall',
@@ -67,7 +82,8 @@
Extension('mercurial.base85', ['mercurial/base85.c'])],
data_files=[(os.path.join('mercurial', root),
[os.path.join(root, file_) for file_ in files])
- for root, dirs, files in os.walk('templates')],
+ for root, dirs, files in os.walk('templates')] +
+ contrib_files,
cmdclass=cmdclass,
scripts=['hg', 'hgmerge'],
options=dict(py2exe=dict(packages=['hgext']),

View File

@ -0,0 +1,12 @@
--- mercurial-1.1.2/contrib/mergetools.hgrc.orig 2009-02-07 07:14:46.000000000 -0500
+++ mercurial-1.1.2/contrib/mergetools.hgrc 2009-02-07 07:14:15.000000000 -0500
@@ -46,6 +46,6 @@
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
-filemerge.args=-left $other -right $local -ancestor $base -merge $output
-filemerge.gui=True
+#filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+#filemerge.args=-left $other -right $local -ancestor $base -merge $output
+#filemerge.gui=True

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (mercurial-4.8.2.tar.gz) = 1010f20ea5ed081f2d5c58e97696027b2d06dd0471b39e88a1858d5409bcf59f2ccf360925c417495834fccba06e1525ae70894233164d617227814ca2277e20