Show More
@@ -11,7 +11,7 b' from i18n import _, gettext' | |||||
11 |
|
11 | |||
12 | _extensions = {} |
|
12 | _extensions = {} | |
13 | _order = [] |
|
13 | _order = [] | |
14 | _ignore = ['hbisect', 'bookmarks', 'parentrevspec', 'interhg'] |
|
14 | _ignore = ['hbisect', 'bookmarks', 'parentrevspec', 'interhg', 'inotify'] | |
15 |
|
15 | |||
16 | def extensions(ui=None): |
|
16 | def extensions(ui=None): | |
17 | if ui: |
|
17 | if ui: |
@@ -467,20 +467,6 b' class HackedMingw32CCompiler(cygwinccomp' | |||||
467 |
|
467 | |||
468 | cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler |
|
468 | cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler | |
469 |
|
469 | |||
470 | if sys.platform.startswith('linux') and os.uname()[2] > '2.6': |
|
|||
471 | # The inotify extension is only usable with Linux 2.6 kernels. |
|
|||
472 | # You also need a reasonably recent C library. |
|
|||
473 | # In any case, if it fails to build the error will be skipped ('optional'). |
|
|||
474 | cc = new_compiler() |
|
|||
475 | if hasfunction(cc, 'inotify_add_watch'): |
|
|||
476 | inotify = Extension('hgext.inotify.linux._inotify', |
|
|||
477 | ['hgext/inotify/linux/_inotify.c'], |
|
|||
478 | ['mercurial'], |
|
|||
479 | depends=common_depends) |
|
|||
480 | inotify.optional = True |
|
|||
481 | extmodules.append(inotify) |
|
|||
482 | packages.extend(['hgext.inotify', 'hgext.inotify.linux']) |
|
|||
483 |
|
||||
484 | packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', |
|
470 | packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', | |
485 | 'help/*.txt']} |
|
471 | 'help/*.txt']} | |
486 |
|
472 |
@@ -8,14 +8,6 b' test-walk.t' | |||||
8 |
|
8 | |||
9 | # no sockets or fifos |
|
9 | # no sockets or fifos | |
10 | test-hup.t |
|
10 | test-hup.t | |
11 | test-inotify-debuginotify.t |
|
|||
12 | test-inotify-dirty-dirstate.t |
|
|||
13 | test-inotify-issue1208.t |
|
|||
14 | test-inotify-issue1371.t |
|
|||
15 | test-inotify-issue1542.t |
|
|||
16 | test-inotify-lookup.t |
|
|||
17 | test-inotify.t |
|
|||
18 | test-inotify-issue1556.t |
|
|||
19 |
|
11 | |||
20 | # no hardlinks |
|
12 | # no hardlinks | |
21 | test-hardlinks.t |
|
13 | test-hardlinks.t |
@@ -96,21 +96,6 b' def has_icasefs():' | |||||
96 | finally: |
|
96 | finally: | |
97 | os.remove(path) |
|
97 | os.remove(path) | |
98 |
|
98 | |||
99 | def has_inotify(): |
|
|||
100 | try: |
|
|||
101 | import hgext.inotify.linux.watcher |
|
|||
102 | except ImportError: |
|
|||
103 | return False |
|
|||
104 | name = tempfile.mktemp(dir='.', prefix=tempprefix) |
|
|||
105 | sock = socket.socket(socket.AF_UNIX) |
|
|||
106 | try: |
|
|||
107 | sock.bind(name) |
|
|||
108 | except socket.error: |
|
|||
109 | return False |
|
|||
110 | sock.close() |
|
|||
111 | os.unlink(name) |
|
|||
112 | return True |
|
|||
113 |
|
||||
114 | def has_fifo(): |
|
99 | def has_fifo(): | |
115 | if getattr(os, "mkfifo", None) is None: |
|
100 | if getattr(os, "mkfifo", None) is None: | |
116 | return False |
|
101 | return False | |
@@ -315,7 +300,6 b' checks = {' | |||||
315 | "gpg": (has_gpg, "gpg client"), |
|
300 | "gpg": (has_gpg, "gpg client"), | |
316 | "hardlink": (has_hardlink, "hardlinks"), |
|
301 | "hardlink": (has_hardlink, "hardlinks"), | |
317 | "icasefs": (has_icasefs, "case insensitive file system"), |
|
302 | "icasefs": (has_icasefs, "case insensitive file system"), | |
318 | "inotify": (has_inotify, "inotify extension support"), |
|
|||
319 | "killdaemons": (has_killdaemons, 'killdaemons.py support'), |
|
303 | "killdaemons": (has_killdaemons, 'killdaemons.py support'), | |
320 | "lsprof": (has_lsprof, "python lsprof module"), |
|
304 | "lsprof": (has_lsprof, "python lsprof module"), | |
321 | "mtn": (has_mtn, "monotone client (>= 1.0)"), |
|
305 | "mtn": (has_mtn, "monotone client (>= 1.0)"), |
@@ -152,8 +152,6 b' def parseargs():' | |||||
152 | help="exit on the first test failure") |
|
152 | help="exit on the first test failure") | |
153 | parser.add_option("-H", "--htmlcov", action="store_true", |
|
153 | parser.add_option("-H", "--htmlcov", action="store_true", | |
154 | help="create an HTML report of the coverage of the files") |
|
154 | help="create an HTML report of the coverage of the files") | |
155 | parser.add_option("--inotify", action="store_true", |
|
|||
156 | help="enable inotify extension when running tests") |
|
|||
157 | parser.add_option("-i", "--interactive", action="store_true", |
|
155 | parser.add_option("-i", "--interactive", action="store_true", | |
158 | help="prompt to accept changed output") |
|
156 | help="prompt to accept changed output") | |
159 | parser.add_option("-j", "--jobs", type="int", |
|
157 | parser.add_option("-j", "--jobs", type="int", | |
@@ -344,12 +342,6 b' def createhgrc(path, options):' | |||||
344 | hgrc.write('commit = -d "0 0"\n') |
|
342 | hgrc.write('commit = -d "0 0"\n') | |
345 | hgrc.write('shelve = --date "0 0"\n') |
|
343 | hgrc.write('shelve = --date "0 0"\n') | |
346 | hgrc.write('tag = -d "0 0"\n') |
|
344 | hgrc.write('tag = -d "0 0"\n') | |
347 | if options.inotify: |
|
|||
348 | hgrc.write('[extensions]\n') |
|
|||
349 | hgrc.write('inotify=\n') |
|
|||
350 | hgrc.write('[inotify]\n') |
|
|||
351 | hgrc.write('pidfile=daemon.pids') |
|
|||
352 | hgrc.write('appendpid=True\n') |
|
|||
353 | if options.extra_config_opt: |
|
345 | if options.extra_config_opt: | |
354 | for opt in options.extra_config_opt: |
|
346 | for opt in options.extra_config_opt: | |
355 | section, key = opt.split('.', 1) |
|
347 | section, key = opt.split('.', 1) |
@@ -16,6 +16,5 b' run pyflakes on all tracked files ending' | |||||
16 | tests/hghave.py:*: 'pygments' imported but unused (glob) |
|
16 | tests/hghave.py:*: 'pygments' imported but unused (glob) | |
17 | tests/hghave.py:*: 'ssl' imported but unused (glob) |
|
17 | tests/hghave.py:*: 'ssl' imported but unused (glob) | |
18 | contrib/win32/hgwebdir_wsgi.py:*: 'from isapi.install import *' used; unable to detect undefined names (glob) |
|
18 | contrib/win32/hgwebdir_wsgi.py:*: 'from isapi.install import *' used; unable to detect undefined names (glob) | |
19 | hgext/inotify/linux/__init__.py:*: 'from _inotify import *' used; unable to detect undefined names (glob) |
|
|||
20 |
|
19 | |||
21 |
|
20 |
@@ -1,7 +1,7 b'' | |||||
1 | import os |
|
1 | import os | |
2 | from mercurial import ui, commands, extensions |
|
2 | from mercurial import ui, commands, extensions | |
3 |
|
3 | |||
4 |
ignore = set(['highlight', ' |
|
4 | ignore = set(['highlight', 'win32text', 'factotum']) | |
5 |
|
5 | |||
6 | if os.name != 'nt': |
|
6 | if os.name != 'nt': | |
7 | ignore.add('win32mbcs') |
|
7 | ignore.add('win32mbcs') |
@@ -199,7 +199,7 b' Short help:' | |||||
199 | urls URL Paths |
|
199 | urls URL Paths | |
200 |
|
200 | |||
201 | Test extension help: |
|
201 | Test extension help: | |
202 |
$ hg help extensions --config extensions.rebase= --config extensions.children= |
|
202 | $ hg help extensions --config extensions.rebase= --config extensions.children= | |
203 | Using Additional Features |
|
203 | Using Additional Features | |
204 | """"""""""""""""""""""""" |
|
204 | """"""""""""""""""""""""" | |
205 |
|
205 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed | ||
This diff has been collapsed as it changes many lines, (649 lines changed) Show them Hide them |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now