Mercurial > hg-stable

changeset 14697:b1880474e3ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Sune Foldager <cryo@cyanite.org>
date Mon, 20 Jun 2011 11:08:41 +0200
parents c67c41af264c (current diff) 5fb3cb7266e5 (diff)
children 0e64286760d5
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/config.py	Mon Jun 20 10:42:19 2011 +0200
+++ b/mercurial/config.py	Mon Jun 20 11:08:41 2011 +0200
@@ -27,6 +27,9 @@
     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):
--- a/mercurial/patch.py	Mon Jun 20 10:42:19 2011 +0200
+++ b/mercurial/patch.py	Mon Jun 20 11:08:41 2011 +0200
@@ -1378,7 +1378,7 @@
             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: