Mercurial Mercurial > test / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 24 Oct 2011 17:02:10 +0100
changeset 997 5c25b505ffc1
parent 993 e50f10baa81a (current diff)
parent 996 dadecc4f3341 (diff)
child 1004 b675519e2a5b
Merge with stable
--- 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
--- 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():
test