win32text: drop associated dirstate cache information on revert

Otherwise the could get size from one version of the file while the on-disk
version is still clean but with another size.

This fix the previously introduced error.

Differential Revision: https://phab.mercurial-scm.org/D11792

hgext/narrow/narrowdirstate.py

@@ -1,76 +1,76 b''
 # narrowdirstate.py - extensions to mercurial dirstate to support narrow clones
 #
 # Copyright 2017 Google, Inc.
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 from mercurial.i18n import _
 from mercurial import error
 
 
 def wrapdirstate(repo, dirstate):
     """Add narrow spec dirstate ignore, block changes outside narrow spec."""
 
     def _editfunc(fn):
         def _wrapper(self, *args, **kwargs):
             narrowmatch = repo.narrowmatch()
             for f in args:
                 if f is not None and not narrowmatch(f) and f not in self:
                     raise error.Abort(
                         _(
                             b"cannot track '%s' - it is outside "
                             + b"the narrow clone"
                         )
                         % f
                     )
             return fn(self, *args, **kwargs)
 
         return _wrapper
 
     class narrowdirstate(dirstate.__class__):
         # Prevent adding/editing/copying/deleting files that are outside the
         # sparse checkout
         @_editfunc
         def normal(self, *args, **kwargs):
             return super(narrowdirstate, self).normal(*args, **kwargs)
 
         @_editfunc
-        def set_tracked(self, *args):
-            return super(narrowdirstate, self).set_tracked(*args)
+        def set_tracked(self, *args, **kwargs):
+            return super(narrowdirstate, self).set_tracked(*args, **kwargs)
 
         @_editfunc
         def set_untracked(self, *args):
             return super(narrowdirstate, self).set_untracked(*args)
 
         @_editfunc
         def add(self, *args):
             return super(narrowdirstate, self).add(*args)
 
         @_editfunc
         def normallookup(self, *args):
             return super(narrowdirstate, self).normallookup(*args)
 
         @_editfunc
         def copy(self, *args):
             return super(narrowdirstate, self).copy(*args)
 
         @_editfunc
         def remove(self, *args):
             return super(narrowdirstate, self).remove(*args)
 
         @_editfunc
         def merge(self, *args):
             return super(narrowdirstate, self).merge(*args)
 
         def rebuild(self, parent, allfiles, changedfiles=None):
             if changedfiles is None:
                 # Rebuilding entire dirstate, let's filter allfiles to match the
                 # narrowspec.
                 allfiles = [f for f in allfiles if repo.narrowmatch()(f)]
             super(narrowdirstate, self).rebuild(parent, allfiles, changedfiles)
 
     dirstate.__class__ = narrowdirstate
     return dirstate

hgext/win32text.py

