# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 2011-06-20 09:08:41
# Node ID b1880474e3adb25d2242cb00005b872ce67e85b2
# Parent  c67c41af264ccee43cbae2b830ebb1f9c4007253
# Parent  5fb3cb7266e5dab94207de980cfdca0e82cdb813

merge with stable

diff --git a/mercurial/config.py b/mercurial/config.py
--- a/mercurial/config.py
+++ b/mercurial/config.py
@@ -27,6 +27,9 @@ class sortdict(dict):
     def update(self, src):
         for k in src:
             self[k] = src[k]
+    def clear(self):
+        dict.clear(self)
+        self._list = []
     def items(self):
         return [(k, self[k]) for k in self._list]
     def __delitem__(self, key):
diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -1378,7 +1378,7 @@ def _externalpatch(ui, repo, patcher, pa
             cwd = repo.getcwd()
             if cwd:
                 cfiles = [util.pathto(repo.root, cwd, f)
-                          for f in cfile]
+                          for f in cfiles]
             scmutil.addremove(repo, cfiles, similarity=similarity)
     code = fp.close()
     if code: