# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1319472130 -3600
# Node ID 5c25b505ffc1a0a7a0f663f4b2bf0807a22fd8cd
# Parent  e50f10baa81a9eb6897d42ac6fda1c3edf6801b3# Parent  dadecc4f3341bb50749a3e67c12724eec6801bdb
Merge with stable

diff -r e50f10baa81a -r 5c25b505ffc1 hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Oct 21 12:07:27 2011 +0100
+++ b/hgkw/keyword.py	Mon Oct 24 17:02:10 2011 +0100
@@ -86,7 +86,7 @@
 from mercurial import scmutil
 from mercurial.hgweb import webcommands
 from mercurial.i18n import _
-import os, re, shutil, tempfile
+import re, shutil, tempfile
 
 commands.optionalrepo += ' kwdemo'
 
@@ -647,7 +647,7 @@
             source = repo.dirstate.copied(dest)
             if 'l' in wctx.flags(source):
                 source = scmutil.canonpath(repo.root, cwd,
-                                           os.path.realpath(source))
+                                           util.realpath(source))
             return kwt.match(source)
 
         candidates = [f for f in repo.dirstate.copies() if
diff -r e50f10baa81a -r 5c25b505ffc1 tests/run-tests.py
--- a/tests/run-tests.py	Fri Oct 21 12:07:27 2011 +0100
+++ b/tests/run-tests.py	Mon Oct 24 17:02:10 2011 +0100
@@ -1129,6 +1129,8 @@
     os.environ['COLUMNS'] = '80'
     os.environ['GREP_OPTIONS'] = ''
     os.environ['http_proxy'] = ''
+    os.environ['no_proxy'] = ''
+    os.environ['NO_PROXY'] = ''
 
     # unset env related to hooks
     for k in os.environ.keys():