@@ -1,226 +1,246 b''
 # win32text.py - LF <-> CRLF/CR translation utilities for Windows/Mac users
 #
 #  Copyright 2005, 2007-2009 Olivia Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''perform automatic newline conversion (DEPRECATED)
 
   Deprecation: The win32text extension requires each user to configure
   the extension again and again for each clone since the configuration
   is not copied when cloning.
 
   We have therefore made the ``eol`` as an alternative. The ``eol``
   uses a version controlled file for its configuration and each clone
   will therefore use the right settings from the start.
 
 To perform automatic newline conversion, use::
 
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   # or ** = macencode:
 
   [decode]
   ** = cleverdecode:
   # or ** = macdecode:
 
 If not doing conversion, to make sure you do not commit CRLF/CR by accident::
 
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   # or pretxncommit.cr = python:hgext.win32text.forbidcr
 
 To do the same check on a server to prevent CRLF/CR from being
 pushed or pulled::
 
   [hooks]
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
   # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
 '''
 
 from __future__ import absolute_import
 
 import re
 from mercurial.i18n import _
 from mercurial.node import short
 from mercurial import (
+    cmdutil,
+    extensions,
     pycompat,
     registrar,
 )
 from mercurial.utils import stringutil
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = b'ships-with-hg-core'
 
 configtable = {}
 configitem = registrar.configitem(configtable)
 
 configitem(
     b'win32text',
     b'warn',
     default=True,
 )
 
 # regexp for single LF without CR preceding.
 re_single_lf = re.compile(b'(^|[^\r])\n', re.MULTILINE)
 
 newlinestr = {b'\r\n': b'CRLF', b'\r': b'CR'}
 filterstr = {b'\r\n': b'clever', b'\r': b'mac'}
 
 
 def checknewline(s, newline, ui=None, repo=None, filename=None):
     # warn if already has 'newline' in repository.
     # it might cause unexpected eol conversion.
     # see issue 302:
     #   https://bz.mercurial-scm.org/302
     if newline in s and ui and filename and repo:
         ui.warn(
             _(
                 b'WARNING: %s already has %s line endings\n'
                 b'and does not need EOL conversion by the win32text plugin.\n'
                 b'Before your next commit, please reconsider your '
                 b'encode/decode settings in \nMercurial.ini or %s.\n'
             )
             % (filename, newlinestr[newline], repo.vfs.join(b'hgrc'))
         )
 
 
 def dumbdecode(s, cmd, **kwargs):
     checknewline(s, b'\r\n', **kwargs)
     # replace single LF to CRLF
     return re_single_lf.sub(b'\\1\r\n', s)
 
 
 def dumbencode(s, cmd):
     return s.replace(b'\r\n', b'\n')
 
 
 def macdumbdecode(s, cmd, **kwargs):
     checknewline(s, b'\r', **kwargs)
     return s.replace(b'\n', b'\r')
 
 
 def macdumbencode(s, cmd):
     return s.replace(b'\r', b'\n')
 
 
 def cleverdecode(s, cmd, **kwargs):
     if not stringutil.binary(s):
         return dumbdecode(s, cmd, **kwargs)
     return s
 
 
 def cleverencode(s, cmd):
     if not stringutil.binary(s):
         return dumbencode(s, cmd)
     return s
 
 
 def macdecode(s, cmd, **kwargs):
     if not stringutil.binary(s):
         return macdumbdecode(s, cmd, **kwargs)
     return s
 
 
 def macencode(s, cmd):
     if not stringutil.binary(s):
         return macdumbencode(s, cmd)
     return s
 
 
 _filters = {
     b'dumbdecode:': dumbdecode,
     b'dumbencode:': dumbencode,
     b'cleverdecode:': cleverdecode,
     b'cleverencode:': cleverencode,
     b'macdumbdecode:': macdumbdecode,
     b'macdumbencode:': macdumbencode,
     b'macdecode:': macdecode,
     b'macencode:': macencode,
 }
 
 
 def forbidnewline(ui, repo, hooktype, node, newline, **kwargs):
     halt = False
     seen = set()
     # we try to walk changesets in reverse order from newest to
     # oldest, so that if we see a file multiple times, we take the
     # newest version as canonical. this prevents us from blocking a
     # changegroup that contains an unacceptable commit followed later
     # by a commit that fixes the problem.
     tip = repo[b'tip']
     for rev in pycompat.xrange(
         repo.changelog.tiprev(), repo[node].rev() - 1, -1
     ):
         c = repo[rev]
         for f in c.files():
             if f in seen or f not in tip or f not in c:
                 continue
             seen.add(f)
             data = c[f].data()
             if not stringutil.binary(data) and newline in data:
                 if not halt:
                     ui.warn(
                         _(
                             b'attempt to commit or push text file(s) '
                             b'using %s line endings\n'
                         )
                         % newlinestr[newline]
                     )
                 ui.warn(_(b'in %s: %s\n') % (short(c.node()), f))
                 halt = True
     if halt and hooktype == b'pretxnchangegroup':
         crlf = newlinestr[newline].lower()
         filter = filterstr[newline]
         ui.warn(
             _(
                 b'\nTo prevent this mistake in your local repository,\n'
                 b'add to Mercurial.ini or .hg/hgrc:\n'
                 b'\n'
                 b'[hooks]\n'
                 b'pretxncommit.%s = python:hgext.win32text.forbid%s\n'
                 b'\n'
                 b'and also consider adding:\n'
                 b'\n'
                 b'[extensions]\n'
                 b'win32text =\n'
                 b'[encode]\n'
                 b'** = %sencode:\n'
                 b'[decode]\n'
                 b'** = %sdecode:\n'
             )
             % (crlf, crlf, filter, filter)
         )
     return halt
 
 
 def forbidcrlf(ui, repo, hooktype, node, **kwargs):
     return forbidnewline(ui, repo, hooktype, node, b'\r\n', **kwargs)
 
 
 def forbidcr(ui, repo, hooktype, node, **kwargs):
     return forbidnewline(ui, repo, hooktype, node, b'\r', **kwargs)
 
 
 def reposetup(ui, repo):
     if not repo.local():
         return
     for name, fn in pycompat.iteritems(_filters):
         repo.adddatafilter(name, fn)
 
 
+def wrap_revert(orig, repo, ctx, names, uipathfn, actions, *args, **kwargs):
+    # reset dirstate cache for file we touch
+    ds = repo.dirstate
+    with ds.parentchange():
+        for filename in actions[b'revert'][0]:
+            entry = ds.get_entry(filename)
+            if entry is not None:
+                if entry.p1_tracked:
+                    ds.update_file(
+                        filename,
+                        entry.tracked,
+                        p1_tracked=True,
+                        p2_info=entry.p2_info,
+                    )
+    return orig(repo, ctx, names, uipathfn, actions, *args, **kwargs)
+
+
 def extsetup(ui):
     # deprecated config: win32text.warn
     if ui.configbool(b'win32text', b'warn'):
         ui.warn(
             _(
                 b"win32text is deprecated: "
                 b"https://mercurial-scm.org/wiki/Win32TextExtension\n"
             )
         )
+    extensions.wrapfunction(cmdutil, '_performrevert', wrap_revert)

tests/test-win32text.t

@@ -1,425 +1,424 b''
 
   $ hg init t
   $ cd t
   $ cat > unix2dos.py <<EOF
   > import sys
   > 
   > for path in sys.argv[1:]:
   >     data = open(path, 'rb').read()
   >     data = data.replace(b'\n', b'\r\n')
   >     open(path, 'wb').write(data)
   > EOF
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ cat .hg/hgrc
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 
   $ echo hello > f
   $ hg add f
 
 commit should succeed
 
   $ hg ci -m 1
 
   $ hg clone . ../zoz
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cp .hg/hgrc ../zoz/.hg
   $ "$PYTHON" unix2dos.py f
 
 commit should fail
 
   $ hg ci -m 2.1
   attempt to commit or push text file(s) using CRLF line endings
   in f583ea08d42a: f
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [40]
 
   $ mv .hg/hgrc .hg/hgrc.bak
 
 commits should succeed
 
   $ hg ci -m 2
   $ hg cp f g
   $ hg ci -m 2.2
 
 push should fail
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   attempt to commit or push text file(s) using CRLF line endings
   in bc2d09796734: g
   in b1aa5cde7ff4: f
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [40]
 
   $ mv .hg/hgrc.bak .hg/hgrc
   $ echo hello > f
   $ hg rm g
 
 commit should succeed
 
   $ hg ci -m 2.3
 
 push should succeed
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
 
 and now for something completely different
 
   $ mkdir d
   $ echo hello > d/f2
   $ "$PYTHON" unix2dos.py d/f2
   $ hg add d/f2
   $ hg ci -m 3
   attempt to commit or push text file(s) using CRLF line endings
   in 053ba1a3035a: d/f2
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [40]
   $ hg revert -a
   forgetting d/f2
   $ rm d/f2
 
   $ hg rem f
   $ hg ci -m 4
 
   $ "$PYTHON" -c 'open("bin", "wb").write(b"hello\x00\x0D\x0A")'
   $ hg add bin
   $ hg ci -m 5
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ hg clone . dupe
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ for x in a b c d; do echo content > dupe/$x; done
   $ hg -R dupe add
   adding dupe/a
   adding dupe/b
   adding dupe/c
   adding dupe/d
   $ "$PYTHON" unix2dos.py dupe/b dupe/c dupe/d
   $ hg -R dupe ci -m a dupe/a
   $ hg -R dupe ci -m b/c dupe/[bc]
   $ hg -R dupe ci -m d dupe/d
   $ hg -R dupe log -v
   changeset:   8:67ac5962ab43
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       d
   description:
   d
   
   
   changeset:   7:68c127d1834e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b c
   description:
   b/c
   
   
   changeset:   6:adbf8bf7f31d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   a
   
   
   changeset:   5:f0b1c8d75fce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ hg pull dupe
   pulling from dupe
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   attempt to commit or push text file(s) using CRLF line endings
   in 67ac5962ab43: d
   in 68c127d1834e: b
   in 68c127d1834e: c
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [40]
 
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ rm .hg/hgrc
   $ (echo some; echo text) > f3
   $ "$PYTHON" -c 'open("f4.bat", "wb").write(b"rem empty\x0D\x0A")'
   $ hg add f3 f4.bat
   $ hg ci -m 6
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some
   text
   $ cat f4.bat
   rem empty\r (esc)
 
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'win32text = ' >> .hg/hgrc
   $ echo '[decode]' >> .hg/hgrc
   $ echo '** = cleverdecode:' >> .hg/hgrc
   $ echo '[encode]' >> .hg/hgrc
   $ echo '** = cleverencode:' >> .hg/hgrc
   $ cat .hg/hgrc
   [extensions]
   win32text = 
   [decode]
   ** = cleverdecode:
   [encode]
   ** = cleverencode:
 
 Trigger deprecation warning:
 
   $ hg id -t
   win32text is deprecated: https://mercurial-scm.org/wiki/Win32TextExtension
   tip
 
 Disable warning:
 
   $ echo '[win32text]' >> .hg/hgrc
   $ echo 'warn = no' >> .hg/hgrc
   $ hg id -t
   tip
 
   $ rm f3 f4.bat bin
   $ hg co -C
   WARNING: f4.bat already has CRLF line endings
   and does not need EOL conversion by the win32text plugin.
   Before your next commit, please reconsider your encode/decode settings in 
   Mercurial.ini or $TESTTMP/t/.hg/hgrc.
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some\r (esc)
   text\r (esc)
   $ cat f4.bat
   rem empty\r (esc)
 
   $ "$PYTHON" -c 'open("f5.sh", "wb").write(b"# empty\x0D\x0A")'
   $ hg add f5.sh
   $ hg ci -m 7
   $ cat f5.sh
   # empty\r (esc)
   $ hg cat f5.sh
   # empty
   $ echo '% just linefeed' > linefeed
   $ hg ci -qAm 8 linefeed
   $ cat linefeed
   % just linefeed
   $ hg cat linefeed
   % just linefeed
   $ hg st -q
   $ hg revert -a linefeed
   no changes needed to linefeed
   $ cat linefeed
   % just linefeed
   $ hg st -q
   $ echo modified >> linefeed
   $ hg st -q
   M linefeed
   $ hg revert -a
   reverting linefeed
   $ hg st -q
-  M linefeed (known-bad-output !)
   $ cat linefeed
   % just linefeed\r (esc)
 
   $ cd ..