Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 16094:0776a6cababe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't use unknown() This removes use of unknown files for building the synthetic working directory manifest used by manifestmerge. Instead, we adopt the strategy used by _checkunknown. Side-effect: unknown files are no longer moved by remote directory renames, and now are left alone like ignored files.
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Feb 2012 17:04:17 -0600
parents 2bd54ffaa27e
children 004982e5d782
line wrap: on
line diff
--- a/mercurial/context.py	Thu Feb 09 16:50:19 2012 -0600
+++ b/mercurial/context.py	Thu Feb 09 17:04:17 2012 -0600
@@ -698,9 +698,6 @@
     def _manifest(self):
         """generate a manifest corresponding to the working directory"""
 
-        if self._unknown is None:
-            self.status(unknown=True)
-
         man = self._parents[0].manifest().copy()
         if len(self._parents) > 1:
             man2 = self.p2().manifest()
@@ -714,8 +711,7 @@
         copied = self._repo.dirstate.copies()
         ff = self._flagfunc
         modified, added, removed, deleted = self._status
-        unknown = self._unknown
-        for i, l in (("a", added), ("m", modified), ("u", unknown)):
+        for i, l in (("a", added), ("m", modified)):
             for f in l:
                 orig = copied.get(f, f)
                 man[f] = getman(orig).get(orig, nullid) + i