Commits

ZyX_I committed 8f1d305

tests: Fixed diff drivers-bazaar test subtests

Comments (0)

Files changed (3)

aurum-addon-info.txt

         "autoload/aurum/cmdutils.vim",
         "autoload/aurum/commit.vim",
         "autoload/aurum/diff.vim",
+        "autoload/aurum/drivers/bazaar.vim",
         "autoload/aurum/drivers/common/hypsites.vim",
         "autoload/aurum/drivers/common/utils.vim",
         "autoload/aurum/drivers/common/xml.vim",
         "syntax/aurumstatus.vim",
         "test/addEmessages.vim",
         "test/addmessages.vim",
+        "test/bzrtestrepo.tar.xz",
         "test/cmd+maps-commit.in",
         "test/cmd+maps-commit.ok",
         "test/cmd+maps-vimdiff.in",
         "test/cmdaus.ok",
         "test/copyout-postproc.zsh",
         "test/cptowine.zsh",
+        "test/createbzrrepo.zsh",
         "test/creategitrepo.zsh",
         "test/createhgrepo.zsh",
         "test/createsvnrepo.zsh",
+        "test/drivers-bazaar.in",
+        "test/drivers-bazaar.ok",
+        "test/drivers-bazaar.pre",
+        "test/drivers-bazaar.vim",
         "test/drivers-git-first-two.tar.xz",
         "test/drivers-git.in",
         "test/drivers-git.ok",

test/drivers-bazaar.ok

Binary file modified.

test/drivers-bazaar.vim

 call Brepo.functions.ignore(Brepo, 'I-')
 call Brepo.functions.ignoreglob(Brepo, 'Ign*')
 call FormatStatus(Brepo.functions.status(Brepo, 0, 0, 0, 1, 1), Brepo.path)
+function PurgeDiffPlusDates(lines)
+    return map(a:lines, 'v:val[:3] is# "+++ " ? '.
+                \           'substitute(v:val, "\t[^\t]\\+$", "", "") : '.
+                \           'v:val')
+endfunction
 let r+=[' >> File bzrlines.lst']
 let r+=['  > File (2)']
 let r+=map(Brepo.functions.readfile(Brepo, '2', 'bzrlines.lst'), '"   ".v:val')
 let r+=['  > Annotation (-1)']
 let r+=map(Brepo.functions.annotate(Brepo, '-1', 'bzrlines.lst'), '"   ".string(v:val)')
 let r+=[' >> Diff (default)']
-let r+=Brepo.functions.diff(Brepo, 0,   0,   0,                {})
+let r+=PurgeDiffPlusDates(Brepo.functions.diff(Brepo, 0,   0,   0,                {}))
 let r+=[' >> Diff (first revision)']
-let r+=Brepo.functions.diff(Brepo, '1', 0,   0,                {})
+let r+=PurgeDiffPlusDates(Brepo.functions.diff(Brepo, '1', 0,   0,                {}))
 let r+=[' >> Diff (second revision)']
-let r+=Brepo.functions.diff(Brepo, 0,   '1', 0,                {})
+let r+=PurgeDiffPlusDates(Brepo.functions.diff(Brepo, 0,   '1', 0,                {}))
 let r+=[' >> Diff (both revisions)']
-let r+=Brepo.functions.diff(Brepo, '6', '1', 0,                {})
+let r+=PurgeDiffPlusDates(Brepo.functions.diff(Brepo, '6', '1', 0,                {}))
 let r+=[' >> Diff (with file)']
-let r+=Brepo.functions.diff(Brepo, '1', '6', ['bzrlines.lst'], {})
+let r+=PurgeDiffPlusDates(Brepo.functions.diff(Brepo, '1', '6', ['bzrlines.lst'], {}))
 
 call WriteFile(r)
 source addEmessages.vim