Commits

ZyX_I committed 53b0de6

Fixed issues with files inside directory on windows, make this be tested

Comments (0)

Files changed (29)

aurum-addon-info.txt

             "url": "https://bitbucket.org/ZyX_I/frawor",
         },
     },
+    "USE": {
+        "python": "|| ( app-editors/vim[python] app-editors/gvim[python] )",
+    },
     "files": [
         "doc/aurum.txt",
         "ftplugin/aurumannotate.vim",

plugin/aurum/drivers/mercurial.vim

 endfunction
 "▶2 unesc :: String → String
 let s:F.unesc=function('eval')
+"▶2 refile :: path → path
+function s:F.refile(path)
+    return join(s:_r.os.path.split(a:path)[1:], '/')
+endfunction
 "▶2 parsecs :: csdata, lstart::UInt → [cs, line::UInt]
-" TODO Check style file on windows (may be issues regarding used path separator:
-"      it is expected to be a forward slash)
 let s:stylefile=shellescape(s:_r.os.path.join(s:_frawor.runtimepath,
                 \                             'misc', 'map-cmdline.csinfo'))
-let s:chars=[['P', 'parents'],
-            \['T', 'tags'],
-            \['B', 'bookmarks'],
-            \['C', 'changes'],
-            \['R', 'removes']]
+let s:chars = [['P', 'parents'  ],
+            \  ['T', 'tags'     ],
+            \  ['B', 'bookmarks']]
+let s:fchars= [['C', 'changes'  ],
+            \  ['R', 'removes'  ]]
 function s:F.parsecs(csdata, lstart)
     "▶3 Initialize variables, check for changeset start
     let cs={}
             let line+=1
         endwhile
     endfor
+    "▶3 List file keys: changes, removes
+    for [char, key] in s:fchars
+        let cs[key]=[]
+        while line<lcsdata && a:csdata[line][0] is# char
+            let cs[key]+=[s:F.refile(s:F.unesc(a:csdata[line][1:]))]
+            let line+=1
+        endwhile
+    endfor
     "▶3 Add data to cs.parents in case it is empty
     if empty(cs.parents)
         if cs.rev>0
     "▶3 Copies, renames
     let copies={}
     while line<lcsdata && a:csdata[line][0] is# 'D'
-        let copies[s:F.unesc(a:csdata[line][1:])]=s:F.unesc(a:csdata[line+1])
+        let copies[s:F.refile(s:F.unesc(a:csdata[line][1:]))]=
+                    \                   s:F.refile(s:F.unesc(a:csdata[line+1]))
         let line+=2
     endwhile
     let cs.copies  = filter(copy(copies), 'index(cs.removes, v:val)==-1')
     endif
     let r=deepcopy(s:initstatdct)
     call map(copy(slines), 'add(r[s:hgstatchars[v:val[0]]], '.
-                \              'join(s:_r.os.path.split(v:val[2:])[1:], "/"))')
+                \              's:F.refile(v:val[2:]))')
     if a:0>2 && !empty(a:3)
         call map(r, 'map(v:val, "a:repo.functions.reltorepo(a:repo, v:val)")')
     endif

