# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1395277324 0
# Node ID e7fa36b2bd235acfca188ce53ab100ed3649c25e
# Parent  d9c3f8002e7c0d774ed1643222b2d1bad8e091da# Parent  e23422941bae4d5322870cb333697d4c3df6bf80
Merge with stable

diff -r d9c3f8002e7c -r e7fa36b2bd23 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Mar 13 11:19:32 2014 +0000
+++ b/hgkw/keyword.py	Thu Mar 20 01:02:04 2014 +0000
@@ -384,10 +384,10 @@
     tmpdir = tempfile.mkdtemp('', 'kwdemo.')
     ui.note(_('creating temporary repository at %s\n') % tmpdir)
     repo = localrepo.localrepository(repo.baseui, tmpdir, True)
-    ui.setconfig('keyword', fn, '')
+    ui.setconfig('keyword', fn, '', 'keyword')
     svn = ui.configbool('keywordset', 'svn')
     # explicitly set keywordset for demo output
-    ui.setconfig('keywordset', 'svn', svn)
+    ui.setconfig('keywordset', 'svn', svn, 'keyword')
 
     uikwmaps = ui.configitems('keywordmaps')
     if args or opts.get('rcfile'):
@@ -418,7 +418,7 @@
         if uikwmaps:
             ui.status(_('\tdisabling current template maps\n'))
             for k, v in kwmaps.iteritems():
-                ui.setconfig('keywordmaps', k, v)
+                ui.setconfig('keywordmaps', k, v, 'keyword')
     else:
         ui.status(_('\n\tconfiguration using current keyword template maps\n'))
         if uikwmaps:
@@ -444,7 +444,7 @@
         wlock.release()
     for name, cmd in ui.configitems('hooks'):
         if name.split('.', 1)[0].find('commit') > -1:
-            repo.ui.setconfig('hooks', name, '')
+            repo.ui.setconfig('hooks', name, '', 'keyword')
     msg = _('hg keyword configuration and expansion example')
     ui.note(("hg ci -m '%s'\n" % msg))
     repo.commit(text=msg)
diff -r d9c3f8002e7c -r e7fa36b2bd23 tests/killdaemons.py
--- a/tests/killdaemons.py	Thu Mar 13 11:19:32 2014 +0000
+++ b/tests/killdaemons.py	Thu Mar 20 01:02:04 2014 +0000
@@ -16,7 +16,7 @@
         logfn('# Killing daemon process %d' % pid)
         PROCESS_TERMINATE = 1
         PROCESS_QUERY_INFORMATION = 0x400
-        SYNCHRONIZE = 0x00100000L
+        SYNCHRONIZE = 0x00100000
         WAIT_OBJECT_0 = 0
         WAIT_TIMEOUT = 258
         handle = ctypes.windll.kernel32.OpenProcess(
@@ -89,4 +89,3 @@
 if __name__ == '__main__':
     path, = sys.argv[1:]
     killdaemons(path)
-
diff -r d9c3f8002e7c -r e7fa36b2bd23 tests/run-tests.py
--- a/tests/run-tests.py	Thu Mar 13 11:19:32 2014 +0000
+++ b/tests/run-tests.py	Thu Mar 20 01:02:04 2014 +0000
@@ -1180,12 +1180,12 @@
 
     checktools()
 
-    if len(args) == 0:
-        args = [t for t in os.listdir(".")
-                if t.startswith("test-")
-                and (t.endswith(".py") or t.endswith(".t"))]
+    if not args:
+        args = os.listdir(".")
 
-    tests = args
+    tests = [t for t in args
+             if t.startswith("test-")
+             and (t.endswith(".py") or t.endswith(".t"))]
 
     if options.random:
         random.shuffle(tests)