Mercurial > hg
changeset 19329:84dc9669bd71
Merge with main.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Mon, 24 Jun 2013 14:02:01 -0400 |
| parents | 275d78d339cc (current diff) cf1b0a58a0de (diff) |
| children | 867b9957d895 0cfb62e043e8 |
| files | contrib/setup3k.py |
| diffstat | 12 files changed, 12 insertions(+), 406 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/casesmash.py Mon Jun 17 19:44:00 2013 -0700 +++ b/contrib/casesmash.py Mon Jun 24 14:02:01 2013 -0400 @@ -1,4 +1,4 @@ -import sys, os, __builtin__ +import os, __builtin__ from mercurial import util def lowerwrap(scope, funcname):
--- a/contrib/perf.py Mon Jun 17 19:44:00 2013 -0700 +++ b/contrib/perf.py Mon Jun 24 14:02:01 2013 -0400 @@ -1,7 +1,7 @@ # perf.py - performance test routines '''helper extension to measure performance''' -from mercurial import cmdutil, scmutil, util, match, commands, obsolete +from mercurial import cmdutil, scmutil, util, commands, obsolete from mercurial import repoview, branchmap, merge, copies import time, os, sys
--- a/contrib/setup3k.py Mon Jun 17 19:44:00 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ -# -# This is an experimental py3k-enabled mercurial setup script. -# -# 'python setup.py install', or -# 'python setup.py --help' for more options - -from distutils.command.build_py import build_py_2to3 -from lib2to3.refactor import get_fixers_from_package as getfixers - -import sys -if getattr(sys, 'version_info', (0, 0, 0)) < (2, 4, 0, 'final'): - raise SystemExit("Mercurial requires Python 2.4 or later.") - -if sys.version_info[0] >= 3: - def b(s): - '''A helper function to emulate 2.6+ bytes literals using string - literals.''' - return s.encode('latin1') -else: - def b(s): - '''A helper function to emulate 2.6+ bytes literals using string - literals.''' - return s - -# Solaris Python packaging brain damage -try: - import hashlib - sha = hashlib.sha1() -except ImportError: - try: - import sha - except ImportError: - raise SystemExit( - "Couldn't import standard hashlib (incomplete Python install).") - -try: - import zlib -except ImportError: - raise SystemExit( - "Couldn't import standard zlib (incomplete Python install).") - -try: - import bz2 -except ImportError: - raise SystemExit( - "Couldn't import standard bz2 (incomplete Python install).") - -import os, subprocess, time -import shutil -import tempfile -from distutils import log -from distutils.core import setup, Extension -from distutils.dist import Distribution -from distutils.command.build import build -from distutils.command.build_ext import build_ext -from distutils.command.build_py import build_py -from distutils.spawn import spawn, find_executable -from distutils.ccompiler import new_compiler -from distutils.errors import CCompilerError - -scripts = ['hg'] -if os.name == 'nt': - scripts.append('contrib/win32/hg.bat') - -# simplified version of distutils.ccompiler.CCompiler.has_function -# that actually removes its temporary files. -def hasfunction(cc, funcname): - tmpdir = tempfile.mkdtemp(prefix='hg-install-') - devnull = oldstderr = None - try: - try: - fname = os.path.join(tmpdir, 'funcname.c') - f = open(fname, 'w') - f.write('int main(void) {\n') - f.write(' %s();\n' % funcname) - f.write('}\n') - f.close() - # Redirect stderr to /dev/null to hide any error messages - # from the compiler. - # This will have to be changed if we ever have to check - # for a function on Windows. - devnull = open('/dev/null', 'w') - oldstderr = os.dup(sys.stderr.fileno()) - os.dup2(devnull.fileno(), sys.stderr.fileno()) - objects = cc.compile([fname], output_dir=tmpdir) - cc.link_executable(objects, os.path.join(tmpdir, "a.out")) - except Exception: - return False - return True - finally: - if oldstderr is not None: - os.dup2(oldstderr, sys.stderr.fileno()) - if devnull is not None: - devnull.close() - shutil.rmtree(tmpdir) - -# py2exe needs to be installed to work -try: - import py2exe - py2exeloaded = True - - # Help py2exe to find win32com.shell - try: - import modulefinder - import win32com - for p in win32com.__path__[1:]: # Take the path to win32comext - modulefinder.AddPackagePath("win32com", p) - pn = "win32com.shell" - __import__(pn) - m = sys.modules[pn] - for p in m.__path__[1:]: - modulefinder.AddPackagePath(pn, p) - except ImportError: - pass - -except ImportError: - py2exeloaded = False - pass - -def runcmd(cmd, env): - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, env=env) - out, err = p.communicate() - # If root is executing setup.py, but the repository is owned by - # another user (as in "sudo python setup.py install") we will get - # trust warnings since the .hg/hgrc file is untrusted. That is - # fine, we don't want to load it anyway. Python may warn about - # a missing __init__.py in mercurial/locale, we also ignore that. - err = [e for e in err.splitlines() - if not e.startswith(b('Not trusting file')) \ - and not e.startswith(b('warning: Not importing'))] - if err: - return '' - return out - -version = '' - -if os.path.isdir('.hg'): - # Execute hg out of this directory with a custom environment which - # includes the pure Python modules in mercurial/pure. We also take - # care to not use any hgrc files and do no localization. - pypath = ['mercurial', os.path.join('mercurial', 'pure')] - env = {'PYTHONPATH': os.pathsep.join(pypath), - 'HGRCPATH': '', - 'LANGUAGE': 'C'} - if 'LD_LIBRARY_PATH' in os.environ: - env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] - if 'SystemRoot' in os.environ: - # Copy SystemRoot into the custom environment for Python 2.6 - # under Windows. Otherwise, the subprocess will fail with - # error 0xc0150004. See: http://bugs.python.org/issue3440 - env['SystemRoot'] = os.environ['SystemRoot'] - cmd = [sys.executable, 'hg', 'id', '-i', '-t'] - l = runcmd(cmd, env).split() - while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags - l.pop() - if len(l) > 1: # tag found - version = l[-1] - if l[0].endswith('+'): # propagate the dirty status to the tag - version += '+' - elif len(l) == 1: # no tag found - cmd = [sys.executable, 'hg', 'parents', '--template', - '{latesttag}+{latesttagdistance}-'] - version = runcmd(cmd, env) + l[0] - if version.endswith('+'): - version += time.strftime('%Y%m%d') -elif os.path.exists('.hg_archival.txt'): - kw = dict([[t.strip() for t in l.split(':', 1)] - for l in open('.hg_archival.txt')]) - if 'tag' in kw: - version = kw['tag'] - elif 'latesttag' in kw: - version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw - else: - version = kw.get('node', '')[:12] - -if version: - f = open("mercurial/__version__.py", "w") - f.write('# this file is autogenerated by setup.py\n') - f.write('version = "%s"\n' % version) - f.close() - - -try: - from mercurial import __version__ - version = __version__.version -except ImportError: - version = 'unknown' - -class hgbuildmo(build): - - description = "build translations (.mo files)" - - def run(self): - if not find_executable('msgfmt'): - self.warn("could not find msgfmt executable, no translations " - "will be built") - return - - podir = 'i18n' - if not os.path.isdir(podir): - self.warn("could not find %s/ directory" % podir) - return - - join = os.path.join - for po in os.listdir(podir): - if not po.endswith('.po'): - continue - pofile = join(podir, po) - modir = join('locale', po[:-3], 'LC_MESSAGES') - mofile = join(modir, 'hg.mo') - mobuildfile = join('mercurial', mofile) - cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile] - if sys.platform != 'sunos5': - # msgfmt on Solaris does not know about -c - cmd.append('-c') - self.mkpath(join('mercurial', modir)) - self.make_file([pofile], mobuildfile, spawn, (cmd,)) - -# Insert hgbuildmo first so that files in mercurial/locale/ are found -# when build_py is run next. -build.sub_commands.insert(0, ('build_mo', None)) -# We also need build_ext before build_py. Otherwise, when 2to3 is called (in -# build_py), it will not find osutil & friends, thinking that those modules are -# global and, consequently, making a mess, now that all module imports are -# global. -build.sub_commands.insert(1, ('build_ext', None)) - -Distribution.pure = 0 -Distribution.global_options.append(('pure', None, "use pure (slow) Python " - "code instead of C extensions")) - -class hgbuildext(build_ext): - - def build_extension(self, ext): - try: - build_ext.build_extension(self, ext) - except CCompilerError: - if getattr(ext, 'optional', False): - raise - log.warn("Failed to build optional extension '%s' (skipping)", - ext.name) - -class hgbuildpy(build_py_2to3): - fixer_names = sorted(set(getfixers("lib2to3.fixes") + - getfixers("hgfixes"))) - - def finalize_options(self): - build_py.finalize_options(self) - - if self.distribution.pure: - if self.py_modules is None: - self.py_modules = [] - for ext in self.distribution.ext_modules: - if ext.name.startswith("mercurial."): - self.py_modules.append("mercurial.pure.%s" % ext.name[10:]) - self.distribution.ext_modules = [] - - def find_modules(self): - modules = build_py.find_modules(self) - for module in modules: - if module[0] == "mercurial.pure": - if module[1] != "__init__": - yield ("mercurial", module[1], module[2]) - else: - yield module - - def run(self): - # In the build_py_2to3 class, self.updated_files = [], but I couldn't - # see when that variable was updated to point to the updated files, as - # its names suggests. Thus, I decided to just find_all_modules and feed - # them to 2to3. Unfortunately, subsequent calls to setup3k.py will - # incur in 2to3 analysis overhead. - self.updated_files = [i[2] for i in self.find_all_modules()] - - # Base class code - if self.py_modules: - self.build_modules() - if self.packages: - self.build_packages() - self.build_package_data() - - # 2to3 - self.run_2to3(self.updated_files) - - # Remaining base class code - self.byte_compile(self.get_outputs(include_bytecode=0)) - -cmdclass = {'build_mo': hgbuildmo, - 'build_ext': hgbuildext, - 'build_py': hgbuildpy} - -packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert', - 'hgext.highlight', 'hgext.zeroconf'] - -pymodules = [] - -extmodules = [ - Extension('mercurial.base85', ['mercurial/base85.c']), - Extension('mercurial.bdiff', ['mercurial/bdiff.c']), - Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']), - Extension('mercurial.mpatch', ['mercurial/mpatch.c']), - Extension('mercurial.parsers', ['mercurial/parsers.c']), - ] - -# disable osutil.c under windows + python 2.4 (issue1364) -if sys.platform == 'win32' and sys.version_info < (2, 5, 0, 'final'): - pymodules.append('mercurial.pure.osutil') -else: - extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'])) - -if sys.platform.startswith('linux') and os.uname()[2] > '2.6': - # The inotify extension is only usable with Linux 2.6 kernels. - # You also need a reasonably recent C library. - # In any case, if it fails to build the error will be skipped ('optional'). - cc = new_compiler() - if hasfunction(cc, 'inotify_add_watch'): - inotify = Extension('hgext.inotify.linux._inotify', - ['hgext/inotify/linux/_inotify.c'], - ['mercurial']) - inotify.optional = True - extmodules.append(inotify) - packages.extend(['hgext.inotify', 'hgext.inotify.linux']) - -packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', - 'help/*.txt']} - -def ordinarypath(p): - return p and p[0] != '.' and p[-1] != '~' - -for root in ('templates',): - for curdir, dirs, files in os.walk(os.path.join('mercurial', root)): - curdir = curdir.split(os.sep, 1)[1] - dirs[:] = filter(ordinarypath, dirs) - for f in filter(ordinarypath, files): - f = os.path.join(curdir, f) - packagedata['mercurial'].append(f) - -datafiles = [] -setupversion = version -extra = {} - -if py2exeloaded: - extra['console'] = [ - {'script':'hg', - 'copyright':'Copyright (C) 2005-2010 Matt Mackall and others', - 'product_version':version}] - -if os.name == 'nt': - # Windows binary file versions for exe/dll files must have the - # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535 - setupversion = version.split('+', 1)[0] - -setup(name='mercurial', - version=setupversion, - author='Matt Mackall', - author_email='mpm@selenic.com', - url='http://mercurial.selenic.com/', - description='Scalable distributed SCM', - license='GNU GPLv2+', - scripts=scripts, - packages=packages, - py_modules=pymodules, - ext_modules=extmodules, - data_files=datafiles, - package_data=packagedata, - cmdclass=cmdclass, - options=dict(py2exe=dict(packages=['hgext', 'email']), - bdist_mpkg=dict(zipdist=True, - license='COPYING', - readme='contrib/macosx/Readme.html', - welcome='contrib/macosx/Welcome.html')), - **extra)
--- a/contrib/synthrepo.py Mon Jun 17 19:44:00 2013 -0700 +++ b/contrib/synthrepo.py Mon Jun 24 14:02:01 2013 -0400 @@ -36,7 +36,7 @@ ''' import bisect, collections, json, os, random, time, sys -from mercurial import cmdutil, context, patch, scmutil, url, util, hg +from mercurial import cmdutil, context, patch, scmutil, util, hg from mercurial.i18n import _ from mercurial.node import nullrev, nullid
--- a/doc/gendoc.py Mon Jun 17 19:44:00 2013 -0700 +++ b/doc/gendoc.py Mon Jun 24 14:02:01 2013 -0400 @@ -4,7 +4,6 @@ # fall back to pure modules if required C extensions are not available sys.path.append(os.path.join('..', 'mercurial', 'pure')) from mercurial import demandimport; demandimport.enable() -from mercurial import encoding from mercurial import minirst from mercurial.commands import table, globalopts from mercurial.i18n import gettext, _
--- a/doc/hgrc.5.txt Mon Jun 17 19:44:00 2013 -0700 +++ b/doc/hgrc.5.txt Mon Jun 24 14:02:01 2013 -0400 @@ -16,8 +16,8 @@ :class: htmlonly -Synopsis -======== +Description +=========== .. include:: ../mercurial/help/config.txt
--- a/mercurial/changegroup.py Mon Jun 17 19:44:00 2013 -0700 +++ b/mercurial/changegroup.py Mon Jun 24 14:02:01 2013 -0400 @@ -364,10 +364,11 @@ if fastpathlinkrev: ln, llr = filerevlog.node, filerevlog.linkrev + needed = set(cl.rev(x) for x in clnodes) def genfilenodes(): for r in filerevlog: linkrev = llr(r) - if linkrev not in commonrevs: + if linkrev in needed: yield filerevlog.node(r), cl.node(linkrev) fnodes[fname] = dict(genfilenodes())
--- a/mercurial/pathencode.c Mon Jun 17 19:44:00 2013 -0700 +++ b/mercurial/pathencode.c Mon Jun 24 14:02:01 2013 -0400 @@ -585,7 +585,8 @@ in a space or dot, which are unportable. */ if (d == '.' || d == ' ') dest[destlen - 1] = '_'; - if (destlen > maxshortdirslen) + /* The + 3 is to account for "dh/" in the beginning */ + if (destlen > maxshortdirslen + 3) break; charcopy(dest, &destlen, destsize, src[i]); p = -1;
--- a/tests/run-tests.py Mon Jun 17 19:44:00 2013 -0700 +++ b/tests/run-tests.py Mon Jun 24 14:02:01 2013 -0400 @@ -56,7 +56,6 @@ import re import threading import killdaemons as killmod -import cPickle as pickle import Queue as queue processlock = threading.Lock()
--- a/tests/test-pathencode.py Mon Jun 17 19:44:00 2013 -0700 +++ b/tests/test-pathencode.py Mon Jun 24 14:02:01 2013 -0400 @@ -5,7 +5,6 @@ # that have proven likely to expose bugs and divergent behaviour in # different encoding implementations. -from mercurial import parsers from mercurial import store import binascii, itertools, math, os, random, sys, time import collections @@ -125,7 +124,8 @@ p = pickfrom(rng, firsttable)(rng) l = len(p) ps = [p] - while l <= k: + maxl = rng.randint(1, k) + while l < maxl: p = pickfrom(rng, resttable)(rng) l += len(p) ps.append(p)
--- a/tests/test-rebase-cache.t Mon Jun 17 19:44:00 2013 -0700 +++ b/tests/test-rebase-cache.t Mon Jun 24 14:02:01 2013 -0400 @@ -396,27 +396,6 @@ > [ui] > logtemplate={rev} {desc} {phase}\n > EOF - $ cat $HGRCPATH - [ui] - slash = True - interactive = False - [defaults] - backout = -d "0 0" - commit = -d "0 0" - tag = -d "0 0" - [extensions] - graphlog= - rebase= - mq= - - [phases] - publish=False - - [alias] - tglog = log -G --template "{rev}: '{desc}' {branches}\n" - theads = heads --template "{rev}: '{desc}' {branches}\n" - [ui] - logtemplate={rev} {desc} {phase}\n $ hg init c4