test/annotate-buffers.ok

 {{{1 file
-#1: aurum://annotate:%ETMPDIR%%-test%-annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+#1: aurum://annotate:%ETMPDIR%%-test%-annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 *2: %TMPDIR%/test/annotate-buffersrepo/chgrepo.zsh
 {{{1 aurum://file
 #1: aurum://annotate:%ETMPDIR%%-test%-testrepo:c4110a066208167dae46b08f4e0d8d2b37e842f3:chgrepo.zsh
 *2: aurum://file:testrepo:10:chgrepo.zsh
 {{{1 aurum://copy
-#1: aurum://annotate:%ETMPDIR%%-test%-testrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+#1: aurum://annotate:%ETMPDIR%%-test%-testrepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 *2: aurum://copy:testrepo/chgrepo.zsh
 {{{1 aurum://status
-#1: aurum://annotate:%ETMPDIR%%-test%-annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
-*2: aurum://file:%ETMPDIR%%-test%-annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
+#1: aurum://annotate:%ETMPDIR%%-test%-annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
+*2: aurum://file:%ETMPDIR%%-test%-annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
  3: 
  4: aurum://status:%ETMPDIR%%-test%-annotate-buffersrepo:show:clean
 {{{1 aurum://diff
 *2: aurum://file:%ETMPDIR%%-test%-testrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
  3: aurum://diff:testrepo::2:crepo.zsh
 {{{1 aurum://commit
-#1: aurum://annotate:%ETMPDIR%%-test%-annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
-*2: aurum://file:%ETMPDIR%%-test%-annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+#1: aurum://annotate:%ETMPDIR%%-test%-annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*2: aurum://file:%ETMPDIR%%-test%-annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
  3: aurum://commit:annotate-buffersrepo::::nohglinesrev.lst
 {{{1 aurum://annotate 1
 #1: aurum://annotate:%ETMPDIR%%-test%-testrepo:99ea42d70fbe32af955de907352999b1d94bef5f:createrepo.zsh

test/annotate.ok

Binary file modified.

test/aufilemaps.ok

 aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:dfe39aa48c6ddde158e42217548b531a45ff66e9:crepo.zsh
 aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 1
-aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 =aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 *1: aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 #2: aurum://file:%ETMPDIR%%-test%-aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh

test/createrepo.zsh

     hg commit -m 'Merge' \
         --date '2002-02-11 05:00' --user $C
     echo $'syntax: glob\nignored*' > .hgignore
-    hg commit -A -m 'Added .hgignore' \
+    mkdir directory
+    echo $'File contents' > directory/file
+    hg commit -A -m $'Added .hgignore\nAdded directory/file' \
         --date '2002-02-11 05:43' --user $A
     echo abc >> nohglinesrev.lst
     echo 'Def' > addeddef && hg add addeddef
 {{{1
-diff -r df55ab32bcfa addeddef
+diff -r 504f74154456 addeddef
 --- /dev/null
 +++ b/addeddef
 @@ -0,0 +1,1 @@
 +Def
-diff -r df55ab32bcfa hglines2.lst
+diff -r 504f74154456 hglines2.lst
 --- a/hglines2.lst
 +++ /dev/null
 @@ -1,41 +0,0 @@
 -    hg commit -A -m 'Added ignored10.lst' \
 -    hg commit -A -m 'Added .hgignore' \
 -    hg rm hglines2.lst
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
 +abc
 w$: 1
 {{{1 cmd
-diff -r df55ab32bcfa addeddef
+diff -r 504f74154456 addeddef
 --- /dev/null
 +++ b/addeddef
 @@ -0,0 +1,1 @@
 +Def
-diff -r df55ab32bcfa hglines2.lst
+diff -r 504f74154456 hglines2.lst
 --- a/hglines2.lst
 +++ /dev/null
 @@ -1,41 +0,0 @@
 -    hg commit -A -m 'Added ignored10.lst' \
 -    hg commit -A -m 'Added .hgignore' \
 -    hg rm hglines2.lst
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
 +9
 +10
 {{{1 rev2
-diff -r df55ab32bcfa addeddef
+diff -r 504f74154456 addeddef
 --- /dev/null
 +++ b/addeddef
 @@ -0,0 +1,1 @@
 +Def
-diff -r df55ab32bcfa hglines2.lst
+diff -r 504f74154456 hglines2.lst
 --- a/hglines2.lst
 +++ /dev/null
 @@ -1,41 +0,0 @@
 -    hg commit -A -m 'Added ignored10.lst' \
 -    hg commit -A -m 'Added .hgignore' \
 -    hg rm hglines2.lst
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
  opertset zx.rat.opertset fJc rat
 +abc
 {{{1 rev1 + rev2
-diff -r df55ab32bcfa -r e85aa09aab16 .hgignore
+diff -r 504f74154456 -r e85aa09aab16 .hgignore
 --- a/.hgignore
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -syntax: glob
 -ignored*
-diff -r df55ab32bcfa -r e85aa09aab16 .hgtags
+diff -r 504f74154456 -r e85aa09aab16 .hgtags
 --- a/.hgtags
 +++ b/.hgtags
 @@ -1,2 +1,1 @@
  c06107b7bcbe751d2dd40faf4179ee7d6aac44ac ablines
 -023aa55bd8062179ce36adbdd78363e9b88718c1 oldtag
-diff -r df55ab32bcfa -r e85aa09aab16 emerged.lst
+diff -r 504f74154456 -r e85aa09aab16 directory/file
+--- a/directory/file
++++ /dev/null
+@@ -1,1 +0,0 @@
+-File contents
+diff -r 504f74154456 -r e85aa09aab16 emerged.lst
 --- a/emerged.lst
 +++ /dev/null
 @@ -1,127 +0,0 @@
 -    echo 'Abc' > ignoredabc
 ->>>>>>> other
 -tar cJf testrepo.tar.xz testrepo
-diff -r df55ab32bcfa -r e85aa09aab16 glines.lst
+diff -r 504f74154456 -r e85aa09aab16 glines.lst
 --- a/glines.lst
 +++ /dev/null
 @@ -1,83 +0,0 @@
 -    cat hglines.lst | rev > hglinesrev.lst
 -    echo 'Abc' > ignoredabc
 ->>>>>>> other
-diff -r df55ab32bcfa -r e85aa09aab16 glinescopy.lst
+diff -r 504f74154456 -r e85aa09aab16 glinescopy.lst
 --- a/glinescopy.lst
 +++ /dev/null
 @@ -1,83 +0,0 @@
 -    echo 'Abc' > ignoredabc
 ->>>>>>> other
 {{{1 rev1 + rev2 + reverse
-diff -r e85aa09aab16 -r df55ab32bcfa .hgignore
+diff -r e85aa09aab16 -r 504f74154456 .hgignore
 --- /dev/null
 +++ b/.hgignore
 @@ -0,0 +1,2 @@
 +syntax: glob
 +ignored*
-diff -r e85aa09aab16 -r df55ab32bcfa .hgtags
+diff -r e85aa09aab16 -r 504f74154456 .hgtags
 --- a/.hgtags
 +++ b/.hgtags
 @@ -1,1 +1,2 @@
  c06107b7bcbe751d2dd40faf4179ee7d6aac44ac ablines
 +023aa55bd8062179ce36adbdd78363e9b88718c1 oldtag
-diff -r e85aa09aab16 -r df55ab32bcfa emerged.lst
+diff -r e85aa09aab16 -r 504f74154456 directory/file
+--- /dev/null
++++ b/directory/file
+@@ -0,0 +1,1 @@
++File contents
+diff -r e85aa09aab16 -r 504f74154456 emerged.lst
 --- /dev/null
 +++ b/emerged.lst
 @@ -0,0 +1,127 @@
 +    echo 'Abc' > ignoredabc
 +>>>>>>> other
 +tar cJf testrepo.tar.xz testrepo
-diff -r e85aa09aab16 -r df55ab32bcfa glines.lst
+diff -r e85aa09aab16 -r 504f74154456 glines.lst
 --- /dev/null
 +++ b/glines.lst
 @@ -0,0 +1,83 @@
 +    cat hglines.lst | rev > hglinesrev.lst
 +    echo 'Abc' > ignoredabc
 +>>>>>>> other
-diff -r e85aa09aab16 -r df55ab32bcfa glinescopy.lst
+diff -r e85aa09aab16 -r 504f74154456 glinescopy.lst
 --- /dev/null
 +++ b/glinescopy.lst
 @@ -0,0 +1,83 @@
 +}
  tar cJf testrepo.tar.xz testrepo
 {{{1 file
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
  opertset zx.rat.opertset fJc rat
 +abc
 {{{1 file :
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
-aurum://file:%ETMPDIR%%-test%-filerepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+aurum://file:%ETMPDIR%%-test%-filerepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 aurum://file:%ETMPDIR%%-test%-filerepo:a16a47a8d7aafc115651bfee6f1202093765365d:chgrepo.zsh
 aurum://file:%ETMPDIR%%-test%-testrepo:d760b0fe4fe45adf585f5030181b8081899e26a9:dlines.lst
 aurum://file:%ETMPDIR%%-test%-testrepo:d760b0fe4fe45adf585f5030181b8081899e26a9:dlines.lst

test/gentests-expand-tmpdir.zsh

 #!/bin/zsh
 () {
     emulate -L zsh
-    [[ ${TESTTYPE[-4,-1]} == wine ]] && local -x TMPDIR='T:'
+    (( ISWINE )) && local -x TMPDIR='T:'
     local -x ETMPDIR=${${TMPDIR//\//%-}//:/%.}
     perl -p -i -e 's/%(E?TMPDIR)%/$ENV{$1}/g' *.ok
 }
 C chgrepo.zsh
 C clines.lst
 C datelines.lst
+C directory/file
 C dlines.lst
 C emerged.lst
 C glines.lst
 R chgrepo.zsh
 R clines.lst
 R datelines.lst
+R directory/file
 R dlines.lst
 R emerged.lst
 R glines.lst

test/log-styles.ok

 {{{1 default
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
-|  Files: .hgignore
+|  Files: .hgignore, directory/file
 |  @ Added .hgignore
-|  $  .hgignore | 2 0
-|  $1 files changed, 2 insertions, 0 deletions
-|  :diff -r d8140c0b7b0b -r df55ab32bcfa .hgignore
+|  @ Added directory/file
+|  $  .hgignore      | 2 0
+|  $  directory/file | 1 0
+|  $2 files changed, 3 insertions, 0 deletions
+|  :diff -r d8140c0b7b0b -r 504f74154456 .hgignore
 |  :--- /dev/null
 |  :+++ b/.hgignore
 |  :@@ -0,0 +1,2 @@
 |  :+syntax: glob
 |  :+ignored*
+|  :diff -r d8140c0b7b0b -r 504f74154456 directory/file
+|  :--- /dev/null
+|  :+++ b/directory/file
+|  :@@ -0,0 +1,1 @@
+|  :+File contents
 |  :
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |  :
 |  
 {{{1 hgdef
-@  changeset:   26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  changeset:   26:504f74154456dbb0e9441326514e42ce66279e62
 |  tags:        tip
 |  user:        A <a@example.com>
 |  date:        Пнд Фев 11 05:43:00 2002
-|  files:       .hgignore
+|  files:       .hgignore directory/file
 |  summary:     Added .hgignore
-|  $  .hgignore | 2 0
-|  $1 files changed, 2 insertions, 0 deletions
-|  :diff -r d8140c0b7b0b -r df55ab32bcfa .hgignore
+|  $  .hgignore      | 2 0
+|  $  directory/file | 1 0
+|  $2 files changed, 3 insertions, 0 deletions
+|  :diff -r d8140c0b7b0b -r 504f74154456 .hgignore
 |  :--- /dev/null
 |  :+++ b/.hgignore
 |  :@@ -0,0 +1,2 @@
 |  :+syntax: glob
 |  :+ignored*
+|  :diff -r d8140c0b7b0b -r 504f74154456 directory/file
+|  :--- /dev/null
+|  :+++ b/directory/file
+|  :@@ -0,0 +1,1 @@
+|  :+File contents
 |  :
 |  
 o    changeset:   25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |  :
 |  
 {{{1 hgdescr
-@  changeset:   26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  changeset:   26:504f74154456dbb0e9441326514e42ce66279e62
 |  tags:        tip
 |  user:        A <a@example.com>
 |  date:        Пнд Фев 11 05:43:00 2002
-|  files:       .hgignore
+|  files:       .hgignore directory/file
 |  description:
 |  Added .hgignore
-|  $  .hgignore | 2 0
-|  $1 files changed, 2 insertions, 0 deletions
-|  :diff -r d8140c0b7b0b -r df55ab32bcfa .hgignore
+|  Added directory/file
+|  $  .hgignore      | 2 0
+|  $  directory/file | 1 0
+|  $2 files changed, 3 insertions, 0 deletions
+|  :diff -r d8140c0b7b0b -r 504f74154456 .hgignore
 |  :--- /dev/null
 |  :+++ b/.hgignore
 |  :@@ -0,0 +1,2 @@
 |  :+syntax: glob
 |  :+ignored*
+|  :diff -r d8140c0b7b0b -r 504f74154456 directory/file
+|  :--- /dev/null
+|  :+++ b/directory/file
+|  :@@ -0,0 +1,1 @@
+|  :+File contents
 |  :
 |  
 o    changeset:   25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |  :
 |  
 {{{1 compact
-@  26[tip]   df55ab32bcfa13929c53541c105b2b20972cb51b 2002-02-11 05:43 A <a@example.com>
+@  26[tip]   504f74154456dbb0e9441326514e42ce66279e62 2002-02-11 05:43 A <a@example.com>
 |    Added .hgignore
-|  $   .hgignore | 2 0
-|  $ 1 files changed, 2 insertions, 0 deletions
-|  :diff -r d8140c0b7b0b -r df55ab32bcfa .hgignore
+|  $   .hgignore      | 2 0
+|  $   directory/file | 1 0
+|  $ 2 files changed, 3 insertions, 0 deletions
+|  :diff -r d8140c0b7b0b -r 504f74154456 .hgignore
 |  :--- /dev/null
 |  :+++ b/.hgignore
 |  :@@ -0,0 +1,2 @@
 |  :+syntax: glob
 |  :+ignored*
+|  :diff -r d8140c0b7b0b -r 504f74154456 directory/file
+|  :--- /dev/null
+|  :+++ b/directory/file
+|  :@@ -0,0 +1,1 @@
+|  :+File contents
 |  :
 |  
 o    25   d8140c0b7b0b670bafe0891bcf0c4582092de884 2002-02-11 05:00 C <c@example.gov>
 |  :
 |  
 {{{1 cdescr
-@  26[tip]   df55ab32bcfa13929c53541c105b2b20972cb51b 2002-02-11 05:43 A <a@example.com>
+@  26[tip]   504f74154456dbb0e9441326514e42ce66279e62 2002-02-11 05:43 A <a@example.com>
 |    Added .hgignore
-|  $   .hgignore | 2 0
-|  $ 1 files changed, 2 insertions, 0 deletions
-|  :diff -r d8140c0b7b0b -r df55ab32bcfa .hgignore
+|    Added directory/file
+|  $   .hgignore      | 2 0
+|  $   directory/file | 1 0
+|  $ 2 files changed, 3 insertions, 0 deletions
+|  :diff -r d8140c0b7b0b -r 504f74154456 .hgignore
 |  :--- /dev/null
 |  :+++ b/.hgignore
 |  :@@ -0,0 +1,2 @@
 |  :+syntax: glob
 |  :+ignored*
+|  :diff -r d8140c0b7b0b -r 504f74154456 directory/file
+|  :--- /dev/null
+|  :+++ b/directory/file
+|  :@@ -0,0 +1,1 @@
+|  :+File contents
 |  :
 |  
 o    25   d8140c0b7b0b670bafe0891bcf0c4582092de884 2002-02-11 05:00 C <c@example.gov>

test/log-templates.ok

 o  
 |  
 {{{1 $hex
-@  df55ab32bcfa13929c53541c105b2b20972cb51b
+@  504f74154456dbb0e9441326514e42ce66279e62
 |  
 o    d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   
 {{{1 $children
 @  
 |  
-o    df55ab32bcfa13929c53541c105b2b20972cb51b
+o    504f74154456dbb0e9441326514e42ce66279e62
 |\   
 o |  d8140c0b7b0b670bafe0891bcf0c4582092de884
 | |  
 o  Added «createrepo.zsh»
 |  
 {{{1 $rev: $description-
-@  26: Added .hgignore-
-|  
+@  26: Added .hgignore
+|  26: Added directory/file-
 o    25: Merge-
 |\   
 o |  24: Added elines.lst with eplines
 o  0: Added «createrepo.zsh»-
 |  
 {{{1 $patch
-@  diff -r d8140c0b7b0b -r df55ab32bcfa .hgignore
+@  diff -r d8140c0b7b0b -r 504f74154456 .hgignore
 |  --- /dev/null
 |  +++ b/.hgignore
 |  @@ -0,0 +1,2 @@
 |  +syntax: glob
 |  +ignored*
+|  diff -r d8140c0b7b0b -r 504f74154456 directory/file
+|  --- /dev/null
+|  +++ b/directory/file
+|  @@ -0,0 +1,1 @@
+|  +File contents
 |  
 o    diff -r e021c634413b -r d8140c0b7b0b elines.lst
 |\   --- a/elines.lst
 |  +tar cJf testrepo.tar.xz testrepo
 |  
 {{{1 $rev: $stat
-@  26:   .hgignore | 2 0
-|  26: 1 files changed, 2 insertions, 0 deletions
+@  26:   .hgignore      | 2 0
+|  26:   directory/file | 1 0
+|  26: 2 files changed, 3 insertions, 0 deletions
 o    25:   elines.lst     |   0 19
 |\   25:   emerged.lst    | 127  0
 | |  25:   flines.lst     |   0  5
 o  0:   createrepo.zsh | 94 0
 |  0: 1 files changed, 94 insertions, 0 deletions
 {{{1 $files
-@  .hgignore
+@  .hgignore, directory/file
 |  
 o    emerged.lst, glines.lst, glinescopy.lst
 |\   
 o  createrepo.zsh
 |  
 {{{1 $files#;;#
-@  .hgignore
+@  .hgignore;;directory/file
 |  
 o    emerged.lst;;glines.lst;;glinescopy.lst
 |\   
 o  createrepo.zsh
 |  
 {{{1 $changes
-@  .hgignore
+@  .hgignore, directory/file
 |  
 o    elines.lst, emerged.lst, flines.lst, glines.lst, glinescopy.lst
 |\   
 o  createrepo.zsh
 |  
 {{{1 $changes#;;#
-@  .hgignore
+@  .hgignore;;directory/file
 |  
 o    elines.lst;;emerged.lst;;flines.lst;;glines.lst;;glinescopy.lst
 |\   
 {{{1 -
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |    @ Added dlines.lst
 |    
 {{{1 cmd
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  @ Added «createrepo.zsh»
 |  
 {{{3 02
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 | | |  @ Merge from C
 | | |  
 {{{3 *
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 | | | | |  
 {{{2 hours
 {{{3 5
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  @ Added nohglinesrev.lst
 |  
 {{{2 >date
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 | | | | |  @ Merge from B
 | | | | |  
 {{{2 >=date
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  @ Added «hglines.lst» and «datelines.lst»
 |  
 {{{1 limit
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  :
 |  
 {{{1 repo
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  @ Copied “hglines.lst” to “hglines2.lst”
 |  
 {{{1 search
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 |\ 
 o |  Changeset 24:e021c634413b240b8c834a85200acc28d645f1f1
 |  @ Added «createrepo.zsh»
 |  
 {{{1 showfiles
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
-|  Files: .hgignore
+|  Files: .hgignore, directory/file
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  @ Added «createrepo.zsh»
 |  
 {{{1 showrenames
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 |  @ Added «createrepo.zsh»
 |  
 {{{1 showcopies
-@  Changeset 26:df55ab32bcfa13929c53541c105b2b20972cb51b
+@  Changeset 26:504f74154456dbb0e9441326514e42ce66279e62
 |  Commited 11 Feb 2002 05:43 by A <a@example.com>
 |  Tags: tip
 |  @ Added .hgignore
+|  @ Added directory/file
 |  
 o    Changeset 25:d8140c0b7b0b670bafe0891bcf0c4582092de884
 |\   Commited 11 Feb 2002 05:00 by C <c@example.gov>
 {{{1 <CR>
-aurum://diff:%ETMPDIR%%-test%-logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:
+aurum://diff:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:
 {{{1 branch <CR>
 aurum://log:%ETMPDIR%%-test%-logmapsrepo:branch:A,crrestrict:branch
 {{{1 user <CR>
 {{{1 date <CR>
 aurum://log:%ETMPDIR%%-test%-logmapsrepo:date:2002-02,crrestrict:date
 {{{1 changeset <CR>
-aurum://log:%ETMPDIR%%-test%-logmapsrepo:revision:df55ab32bcfa13929c53541c105b2b20972cb51b,crrestrict:revision
+aurum://log:%ETMPDIR%%-test%-logmapsrepo:revision:504f74154456dbb0e9441326514e42ce66279e62,crrestrict:revision
 {{{1 gF
-aurum://log:%ETMPDIR%%-test%-logmapsrepo:showfiles:1,files:glines.lst,crrestrict:files
+aurum://log:%ETMPDIR%%-test%-logmapsrepo:showfiles:1,files:directory%-file,crrestrict:files
 {{{1 gF+files
 aurum://log:%ETMPDIR%%-test%-logmapsrepo:showfiles:1,files:.hgignore,crrestrict:files
 {{{1 gu
 aurum://file:%ETMPDIR%%-test%-logmapsrepo:dfe39aa48c6ddde158e42217548b531a45ff66e9:crepo.zsh
 w$: 2
 {{{1 o+files
-aurum://file:%ETMPDIR%%-test%-logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
+aurum://file:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
 {{{1 o
-aurum://file:%ETMPDIR%%-test%-logmapsrepo:d8140c0b7b0b670bafe0891bcf0c4582092de884:glines.lst
+aurum://file:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file
 {{{1 cancel o
 aurum://log:%ETMPDIR%%-test%-logmapsrepo:showfiles:1,
 {{{1 a+files
-aurum://file:%ETMPDIR%%-test%-logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
-aurum://annotate:%ETMPDIR%%-test%-logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
+aurum://file:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
+aurum://annotate:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
 w$: 2
 {{{1 a
-aurum://file:%ETMPDIR%%-test%-logmapsrepo:d8140c0b7b0b670bafe0891bcf0c4582092de884:glines.lst
-aurum://annotate:%ETMPDIR%%-test%-logmapsrepo:d8140c0b7b0b670bafe0891bcf0c4582092de884:glines.lst
+aurum://file:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file
+aurum://annotate:%ETMPDIR%%-test%-logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file
 w$: 2
 {{{1 cancel a
 aurum://log:%ETMPDIR%%-test%-logmapsrepo:showfiles:1,

test/parjobssetup.zsh

 #!/bin/zsh
 # Omit errors caused by tempnames clash
-[[ $TESTTYPE[-4,-1] == wine ]] && typeset -x MAXJOBS=1
+(( ISWINE )) && typeset -rix MAXJOBS=1
 C chgrepo.zsh
 C clines.lst
 C datelines.lst
+C directory/file
 C dlines.lst
 C emerged.lst
 C glines.lst
 {{{1 <CR>
 *1: %TMPDIR%/test/statmapsrepo/nohglinesrev.lst
 {{{1 o
-*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 {{{1 gc
-*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:
+*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:
 {{{1 c
-*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b::nohglinesrev.lst
+*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62::nohglinesrev.lst
 {{{1 C
-*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 #2: %TMPDIR%/test/statmapsrepo/nohglinesrev.lst
 d: 1
 {{{1 gd
-*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b
+*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62
 {{{1 d
-*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b::nohglinesrev.lst
+*1: aurum://diff:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62::nohglinesrev.lst
 {{{1 D
-*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+*1: aurum://file:%ETMPDIR%%-test%-statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 #2: %TMPDIR%/test/statmapsrepo/nohglinesrev.lst
 d: 1
 {{{1 i

test/testrepo.tar.xz

Binary file modified.

test/vimdiff-usewin.ok

 vimdiff-usewinrepo/nohglinesrev.lst
 w0: 2; w$: 3
-aurum://file:%ETMPDIR%%-test%-vimdiff-usewinrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+aurum://file:%ETMPDIR%%-test%-vimdiff-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 w0: 1; w$: 3
 vimdiff-usewinrepo/nohglinesrev.lst
 w0: 1; w$: 2
-aurum://file:%ETMPDIR%%-test%-vimdiff-usewinrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+aurum://file:%ETMPDIR%%-test%-vimdiff-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 w0: 2; w$: 2
 vimdiff-usewinrepo/nohglinesrev.lst
 w0: 1; w$: 2
-aurum://file:%ETMPDIR%%-test%-vimdiff-usewinrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+aurum://file:%ETMPDIR%%-test%-vimdiff-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 w0: 2; w$: 2
 {{{1 status
-#1: aurum://file:%ETMPDIR%%-test%-vimdiffrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+#1: aurum://file:%ETMPDIR%%-test%-vimdiffrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 *2: %TMPDIR%/test/vimdiffrepo/nohglinesrev.lst
  3: 
  4: aurum://status:%ETMPDIR%%-test%-vimdiffrepo:
 {{{1 file
-#1: aurum://file:%ETMPDIR%%-test%-testrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+#1: aurum://file:%ETMPDIR%%-test%-testrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 *2: %TMPDIR%/test/testrepo/nohglinesrev.lst
 {{{1 file+rev
 #1: aurum://file:%ETMPDIR%%-test%-testrepo:f44a21859e57e4abc6155da804d08dd5069e798e:chgrepo.zsh

test/wine/annotate-buffers.ok

 {{{1 file
-#1: aurum:\\annotate:%ETMPDIR%%+test%+annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+#1: aurum:\\annotate:%ETMPDIR%%+test%+annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 *2: %TMPDIR%\test\annotate-buffersrepo\chgrepo.zsh
 {{{1 aurum://file
 #1: aurum:\\annotate:%ETMPDIR%%+test%+testrepo:c4110a066208167dae46b08f4e0d8d2b37e842f3:chgrepo.zsh
 *2: aurum:\\file:testrepo:10:chgrepo.zsh
 {{{1 aurum://copy
-#1: aurum:\\annotate:%ETMPDIR%%+test%+testrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+#1: aurum:\\annotate:%ETMPDIR%%+test%+testrepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 *2: aurum:\\copy:testrepo\chgrepo.zsh
 {{{1 aurum://status
-#1: aurum:\\annotate:%ETMPDIR%%+test%+annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
-*2: aurum:\\file:%ETMPDIR%%+test%+annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
+#1: aurum:\\annotate:%ETMPDIR%%+test%+annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
+*2: aurum:\\file:%ETMPDIR%%+test%+annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
  3: 
  4: aurum:\\status:%ETMPDIR%%+test%+annotate-buffersrepo:show:clean
 {{{1 aurum://diff
 *2: aurum:\\file:%ETMPDIR%%+test%+testrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
  3: aurum:\\diff:testrepo::2:crepo.zsh
 {{{1 aurum://commit
-#1: aurum:\\annotate:%ETMPDIR%%+test%+annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
-*2: aurum:\\file:%ETMPDIR%%+test%+annotate-buffersrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+#1: aurum:\\annotate:%ETMPDIR%%+test%+annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*2: aurum:\\file:%ETMPDIR%%+test%+annotate-buffersrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
  3: aurum:\\commit:annotate-buffersrepo::::nohglinesrev.lst
 {{{1 aurum://annotate 1
 #1: aurum:\\annotate:%ETMPDIR%%+test%+testrepo:99ea42d70fbe32af955de907352999b1d94bef5f:createrepo.zsh

test/wine/annotate.ok

Binary file modified.

test/wine/aufilemaps.ok

 aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:dfe39aa48c6ddde158e42217548b531a45ff66e9:crepo.zsh
 aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 1
-aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 =aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 *1: aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 #2: aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 aurum:\\diff:%ETMPDIR%%+test%+aufilemapsrepo::5a6a1bf999fad1f4547eeb887af54f31d11833f2::
 aurum:\\diff:%ETMPDIR%%+test%+aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:dfe39aa48c6ddde158e42217548b531a45ff66e9::
 ::: D
-*1: T:\test\aufilemapsrepo\crepo.zsh
+*1: %TMPDIR%\test\aufilemapsrepo\crepo.zsh
 #2: aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:5a6a1bf999fad1f4547eeb887af54f31d11833f2:crepo.zsh
 ::: C
 #1: aurum:\\file:%ETMPDIR%%+test%+aufilemapsrepo:dfe39aa48c6ddde158e42217548b531a45ff66e9:crepo.zsh

test/wine/diff.ok

 {{{1
-diff -r df55ab32bcfa addeddef
+diff -r 504f74154456 addeddef
 --- /dev/null
 +++ b/addeddef
 @@ -0,0 +1,1 @@
 +Def
-diff -r df55ab32bcfa hglines2.lst
+diff -r 504f74154456 hglines2.lst
 --- a/hglines2.lst
 +++ /dev/null
 @@ -1,41 +0,0 @@
 -    hg commit -A -m 'Added ignored10.lst' \
 -    hg commit -A -m 'Added .hgignore' \
 -    hg rm hglines2.lst
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
 +abc
 w$: 1
 {{{1 cmd
-diff -r df55ab32bcfa addeddef
+diff -r 504f74154456 addeddef
 --- /dev/null
 +++ b/addeddef
 @@ -0,0 +1,1 @@
 +Def
-diff -r df55ab32bcfa hglines2.lst
+diff -r 504f74154456 hglines2.lst
 --- a/hglines2.lst
 +++ /dev/null
 @@ -1,41 +0,0 @@
 -    hg commit -A -m 'Added ignored10.lst' \
 -    hg commit -A -m 'Added .hgignore' \
 -    hg rm hglines2.lst
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
 +9
 +10
 {{{1 rev2
-diff -r df55ab32bcfa addeddef
+diff -r 504f74154456 addeddef
 --- /dev/null
 +++ b/addeddef
 @@ -0,0 +1,1 @@
 +Def
-diff -r df55ab32bcfa hglines2.lst
+diff -r 504f74154456 hglines2.lst
 --- a/hglines2.lst
 +++ /dev/null
 @@ -1,41 +0,0 @@
 -    hg commit -A -m 'Added ignored10.lst' \
 -    hg commit -A -m 'Added .hgignore' \
 -    hg rm hglines2.lst
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
  opertset zx.rat.opertset fJc rat
 +abc
 {{{1 rev1 + rev2
-diff -r df55ab32bcfa -r e85aa09aab16 .hgignore
+diff -r 504f74154456 -r e85aa09aab16 .hgignore
 --- a/.hgignore
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -syntax: glob
 -ignored*
-diff -r df55ab32bcfa -r e85aa09aab16 .hgtags
+diff -r 504f74154456 -r e85aa09aab16 .hgtags
 --- a/.hgtags
 +++ b/.hgtags
 @@ -1,2 +1,1 @@
  c06107b7bcbe751d2dd40faf4179ee7d6aac44ac ablines
 -023aa55bd8062179ce36adbdd78363e9b88718c1 oldtag
-diff -r df55ab32bcfa -r e85aa09aab16 emerged.lst
+diff -r 504f74154456 -r e85aa09aab16 directory/file
+--- a/directory/file
++++ /dev/null
+@@ -1,1 +0,0 @@
+-File contents
+diff -r 504f74154456 -r e85aa09aab16 emerged.lst
 --- a/emerged.lst
 +++ /dev/null
 @@ -1,127 +0,0 @@
 -    echo 'Abc' > ignoredabc
 ->>>>>>> other
 -tar cJf testrepo.tar.xz testrepo
-diff -r df55ab32bcfa -r e85aa09aab16 glines.lst
+diff -r 504f74154456 -r e85aa09aab16 glines.lst
 --- a/glines.lst
 +++ /dev/null
 @@ -1,83 +0,0 @@
 -    cat hglines.lst | rev > hglinesrev.lst
 -    echo 'Abc' > ignoredabc
 ->>>>>>> other
-diff -r df55ab32bcfa -r e85aa09aab16 glinescopy.lst
+diff -r 504f74154456 -r e85aa09aab16 glinescopy.lst
 --- a/glinescopy.lst
 +++ /dev/null
 @@ -1,83 +0,0 @@
 -    echo 'Abc' > ignoredabc
 ->>>>>>> other
 {{{1 rev1 + rev2 + reverse
-diff -r e85aa09aab16 -r df55ab32bcfa .hgignore
+diff -r e85aa09aab16 -r 504f74154456 .hgignore
 --- /dev/null
 +++ b/.hgignore
 @@ -0,0 +1,2 @@
 +syntax: glob
 +ignored*
-diff -r e85aa09aab16 -r df55ab32bcfa .hgtags
+diff -r e85aa09aab16 -r 504f74154456 .hgtags
 --- a/.hgtags
 +++ b/.hgtags
 @@ -1,1 +1,2 @@
  c06107b7bcbe751d2dd40faf4179ee7d6aac44ac ablines
 +023aa55bd8062179ce36adbdd78363e9b88718c1 oldtag
-diff -r e85aa09aab16 -r df55ab32bcfa emerged.lst
+diff -r e85aa09aab16 -r 504f74154456 directory/file
+--- /dev/null
++++ b/directory/file
+@@ -0,0 +1,1 @@
++File contents
+diff -r e85aa09aab16 -r 504f74154456 emerged.lst
 --- /dev/null
 +++ b/emerged.lst
 @@ -0,0 +1,127 @@
 +    echo 'Abc' > ignoredabc
 +>>>>>>> other
 +tar cJf testrepo.tar.xz testrepo
-diff -r e85aa09aab16 -r df55ab32bcfa glines.lst
+diff -r e85aa09aab16 -r 504f74154456 glines.lst
 --- /dev/null
 +++ b/glines.lst
 @@ -0,0 +1,83 @@
 +    cat hglines.lst | rev > hglinesrev.lst
 +    echo 'Abc' > ignoredabc
 +>>>>>>> other
-diff -r e85aa09aab16 -r df55ab32bcfa glinescopy.lst
+diff -r e85aa09aab16 -r 504f74154456 glinescopy.lst
 --- /dev/null
 +++ b/glinescopy.lst
 @@ -0,0 +1,83 @@
 +}
  tar cJf testrepo.tar.xz testrepo
 {{{1 file
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@
  opertset zx.rat.opertset fJc rat
 +abc
 {{{1 file :
-diff -r df55ab32bcfa nohglinesrev.lst
+diff -r 504f74154456 nohglinesrev.lst
 --- a/nohglinesrev.lst
 +++ b/nohglinesrev.lst
 @@ -51,3 +51,4 @@

test/wine/file.ok

-aurum:\\file:%ETMPDIR%%+test%+filerepo:df55ab32bcfa13929c53541c105b2b20972cb51b:chgrepo.zsh
+aurum:\\file:%ETMPDIR%%+test%+filerepo:504f74154456dbb0e9441326514e42ce66279e62:chgrepo.zsh
 aurum:\\file:%ETMPDIR%%+test%+filerepo:a16a47a8d7aafc115651bfee6f1202093765365d:chgrepo.zsh
 aurum:\\file:%ETMPDIR%%+test%+testrepo:d760b0fe4fe45adf585f5030181b8081899e26a9:dlines.lst
 aurum:\\file:%ETMPDIR%%+test%+testrepo:d760b0fe4fe45adf585f5030181b8081899e26a9:dlines.lst

test/wine/logmaps.ok

 {{{1 <CR>
-aurum:\\diff:%ETMPDIR%%+test%+logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:
+aurum:\\diff:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:
 {{{1 branch <CR>
 aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:branch:A,crrestrict:branch
 {{{1 user <CR>
 {{{1 date <CR>
 aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:date:2002-02,crrestrict:date
 {{{1 changeset <CR>
-aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:revision:df55ab32bcfa13929c53541c105b2b20972cb51b,crrestrict:revision
+aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:revision:504f74154456dbb0e9441326514e42ce66279e62,crrestrict:revision
 {{{1 gF
-aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:showfiles:1,files:glines.lst,crrestrict:files
+aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:showfiles:1,files:directory%-file,crrestrict:files
 {{{1 gF+files
 aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:showfiles:1,files:.hgignore,crrestrict:files
 {{{1 gu
 aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:dfe39aa48c6ddde158e42217548b531a45ff66e9:crepo.zsh
 w$: 2
 {{{1 o+files
-aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
+aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
 {{{1 o
-aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:d8140c0b7b0b670bafe0891bcf0c4582092de884:glines.lst
+aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file
 {{{1 cancel o
 aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:showfiles:1,
 {{{1 a+files
-aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
-aurum:\\annotate:%ETMPDIR%%+test%+logmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:.hgignore
+aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
+aurum:\\annotate:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:.hgignore
 w$: 2
 {{{1 a
-aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:d8140c0b7b0b670bafe0891bcf0c4582092de884:glines.lst
-aurum:\\annotate:%ETMPDIR%%+test%+logmapsrepo:d8140c0b7b0b670bafe0891bcf0c4582092de884:glines.lst
+aurum:\\file:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file
+aurum:\\annotate:%ETMPDIR%%+test%+logmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:directory%-file
 w$: 2
 {{{1 cancel a
 aurum:\\log:%ETMPDIR%%+test%+logmapsrepo:showfiles:1,

test/wine/statmaps.ok

 {{{1 <CR>
 *1: %TMPDIR%\test\statmapsrepo\nohglinesrev.lst
 {{{1 o
-*1: aurum:\\file:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+*1: aurum:\\file:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 {{{1 gc
-*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:
+*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:
 {{{1 c
-*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b::nohglinesrev.lst
+*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62::nohglinesrev.lst
 {{{1 C
-*1: aurum:\\file:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+*1: aurum:\\file:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 #2: %TMPDIR%\test\statmapsrepo\nohglinesrev.lst
 d: 1
 {{{1 gd
-*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b
+*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62
 {{{1 d
-*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b::nohglinesrev.lst
+*1: aurum:\\diff:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62::nohglinesrev.lst
 {{{1 D
-*1: aurum:\\file:%ETMPDIR%%+test%+statmapsrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+*1: aurum:\\file:%ETMPDIR%%+test%+statmapsrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 #2: %TMPDIR%\test\statmapsrepo\nohglinesrev.lst
 d: 1
 {{{1 i

test/wine/vimdiff-usewin.ok

 vimdiff-usewinrepo\nohglinesrev.lst
 w0: 2; w$: 3
-aurum:\\file:%ETMPDIR%%+test%+vimdiff-usewinrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+aurum:\\file:%ETMPDIR%%+test%+vimdiff-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 w0: 1; w$: 3
 vimdiff-usewinrepo\nohglinesrev.lst
 w0: 1; w$: 2
-aurum:\\file:%ETMPDIR%%+test%+vimdiff-usewinrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+aurum:\\file:%ETMPDIR%%+test%+vimdiff-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 w0: 2; w$: 2
 vimdiff-usewinrepo\nohglinesrev.lst
 w0: 1; w$: 2
-aurum:\\file:%ETMPDIR%%+test%+vimdiff-usewinrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
+aurum:\\file:%ETMPDIR%%+test%+vimdiff-usewinrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
 w0: 2; w$: 2

test/wine/vimdiff.ok

 {{{1 status
-#1: aurum:\\file:%ETMPDIR%%+test%+vimdiffrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
-*2: T:\test\vimdiffrepo\nohglinesrev.lst
+#1: aurum:\\file:%ETMPDIR%%+test%+vimdiffrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*2: %TMPDIR%\test\vimdiffrepo\nohglinesrev.lst
  3: 
  4: aurum:\\status:%ETMPDIR%%+test%+vimdiffrepo:
 {{{1 file
-#1: aurum:\\file:%ETMPDIR%%+test%+testrepo:df55ab32bcfa13929c53541c105b2b20972cb51b:nohglinesrev.lst
-*2: T:\test\testrepo\nohglinesrev.lst
+#1: aurum:\\file:%ETMPDIR%%+test%+testrepo:504f74154456dbb0e9441326514e42ce66279e62:nohglinesrev.lst
+*2: %TMPDIR%\test\testrepo\nohglinesrev.lst
 {{{1 file+rev
 #1: aurum:\\file:%ETMPDIR%%+test%+testrepo:f44a21859e57e4abc6155da804d08dd5069e798e:chgrepo.zsh
-*2: T:\test\testrepo\chgrepo.zsh
+*2: %TMPDIR%\test\testrepo\chgrepo.zsh
 {{{1 file+rev+rev
 #1: aurum:\\file:%ETMPDIR%%+test%+testrepo:462a1e95be86f96aaf6d7360f6f770826c3eb641:chgrepo.zsh
 *2: aurum:\\file:%ETMPDIR%%+test%+testrepo:f44a21859e57e4abc6155da804d08dd5069e798e:chgrepo.zsh
 {{{1 file+rev+rev+curfile
 #1: aurum:\\file:%ETMPDIR%%+test%+testrepo:462a1e95be86f96aaf6d7360f6f770826c3eb641:chgrepo.zsh
  2: aurum:\\file:%ETMPDIR%%+test%+testrepo:f44a21859e57e4abc6155da804d08dd5069e798e:chgrepo.zsh
-*3: T:\test\testrepo\chgrepo.zsh
+*3: %TMPDIR%\test\testrepo\chgrepo.zsh