tests: add a substitution for ENOTDIR/ERROR_PATH_NOT_FOUND messages

tests/common-pattern.py

@@ -1,53 +1,60 b''
 # common patterns in test at can safely be replaced
 from __future__ import absolute_import
 
 substitutions = [
     # list of possible compressions
     (br'zstd,zlib,none,bzip2',
      br'$USUAL_COMPRESSIONS$'
     ),
     # capabilities sent through http
     (br'bundlecaps=HG20%2Cbundle2%3DHG20%250A'
      br'changegroup%253D01%252C02%250A'
      br'digests%253Dmd5%252Csha1%252Csha512%250A'
      br'error%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250A'
      br'hgtagsfnodes%250A'
      br'listkeys%250A'
      br'phases%253Dheads%250A'
      br'pushkey%250A'
      br'remote-changegroup%253Dhttp%252Chttps',
      # (the replacement patterns)
      br'$USUAL_BUNDLE_CAPS$'
     ),
     # bundle2 capabilities sent through ssh
     (br'bundle2=HG20%0A'
      br'changegroup%3D01%2C02%0A'
      br'digests%3Dmd5%2Csha1%2Csha512%0A'
      br'error%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0A'
      br'hgtagsfnodes%0A'
      br'listkeys%0A'
      br'phases%3Dheads%0A'
      br'pushkey%0A'
      br'remote-changegroup%3Dhttp%2Chttps',
      # (replacement patterns)
      br'$USUAL_BUNDLE2_CAPS$'
     ),
     # HTTP log dates
     (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "GET',
      br' - - [$LOGDATE$] "GET'
     ),
 ]
 
 # Various platform error strings, keyed on a common replacement string
 _errors = {
     br'$ENOENT$': (
         # strerror()
         br'No such file or directory',
 
         # FormatMessage(ERROR_FILE_NOT_FOUND)
         br'The system cannot find the file specified',
     ),
+    br'$ENOTDIR$': (
+        # strerror()
+        br'Not a directory',
+
+        # FormatMessage(ERROR_PATH_NOT_FOUND)
+        br'The system cannot find the path specified',
+    ),
 }
 
 for replace, msgs in _errors.items():
     substitutions.extend((m, replace) for m in msgs)

tests/test-origbackup-conflict.t

@@ -1,137 +1,136 b''
 Set up repo
 
   $ cat << EOF >> $HGRCPATH
   > [ui]
   > origbackuppath=.hg/origbackups
   > [merge]
   > checkunknown=warn
   > EOF
   $ hg init repo
   $ cd repo
   $ echo base > base
   $ hg add base
   $ hg commit -m "base"
 
 Make a dir named b that contains a file, and a file named d
 
   $ mkdir -p b
   $ echo c1 > b/c
   $ echo d1 > d
   $ hg add b/c d
   $ hg commit -m "c1"
   $ hg bookmark c1
 
 Peform an update that causes b/c to be backed up
 
   $ hg up -q 0
   $ mkdir -p b
   $ echo c2 > b/c
   $ hg up --verbose c1
   resolving manifests
   b/c: replacing untracked file
   getting b/c
   creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
   getting d
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark c1)
   $ test -f .hg/origbackups/b/c
 
 Make files named b and d
 
   $ hg up -q 0
   $ echo b1 > b
   $ echo d2 > d
   $ hg add b d
   $ hg commit -m b1
   created new head
   $ hg bookmark b1
 
 Perform an update that causes b to be backed up - it should replace the backup b dir
 
   $ hg up -q 0
   $ echo b2 > b
   $ hg up --verbose b1
   resolving manifests
   b: replacing untracked file
   getting b
   removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b (glob)
   getting d
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark b1)
   $ test -f .hg/origbackups/b
 
 Perform an update the causes b/c to be backed up again - it should replace the backup b file
 
   $ hg up -q 0
   $ mkdir b
   $ echo c3 > b/c
   $ hg up --verbose c1
   resolving manifests
   b/c: replacing untracked file
   getting b/c
   creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
   removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
   getting d
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark c1)
   $ test -d .hg/origbackups/b
 
 Cause two symlinks to be backed up that points to a valid location from the backup dir
 
   $ hg up -q 0
   $ mkdir ../sym-link-target
 #if symlink
   $ ln -s ../../../sym-link-target b
   $ ln -s ../../../sym-link-target d
 #else
   $ touch b d
 #endif
   $ hg up b1
   b: replacing untracked file
   d: replacing untracked file
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark b1)
 #if symlink
   $ readlink.py .hg/origbackups/b
   .hg/origbackups/b -> ../../../sym-link-target
 #endif
 
 Perform an update that causes b/c and d to be backed up again - b/c should not go into the target dir
 
   $ hg up -q 0
   $ mkdir b
   $ echo c4 > b/c
   $ echo d3 > d
   $ hg up --verbose c1
   resolving manifests
   b/c: replacing untracked file
   d: replacing untracked file
   getting b/c
   creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
   removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
   getting d
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark c1)
   $ cat .hg/origbackups/b/c
   c4
   $ cat .hg/origbackups/d
   d3
   $ ls ../sym-link-target
 
 Incorrectly configure origbackuppath to be under a file
 
   $ echo data > .hg/badorigbackups
   $ hg up -q 0
   $ mkdir b
   $ echo c5 > b/c
   $ hg up --verbose c1 --config ui.origbackuppath=.hg/badorigbackups
   resolving manifests
   b/c: replacing untracked file
   getting b/c
   creating directory: $TESTTMP/repo/.hg/badorigbackups/b (glob)
-  abort: The system cannot find the path specified: '$TESTTMP/repo/.hg/badorigbackups/b' (glob) (windows !)
-  abort: Not a directory: '$TESTTMP/repo/.hg/badorigbackups/b' (no-windows !)
+  abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b' (glob)
   [255]
   $ cat .hg/badorigbackups
   data