Mercurial > hg-stable

changeset 17055:8b7cd9a998f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: re-include root directory in directory rename detection (issue3511)
author Matt Mackall <mpm@selenic.com>
date Wed, 27 Jun 2012 13:41:04 -0500
parents 125ff5654b72
children 30853f4bde2f
files mercurial/context.py mercurial/copies.py
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Mon Jun 25 15:14:05 2012 -0700
+++ b/mercurial/context.py	Wed Jun 27 13:41:04 2012 -0500
@@ -1054,7 +1054,7 @@
                 wlock.release()
 
     def dirs(self):
-        return self._repo.dirstate.dirs()
+        return set(self._repo.dirstate.dirs())
 
 class workingfilectx(filectx):
     """A workingfilectx object makes access to data related to a particular
--- a/mercurial/copies.py	Mon Jun 25 15:14:05 2012 -0700
+++ b/mercurial/copies.py	Wed Jun 27 13:41:04 2012 -0500
@@ -321,7 +321,9 @@
 
     # generate a directory move map
     d1, d2 = c1.dirs(), c2.dirs()
-    invalid = set([""])
+    d1.add('')
+    d2.add('')
+    invalid = set()
     dirmove = {}
 
     # examine each file copy for a potential directory move, which is