On Wed, 9 Apr 2014 23:43:32 +0200 Johan Tibell <johan.tib...@gmail.com> wrote:
> Could you try to `git bisect` it down to the failing commit?
Sure [CCed Daniel]
commit 73dd1c261a62a546774bb732026ddcfc1245bd8b
Author: Daniel Trstenjak <daniel.trsten...@gmail.com>
Date: Sat Mar 1 15:45:59 2014 +0100
More diff friendly pretty printing of cabal files
Now the 'fieldGet' function of 'FieldDescr' does the
whole pretty printing of the field. Previously only the
values have been pretty printed by 'fieldGet' and the
name of the field with the colon have been printed
in the 'PrettyPrint' module.
But this separation made it more difficult to handle the
pretty printing of fields differently, because some fields
should be just printed in one lines and others - having several
values - should be printed nested with each value on a new line.
This difference in the printing of the fields is now handled by
the 'FieldDescr' constructor functions in 'ParseUtils'.
Now the 'listField' and 'commaListField' functions create 'FieldDescr'
that nest their values and all other functions create one line
for the whole field.
How it's done:
~/dev/git/cabal $ cat bisector.sh
#!/bin/bash
cd cabal-install
r=`runhaskell -hide-all-packages
-package={base,directory,pretty,array,unix,filepath,bytestring,process,deepseq,containers,time}
-i../Cabal/ Setup.hs configure 2>&1`
[[ $r == *"Parse of field"* ]] && exit 1
echo "all 'ok': $r"
exit 0
~/dev/git/cabal $ git bisect start master Cabal-v1.18.1.3
Bisecting: a merge base must be tested
[e2ad772a072c0a7c0c248f3fdc38c4cef276275c] Fix a build error when Clang is
used as a preprocessor.
~/dev/git/cabal $ git bisect run ./bisector.sh
running ./bisector.sh
all 'ok': Configuring cabal-install-1.18.0.1...
Bisecting: 179 revisions left to test after this (roughly 8 steps)
[cceb52d55223856f6b6843f5f47ba1d49c57f0ec] Merge pull request #1618 from
nh2/refactor-jobs-parser
running ./bisector.sh
all 'ok': Configuring cabal-install-1.19.2...
Setup.hs: At least the following dependencies are missing:
Cabal ==1.19.2
Bisecting: 89 revisions left to test after this (roughly 7 steps)
[36e932a2808a44431ab596583ac4763dff581597] check linker, other script fixups
running ./bisector.sh
all 'ok': Configuring cabal-install-1.19.2...
Setup.hs: At least the following dependencies are missing:
Cabal ==1.19.2
Bisecting: 44 revisions left to test after this (roughly 6 steps)
[a573d4ba73b403b85ae6e80364841fbbf011f545] .travis.yml: recache the user
package DB after installing GHC.
running ./bisector.sh
all 'ok': Configuring cabal-install-1.19.2...
Setup.hs: At least the following dependencies are missing:
Cabal ==1.19.2
Bisecting: 21 revisions left to test after this (roughly 5 steps)
[c2cb3795e4e664aedb2ad3ad78b992748570bb24] Merge pull request #1748 from
ianbollinger/fix-#1569
running ./bisector.sh
all 'ok': Configuring cabal-install-1.19.2...
Setup.hs: At least the following dependencies are missing:
Cabal ==1.19.2
Bisecting: 10 revisions left to test after this (roughly 4 steps)
[d9286320cde32cc049a037af64307c9db92bc3bb] Merge pull request #1707 from
23Skidoo/haddock-saved-config
running ./bisector.sh
all 'ok': Configuring cabal-install-1.19.2...
Setup.hs: At least the following dependencies are missing:
Cabal ==1.19.2
Bisecting: 3 revisions left to test after this (roughly 3 steps)
[0038d05a9d5af1daeae2e160da69f946760813e8] Merge branch 'master' of
https://github.com/dan-t/cabal
running ./bisector.sh
Bisecting: 3 revisions left to test after this (roughly 2 steps)
[c13850d1328b308dd2d62b29c4f5df2cecbcb5fd] Merge remote-tracking branch
'cabal/master'
running ./bisector.sh
Bisecting: 0 revisions left to test after this (roughly 1 step)
[77ccb23cd5342dc0715e50353a9f707092b19cd1] Remove module 'PrettyPrintIndent'
and move function 'indentWith' into module 'ParseUtils'
running ./bisector.sh
Bisecting: 0 revisions left to test after this (roughly 0 steps)
[73dd1c261a62a546774bb732026ddcfc1245bd8b] More diff friendly pretty printing
of cabal files
running ./bisector.sh
73dd1c261a62a546774bb732026ddcfc1245bd8b is the first bad commit
commit 73dd1c261a62a546774bb732026ddcfc1245bd8b
Author: Daniel Trstenjak <daniel.trsten...@gmail.com>
Date: Sat Mar 1 15:45:59 2014 +0100
More diff friendly pretty printing of cabal files
Now the 'fieldGet' function of 'FieldDescr' does the
whole pretty printing of the field. Previously only the
values have been pretty printed by 'fieldGet' and the
name of the field with the colon have been printed
in the 'PrettyPrint' module.
But this separation made it more difficult to handle the
pretty printing of fields differently, because some fields
should be just printed in one lines and others - having several
values - should be printed nested with each value on a new line.
This difference in the printing of the fields is now handled by
the 'FieldDescr' constructor functions in 'ParseUtils'.
Now the 'listField' and 'commaListField' functions create 'FieldDescr'
that nest their values and all other functions create one line
for the whole field.
:040000 040000 cde590c0af54a14608dd8c4dc0c0002195445188
a80f1fc7aa134e7c976f21bc50d3bd044e414b72 M Cabal
bisect run success
--
Sergei
signature.asc
Description: PGP signature
_______________________________________________ cabal-devel mailing list cabal-devel@haskell.org http://www.haskell.org/mailman/listinfo/cabal-devel
