bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mercurial to 1.1.2 (#4407)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@13823 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-01-02 14:59:14 +00:00
parent 822a7a1f72
commit c1359fe6e2
2 changed files with 126 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mercurial/Makefile
View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mercurial PKG_NAME:=mercurial
PKG_VERSION:=1.0.2 PKG_VERSION:=1.1.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:=http://selenic.com/mercurial/release/ PKG_SOURCE_URL:=http://selenic.com/mercurial/release/
PKG_SOURCE:=mercurial-$(PKG_VERSION).tar.gz PKG_SOURCE:=mercurial-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=32432616f517107e6582721c257cd1f4 PKG_MD5SUM:=4fd3b9a2e5dcd025840c3849b136bec8
PKG_BUILD_DEPENDS:=python PKG_BUILD_DEPENDS:=python
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

194
net/mercurial/patches/001-no_bzip2.patch
View File

@ -1,27 +1,18 @@
diff -rc mercurial-1.0.orig/mercurial/archival.py mercurial-1.0/mercurial/archival.py diff -urN mercurial-1.1.2/mercurial/archival.py mercurial-1.1.2-nobz2/mercurial/archival.py
*** mercurial-1.0.orig/mercurial/archival.py 2008-03-25 00:05:20.000000000 +0100 --- mercurial-1.1.2/mercurial/archival.py 2009-01-01 00:38:33.000000000 +0100
--- mercurial-1.0/mercurial/archival.py 2008-04-13 02:22:47.000000000 +0200 +++ mercurial-1.1.2-nobz2/mercurial/archival.py 2009-01-01 13:53:14.000000000 +0100
*************** @@ -65,8 +65,8 @@
*** 64,71 ****
self.fileobj.write(fname + '\000') self.fileobj.write(fname + '\000')
def __init__(self, dest, prefix, mtime, kind=''): def __init__(self, dest, prefix, mtime, kind=''):
! self.prefix = tidyprefix(dest, prefix, ['.tar', '.tar.bz2', '.tar.gz', - self.prefix = tidyprefix(dest, prefix, ['.tar', '.tar.bz2', '.tar.gz',
! '.tgz', '.tbz2']) - '.tgz', '.tbz2'])
+ self.prefix = tidyprefix(dest, prefix, ['.tar', '.tar.gz',
+ '.tgz'])
self.mtime = mtime self.mtime = mtime
def taropen(name, mode, fileobj=None): def taropen(name, mode, fileobj=None):
--- 64,71 ---- @@ -179,7 +179,6 @@
self.fileobj.write(fname + '\000')
def __init__(self, dest, prefix, mtime, kind=''):
! self.prefix = tidyprefix(dest, prefix, ['.tar', '.tar.gz',
! '.tgz'])
self.mtime = mtime
def taropen(name, mode, fileobj=None):
***************
*** 178,184 ****
archivers = { archivers = {
'files': fileit, 'files': fileit,
'tar': tarit, 'tar': tarit,
@ -29,81 +20,50 @@ diff -rc mercurial-1.0.orig/mercurial/archival.py mercurial-1.0/mercurial/archiv
'tgz': lambda name, prefix, mtime: tarit(name, prefix, mtime, 'gz'), 'tgz': lambda name, prefix, mtime: tarit(name, prefix, mtime, 'gz'),
'uzip': lambda name, prefix, mtime: zipit(name, prefix, mtime, False), 'uzip': lambda name, prefix, mtime: zipit(name, prefix, mtime, False),
'zip': zipit, 'zip': zipit,
--- 178,183 ---- diff -urN mercurial-1.1.2/mercurial/bundlerepo.py mercurial-1.1.2-nobz2/mercurial/bundlerepo.py
diff -rc mercurial-1.0.orig/mercurial/bundlerepo.py mercurial-1.0/mercurial/bundlerepo.py --- mercurial-1.1.2/mercurial/bundlerepo.py 2009-01-01 00:38:33.000000000 +0100
*** mercurial-1.0.orig/mercurial/bundlerepo.py 2008-03-25 00:05:20.000000000 +0100 +++ mercurial-1.1.2-nobz2/mercurial/bundlerepo.py 2009-01-01 13:53:59.000000000 +0100
--- mercurial-1.0/mercurial/bundlerepo.py 2008-04-13 02:23:54.000000000 +0200 @@ -12,7 +12,7 @@
***************
*** 12,18 ****
from node import hex, nullid, short from node import hex, nullid, short
from i18n import _ from i18n import _
! import changegroup, util, os, struct, bz2, tempfile, shutil, mdiff -import changegroup, util, os, struct, bz2, zlib, tempfile, shutil, mdiff
import repo, localrepo, changelog, manifest, filelog, revlog +import changegroup, util, os, struct, zlib, tempfile, shutil, mdiff
import repo, localrepo, changelog, manifest, filelog, revlog, context
class bundlerevlog(revlog.revlog): class bundlerevlog(revlog.revlog):
--- 12,18 ---- @@ -173,16 +173,13 @@
from node import hex, nullid, short
from i18n import _
! import changegroup, util, os, struct, tempfile, shutil, mdiff
import repo, localrepo, changelog, manifest, filelog, revlog
class bundlerevlog(revlog.revlog):
***************
*** 173,201 ****
raise util.Abort(_("%s: not a Mercurial bundle file") % bundlename) raise util.Abort(_("%s: not a Mercurial bundle file") % bundlename)
elif not header.startswith("HG10"): elif not header.startswith("HG10"):
raise util.Abort(_("%s: unknown bundle version") % bundlename) raise util.Abort(_("%s: unknown bundle version") % bundlename)
- elif header == "HG10BZ": - elif (header == "HG10BZ") or (header == "HG10GZ"):
- fdtemp, temp = tempfile.mkstemp(prefix="hg-bundle-", + elif (header == "HG10GZ"):
- suffix=".hg10un", dir=self.path) fdtemp, temp = tempfile.mkstemp(prefix="hg-bundle-",
- self.tempfile = temp suffix=".hg10un", dir=self.path)
- fptemp = os.fdopen(fdtemp, 'wb') self.tempfile = temp
- def generator(f): fptemp = os.fdopen(fdtemp, 'wb')
def generator(f):
- if header == "HG10BZ":
- zd = bz2.BZ2Decompressor() - zd = bz2.BZ2Decompressor()
- zd.decompress("BZ") - zd.decompress("BZ")
- for chunk in f: - elif header == "HG10GZ":
- yield zd.decompress(chunk) + if header == "HG10GZ":
- gen = generator(util.filechunkiter(self.bundlefile, 4096)) zd = zlib.decompressobj()
- for chunk in f:
- try: yield zd.decompress(chunk)
- fptemp.write("HG10UN") diff -urN mercurial-1.1.2/mercurial/changegroup.py mercurial-1.1.2-nobz2/mercurial/changegroup.py
- for chunk in gen: --- mercurial-1.1.2/mercurial/changegroup.py 2009-01-01 00:38:33.000000000 +0100
- fptemp.write(chunk) +++ mercurial-1.1.2-nobz2/mercurial/changegroup.py 2009-01-01 13:52:05.000000000 +0100
- finally: @@ -8,7 +8,7 @@
- fptemp.close()
- self.bundlefile.close()
-
- self.bundlefile = open(self.tempfile, "rb")
- # seek right after the header
- self.bundlefile.seek(6)
elif header == "HG10UN":
# nothing to do
pass
--- 173,178 ----
diff -rc mercurial-1.0.orig/mercurial/changegroup.py mercurial-1.0/mercurial/changegroup.py
*** mercurial-1.0.orig/mercurial/changegroup.py 2008-03-25 00:05:20.000000000 +0100
--- mercurial-1.0/mercurial/changegroup.py 2008-04-13 02:24:40.000000000 +0200
***************
*** 8,14 ****
""" """
from i18n import _ from i18n import _
! import struct, os, bz2, zlib, util, tempfile -import struct, os, bz2, zlib, util, tempfile
+import struct, os, zlib, util, tempfile
def getchunk(source): def getchunk(source):
"""get a chunk from a changegroup""" """get a chunk from a changegroup"""
--- 8,14 ---- @@ -49,12 +49,11 @@
"""
from i18n import _
! import struct, os, zlib, util, tempfile
def getchunk(source):
"""get a chunk from a changegroup"""
***************
*** 49,60 ****
bundletypes = { bundletypes = {
"": ("", nocompress), "": ("", nocompress),
"HG10UN": ("HG10UN", nocompress), "HG10UN": ("HG10UN", nocompress),
@ -112,24 +72,12 @@ diff -rc mercurial-1.0.orig/mercurial/changegroup.py mercurial-1.0/mercurial/cha
} }
# hgweb uses this list to communicate it's preferred type # hgweb uses this list to communicate it's preferred type
! bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN'] -bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN']
+bundlepriority = ['HG10GZ', 'HG10UN']
def writebundle(cg, filename, bundletype): def writebundle(cg, filename, bundletype):
"""Write a bundle file and return its filename. """Write a bundle file and return its filename.
--- 49,59 ---- @@ -122,12 +121,6 @@
bundletypes = {
"": ("", nocompress),
"HG10UN": ("HG10UN", nocompress),
"HG10GZ": ("HG10GZ", lambda: zlib.compressobj()),
}
# hgweb uses this list to communicate it's preferred type
! bundlepriority = ['HG10GZ', 'HG10UN']
def writebundle(cg, filename, bundletype):
"""Write a bundle file and return its filename.
***************
*** 122,133 ****
zd = zlib.decompressobj() zd = zlib.decompressobj()
for chunk in f: for chunk in f:
yield zd.decompress(chunk) yield zd.decompress(chunk)
@ -142,67 +90,35 @@ diff -rc mercurial-1.0.orig/mercurial/changegroup.py mercurial-1.0/mercurial/cha
return util.chunkbuffer(generator(fh)) return util.chunkbuffer(generator(fh))
def readbundle(fh, fname): def readbundle(fh, fname):
--- 121,126 ---- diff -urN mercurial-1.1.2/mercurial/hgweb/hgwebdir_mod.py mercurial-1.1.2-nobz2/mercurial/hgweb/hgwebdir_mod.py
diff -rc mercurial-1.0.orig/mercurial/commands.py mercurial-1.0/mercurial/commands.py --- mercurial-1.1.2/mercurial/hgweb/hgwebdir_mod.py 2009-01-01 00:38:33.000000000 +0100
*** mercurial-1.0.orig/mercurial/commands.py 2008-03-25 00:05:20.000000000 +0100 +++ mercurial-1.1.2-nobz2/mercurial/hgweb/hgwebdir_mod.py 2009-01-01 13:54:29.000000000 +0100
--- mercurial-1.0/mercurial/commands.py 2008-04-13 02:24:54.000000000 +0200 @@ -178,7 +178,7 @@
***************
*** 139,145 ****
"files" (default): a directory full of files
"tar": tar archive, uncompressed
- "tbz2": tar archive, compressed using bzip2
"tgz": tar archive, compressed using gzip
"uzip": zip archive, uncompressed
"zip": zip archive, compressed using deflate
--- 139,144 ----
diff -rc mercurial-1.0.orig/mercurial/hgweb/hgwebdir_mod.py mercurial-1.0/mercurial/hgweb/hgwebdir_mod.py
*** mercurial-1.0.orig/mercurial/hgweb/hgwebdir_mod.py 2008-03-25 00:05:20.000000000 +0100
--- mercurial-1.0/mercurial/hgweb/hgwebdir_mod.py 2008-04-13 02:25:33.000000000 +0200
***************
*** 152,158 ****
def archivelist(ui, nodeid, url): def archivelist(ui, nodeid, url):
allowed = ui.configlist("web", "allow_archive", untrusted=True) allowed = ui.configlist("web", "allow_archive", untrusted=True)
! for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]: - for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
+ for i in [('zip', '.zip'), ('gz', '.tar.gz')]:
if i[0] in allowed or ui.configbool("web", "allow" + i[0], if i[0] in allowed or ui.configbool("web", "allow" + i[0],
untrusted=True): untrusted=True):
yield {"type" : i[0], "extension": i[1], yield {"type" : i[0], "extension": i[1],
--- 152,158 ---- diff -urN mercurial-1.1.2/mercurial/hgweb/hgweb_mod.py mercurial-1.1.2-nobz2/mercurial/hgweb/hgweb_mod.py
--- mercurial-1.1.2/mercurial/hgweb/hgweb_mod.py 2009-01-01 00:38:33.000000000 +0100
def archivelist(ui, nodeid, url): +++ mercurial-1.1.2-nobz2/mercurial/hgweb/hgweb_mod.py 2009-01-01 13:55:08.000000000 +0100
allowed = ui.configlist("web", "allow_archive", untrusted=True) @@ -35,7 +35,7 @@
! for i in [('zip', '.zip'), ('gz', '.tar.gz')]:
if i[0] in allowed or ui.configbool("web", "allow" + i[0],
untrusted=True):
yield {"type" : i[0], "extension": i[1],
diff -rc mercurial-1.0.orig/mercurial/hgweb/hgweb_mod.py mercurial-1.0/mercurial/hgweb/hgweb_mod.py
*** mercurial-1.0.orig/mercurial/hgweb/hgweb_mod.py 2008-03-25 00:05:20.000000000 +0100
--- mercurial-1.0/mercurial/hgweb/hgweb_mod.py 2008-04-13 02:25:49.000000000 +0200
***************
*** 91,97 ****
hook.redirect(True) hook.redirect(True)
self.mtime = -1 self.mtime = -1
self.reponame = name self.reponame = name
! self.archives = 'zip', 'gz', 'bz2' - self.archives = 'zip', 'gz', 'bz2'
+ self.archives = 'zip', 'gz'
self.stripecount = 1 self.stripecount = 1
self._capabilities = None
# a repo owner may set web.templates in .hg/hgrc to get any file # a repo owner may set web.templates in .hg/hgrc to get any file
--- 91,97 ---- # readable by the user running the CGI script
hook.redirect(True) @@ -266,7 +266,6 @@
self.mtime = -1 yield {"type" : i, "extension" : spec[2], "node" : nodeid}
self.reponame = name
! self.archives = 'zip', 'gz'
self.stripecount = 1
self._capabilities = None
# a repo owner may set web.templates in .hg/hgrc to get any file
***************
*** 915,921 ****
diff=diff)
archive_specs = { archive_specs = {
- 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None), - 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None),
'gz': ('application/x-tar', 'tgz', '.tar.gz', None), 'gz': ('application/x-tar', 'tgz', '.tar.gz', None),
'zip': ('application/zip', 'zip', '.zip', None), 'zip': ('application/zip', 'zip', '.zip', None),
} }
--- 915,920 ----