Mercurial > hg > pyhgsh

changeset 1532:27077812fffb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reset mtime when two files are equal
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 11 Nov 2005 15:34:17 -0800
parents 2ba8bf7defda
children 3d11f81c9145
files mercurial/localrepo.py
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Nov 11 15:34:13 2005 -0800
+++ b/mercurial/localrepo.py	Fri Nov 11 15:34:17 2005 -0800
@@ -486,6 +486,10 @@
 
         # are we comparing the working directory?
         if not node2:
+            try:
+                wlock = self.wlock(wait=0)
+            except lock.LockHeld:
+                wlock = None
             l, c, a, d, u = self.dirstate.changes(files, match)
 
             # are we comparing working dir against its parent?
@@ -497,6 +501,8 @@
                     for f in l:
                         if fcmp(f, mf2):
                             c.append(f)
+                        elif wlock is not None:
+                            self.dirstate.update([f], "n")
 
                 for l in c, a, d, u:
                     l.sort()