diff tests/test-add.t @ 35393:4441705b7111

tests: remove (glob) annotations that were only for '\' matches

# skip-blame because this was mechanically rewritten the following script.  I
ran it on both *.t and *.py, but none of the *.py changes were proper.  All *.t
ones appear to be, and they run without addition failures on both Windows and
Linux.

  import argparse
  import os
  import re

  ap = argparse.ArgumentParser()
  ap.add_argument('path', nargs='+')
  opts = ap.parse_args()

  globre = re.compile(r'^(.*) \(glob\)(.*)$')

  for p in opts.path:
      tmp = p + '.tmp'
      with open(p, 'rb') as src, open(tmp, 'wb') as dst:
          for line in src:
              m = globre.match(line)
              if not m or '$LOCALIP' in line or '*' in line:
                  dst.write(line)
                  continue
              if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'):
                  dst.write(line)
                  continue
              dst.write(m.group(1) + m.group(2) + '\n')
      os.unlink(p)
      os.rename(tmp, p)

--- a/tests/test-add.t	Sun Dec 10 22:45:35 2017 -0500
+++ b/tests/test-add.t	Sun Dec 10 22:50:57 2017 -0500
@@ -197,17 +197,17 @@
   $ echo def > CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg add capsdir1/capsdir
-  adding CapsDir1/CapsDir/AbC.txt (glob)
-  adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
+  adding CapsDir1/CapsDir/AbC.txt
+  adding CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg forget capsdir1/capsdir/abc.txt
 
   $ hg forget capsdir1/capsdir
-  removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
+  removing CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg add capsdir1
-  adding CapsDir1/CapsDir/AbC.txt (glob)
-  adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
+  adding CapsDir1/CapsDir/AbC.txt
+  adding CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg ci -m "AbCDef" capsdir1/capsdir
 
@@ -216,14 +216,14 @@
   C CapsDir1/CapsDir/SubDir/Def.txt
 
   $ hg files capsdir1/capsdir
-  CapsDir1/CapsDir/AbC.txt (glob)
-  CapsDir1/CapsDir/SubDir/Def.txt (glob)
+  CapsDir1/CapsDir/AbC.txt
+  CapsDir1/CapsDir/SubDir/Def.txt
 
   $ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt
   $ hg ci -m xyz capsdir1/capsdir/subdir/def.txt
 
   $ hg revert -r '.^' capsdir1/capsdir
-  reverting CapsDir1/CapsDir/SubDir/Def.txt (glob)
+  reverting CapsDir1/CapsDir/SubDir/Def.txt
 
 The conditional tests above mean the hash on the diff line differs on Windows
 and OS X
@@ -244,8 +244,8 @@
 
   $ hg remove -f 'glob:**.txt' -X capsdir1/capsdir
   $ hg remove -f 'glob:**.txt' -I capsdir1/capsdir
-  removing CapsDir1/CapsDir/ABC.txt (glob)
-  removing CapsDir1/CapsDir/SubDir/Def.txt (glob)
+  removing CapsDir1/CapsDir/ABC.txt
+  removing CapsDir1/CapsDir/SubDir/Def.txt
 #endif
 
   $ cd ..