This is the promised re-send of this patch which isn't mixed up with
changes undoing previous es for the cmp tests. Sorry about the
confusion, obviously due to not examining the patch before submitting,
which I'm usually conditioned to do.
Thu Dec 20 21:15:50 GMT 2007 Dave Love <[EMAIL PROTECTED]>
* Fix !(...|...) in mv_and_remove_tests.sh.
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
New patches:
[Fix !(...|...) in mv_and_remove_tests.sh.
Dave Love <[EMAIL PROTECTED]>**20071220211550
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
] {
hunk ./tests/mv_and_remove_tests.sh 26
-!($DARCS show files | egrep '^./fee$')
+if $DARCS show files | egrep '^./fee$'; then false; else true; fi
hunk ./tests/mv_and_remove_tests.sh 32
-!($DARCS show files | egrep '^./fi$')
-!($DARCS show files | egrep '^./d/fi$')
+if $DARCS show files | egrep '^./fi$'; then false; else true; fi
+if $DARCS show files | egrep '^./d/fi$'; then false; else true; fi
hunk ./tests/mv_and_remove_tests.sh 37
-!($DARCS show files | egrep '^./fo$')
-!($DARCS show files | egrep '^./d/fo$')
+if $DARCS show files | egrep '^./fo$'; then false; else true; fi
+if $DARCS show files | egrep '^./d/fo$'; then false; else true; fi
hunk ./tests/mv_and_remove_tests.sh 47
-!($DARCS show files | egrep '^./fun$')
+if $DARCS show files | egrep '^./fun$'; then false; else true; fi
}
Context:
[use --ignore-times in all tests.
David Roundy <[EMAIL PROTECTED]>**20071217225159
This is because the hashed repository is a bit pickier, in that
it no longer checks file lengths when the file modification times
match.
]
[enable modification time checking on hashed repositories.
David Roundy <[EMAIL PROTECTED]>**20071217220237]
[resolve silly conflict with myself.
David Roundy <[EMAIL PROTECTED]>**20071217200855]
[clean up SelectChanges (eliminating Bools)
David Roundy <[EMAIL PROTECTED]>**20071217191809]
[make a few more files compile with type witnesses.
David Roundy <[EMAIL PROTECTED]>**20071217183234]
[fix bug in revert (in writing the unrevert file).
David Roundy <[EMAIL PROTECTED]>**20071216215225]
[make a few more files compile with type witnesses.
David Roundy <[EMAIL PROTECTED]>**20071217164815]
[remove tabs.
David Roundy <[EMAIL PROTECTED]>**20071216224617]
[bump version number preemptively to 2.0.0pre3.
David Roundy <[EMAIL PROTECTED]>**20071216222823]
[fix doc bug in show contents.
David Roundy <[EMAIL PROTECTED]>**20071216214002]
[TAG 2.0.0pre2
David Roundy <[EMAIL PROTECTED]>**20071216201647]
[add changelog entries.
David Roundy <[EMAIL PROTECTED]>**20071216193714]
[darcs.lhs: Mutt instructions for viewing patches in Mutt - couldn't find anywhere online, so...
[EMAIL PROTECTED]
[bump version to 2.0.0pre2.
David Roundy <[EMAIL PROTECTED]>**20071216192728]
[always optimize new hashed inventories.
David Roundy <[EMAIL PROTECTED]>**20071215121942]
[clean up hugely expensive conflict unravelling.
David Roundy <[EMAIL PROTECTED]>**20071214203634
So often it seems to be the "easy" code that has the crazy bad performance,
because it's what I write with little thought!
]
[optimize remove_subsequenceFL/RL.
David Roundy <[EMAIL PROTECTED]>**20071214201120]
[fix change that broke readPatch/showPatch property.
David Roundy <[EMAIL PROTECTED]>**20071214195653]
[Pass two args to `cmp' in tests, following POSIX.
Dave Love <[EMAIL PROTECTED]>**20071216180503
Fixes some failures on Solaris.
]
[optimize patch sequence comparison for case when lengths differ.
David Roundy <[EMAIL PROTECTED]>**20071214180958]
[clean up effect of Patch a bit.
David Roundy <[EMAIL PROTECTED]>**20071214155105]
[clean up handling of Identity primitive patch.
David Roundy <[EMAIL PROTECTED]>**20071214154335]
[print Identity in a manner parseable by older darcs.
David Roundy <[EMAIL PROTECTED]>**20071214152754]
[clean up fmap on hopefully.
David Roundy <[EMAIL PROTECTED]>**20071214152736]
[add debug output to optimize.
David Roundy <[EMAIL PROTECTED]>**20071214025853]
[fix Hopefully to delay reading patches until they're really needed.
David Roundy <[EMAIL PROTECTED]>**20071214025703]
[add some debug output.
David Roundy <[EMAIL PROTECTED]>**20071213173459]
[simplify PatchInfo parsing and printing.
David Roundy <[EMAIL PROTECTED]>**20071213173410]
[make darcs more interruptable with hashed repositories.
David Roundy <[EMAIL PROTECTED]>**20071213173207]
[fix erroneous strictness in the PatchInfoAnd data type.
David Roundy <[EMAIL PROTECTED]>**20071213170640
This defeated the purpose of PatchInfoAnd, which was to allow friendly
delayed reading of patch files!
]
[cut get_verbosity, and document --debug flag.
David Roundy <[EMAIL PROTECTED]>**20071213160642]
[separate debug output from verbose output.
David Roundy <[EMAIL PROTECTED]>**20071213160049
This is needed when debugging non-verbose changes, for instance.
]
[simplify Patch.Info a bit.
David Roundy <[EMAIL PROTECTED]>**20071213160021]
[darcs get of darcs-2 repo should work without flags.
David Roundy <[EMAIL PROTECTED]>**20071212180843]
[ghc 6.4 compatibility fixes.
[EMAIL PROTECTED]
[fix incompatibility with ghc 6.4 template haskell behavior.
[EMAIL PROTECTED]
[don't use infix types with GADT syntax.
[EMAIL PROTECTED]
[define handy $- operator for ghc 6.4 2nd-rank polymorphism happiness.
David Roundy <[EMAIL PROTECTED]>**20071211220552]
[share code between commute and commute_no_conflicts
David Roundy <[EMAIL PROTECTED]>**20071211214522]
[add unit test demonstrating bug, and patch fixing same bug.
David Roundy <[EMAIL PROTECTED]>**20071211204504
The toNons function was a bit overly-simplistic, partly because
it predated a change in semantics.
]
[remove inefficient use of isInfixOf.
David Roundy <[EMAIL PROTECTED]>**20071210231845
Also note that isInfixOf wasn't present in ghc 6.4.
]
[A first attempt at lazy reading of hashed repository contents.
David Roundy <[EMAIL PROTECTED]>**20071210214606]
[TAG 2.0.0pre1
David Roundy <[EMAIL PROTECTED]>**20071210193943]
[add test for darcs diff.
David Roundy <[EMAIL PROTECTED]>**20071210163425]
[fix bug manifested in "darcs diff -p ."
David Roundy <[EMAIL PROTECTED]>**20071210161858]
[copy prefs when darcs getting hashed repos.
David Roundy <[EMAIL PROTECTED]>**20071210125931]
[better error message in record when tests fail.
David Roundy <[EMAIL PROTECTED]>**20071210125851]
[simplify test code in record and amend.
David Roundy <[EMAIL PROTECTED]>**20071210124720]
[bump version number to 2.0.0pre1
David Roundy <[EMAIL PROTECTED]>**20071210122409]
[fix doc build for hashed inventory repos.
David Roundy <[EMAIL PROTECTED]>**20071208220350]
[make hard link creation more ubiquitous with hashed repo.
David Roundy <[EMAIL PROTECTED]>**20071208164657]
[clean up pristine.hash files in the cache.
David Roundy <[EMAIL PROTECTED]>**20071208162108]
[when writing, only try to link with local copies of the same file.
David Roundy <[EMAIL PROTECTED]>**20071208155856]
[when writing a hashed file, first check if it's already available.
David Roundy <[EMAIL PROTECTED]>**20071208131548
This change also removes the [DarcsFlag] argument from fetchFilePS and
gzFetchFilePS (which was never actually used), and propogates that
change throughout the code.
]
[enable proper population of a global cache.
David Roundy <[EMAIL PROTECTED]>**20071208124957]
[make get of hashed repo hashed, and make hashed get always lazy.
David Roundy <[EMAIL PROTECTED]>**20071208121440]
[fix bug in darcs whatsnew -s.
David Roundy <[EMAIL PROTECTED]>**20071208115215]
[rename --hashed-inventory to --hashed and --format-2 to --darcs-2
David Roundy <[EMAIL PROTECTED]>**20071208111416]
[fix tabs.
David Roundy <[EMAIL PROTECTED]>**20071208111047]
[don't produce invalid hunk patches in FL Prim arbitrary instance.
David Roundy <[EMAIL PROTECTED]>**20071208104720]
[add --debug flag to give debug output (as well as verbose output).
David Roundy <[EMAIL PROTECTED]>**20071208103832]
[make convert far more efficient.
David Roundy <[EMAIL PROTECTED]>**20071207220500
This (rather large) change also causes the hashed repo format to
always clean up the contents of _darcs/pristine.hashed/, and adds
a new flag NoUpdateWorking, which causes the working directory to
be ignored. There is currently no way to manually use this flag,
but the guts are there, and it shouldn't be hard to add support for
it.
]
[remove debug message.
David Roundy <[EMAIL PROTECTED]>**20071207195543]
[add a little extra verbosity when applying patches.
David Roundy <[EMAIL PROTECTED]>**20071207194307]
[fix backwards-compatibility problem with HashedIO.
David Roundy <[EMAIL PROTECTED]>**20071207194216
We need to make mRename succeed when a file doesn't exist.
]
[fix bug in convert.
David Roundy <[EMAIL PROTECTED]>**20071207194150]
[fix issue where TWFP generator never terminated, because all it got were NilTrees.
David Roundy <[EMAIL PROTECTED]>**20071207183938]
[fix exponential blow-up in prop_consistent_tree_flattenings by pruning trees.
David Roundy <[EMAIL PROTECTED]>**20071207182312]
[beautify non-terminating example.
David Roundy <[EMAIL PROTECTED]>**20071207144413]
[make compile without ChasingBottoms.
David Roundy <[EMAIL PROTECTED]>**20071207131824]
[temp: compact representation
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071128222811]
[temp: loop testing
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071128213035]
[needless micro-optimizations in bracketedFL.
David Roundy <[EMAIL PROTECTED]>**20071207035421]
[restrict all patch parsing to PackedStrings only.
David Roundy <[EMAIL PROTECTED]>**20071207004920]
[we've dropped support for hashed+old in same repo.
David Roundy <[EMAIL PROTECTED]>**20071207002313]
[reenable more unit tests.
David Roundy <[EMAIL PROTECTED]>**20071206223346]
[permutivity is only true of non-duplicate patches.
David Roundy <[EMAIL PROTECTED]>**20071206223219]
[implement new hashed pristine format
David Roundy <[EMAIL PROTECTED]>**20071206214347]
[fix more tests
David Roundy <[EMAIL PROTECTED]>**20071206213311]
[fix unrevert.sh to make no assumption about pristine cache.
David Roundy <[EMAIL PROTECTED]>**20071206144637]
[pull assumption of pristine format from one test.
David Roundy <[EMAIL PROTECTED]>**20071206001455]
[cut redundant call to identifyPristine.
David Roundy <[EMAIL PROTECTED]>**20071205195739]
[cut uses of slurpPristine.
David Roundy <[EMAIL PROTECTED]>**20071205195335]
[prepare for real HashedPristine.
David Roundy <[EMAIL PROTECTED]>**20071205194417]
[define functions for nice convesion of FileName to PackedString and back.
David Roundy <[EMAIL PROTECTED]>**20071205194023]
[refactor: move absolute_dir into Darcs.FilePathUtils
David Roundy <[EMAIL PROTECTED]>**20071205122247]
[always report line number on bugs.
David Roundy <[EMAIL PROTECTED]>**20071205120252]
[define new convert command to convert to darcs-2 format.
David Roundy <[EMAIL PROTECTED]>**20071205102951]
[clean up printing of error messages in pull.
David Roundy <[EMAIL PROTECTED]>**20071204222317]
[fix bug in commutation of inverse duplicate patches.
David Roundy <[EMAIL PROTECTED]>**20071204205211]
[ensure that duplicate patches are "forward" in a repository.
David Roundy <[EMAIL PROTECTED]>**20071204205153]
[duplicate patches don't pass the partial permutivity test.
David Roundy <[EMAIL PROTECTED]>**20071204205035
Note that this is a feature, not a bug!
]
[be more thorough in checking partial permutivity.
David Roundy <[EMAIL PROTECTED]>**20071204204957]
[give more verbose output in property.
David Roundy <[EMAIL PROTECTED]>**20071204204942]
[add a failing test case
David Roundy <[EMAIL PROTECTED]>**20071204192729]
[refactor: move sync_repo out of DarcsRepo.
David Roundy <[EMAIL PROTECTED]>**20071204185609]
[fix pending handling.
David Roundy <[EMAIL PROTECTED]>**20071204162755]
[remove optimization for record --all.
David Roundy <[EMAIL PROTECTED]>**20071204160939
This optimization interacts poorly with the new pending handling, leading
to bad situations where whatsnew reports nothing, but darcs record --all
records a file add and rm.
]
[improve formatting of patch in user interface.
David Roundy <[EMAIL PROTECTED]>**20071204155236]
[refactor pending handling out of DarcsRepo.
David Roundy <[EMAIL PROTECTED]>**20071203230404]
[avoid creating inverse conflicts with rollback.
David Roundy <[EMAIL PROTECTED]>**20071203213830]
[print proper summary of darcs-2 patches.
David Roundy <[EMAIL PROTECTED]>**20071203213150]
[give more verbose error output in one example of permutivity test.
David Roundy <[EMAIL PROTECTED]>**20071203202033]
[fix bug triggered by permutivity example just added.
David Roundy <[EMAIL PROTECTED]>**20071203201936]
[add failing permutivity example.
David Roundy <[EMAIL PROTECTED]>**20071203195451]
[fix bugs in non-QuickCheck tests once again.
David Roundy <[EMAIL PROTECTED]>**20071203194827]
[add a couple more patch pairs.
David Roundy <[EMAIL PROTECTED]>**20071203193516]
[add merge scenario that triggers a failure to the static tests.
David Roundy <[EMAIL PROTECTED]>**20071203191225]
[various fixes. All bug quickcheck tests now pass.
David Roundy <[EMAIL PROTECTED]>**20071203190755
quickcheck tests, however, dramatically fail.
]
[fix bug where we included p2 twice as conflicts with p1.
David Roundy <[EMAIL PROTECTED]>**20071203170532]
[fix bug where we added accidental conflict of patch with itself.
David Roundy <[EMAIL PROTECTED]>**20071203165952]
[cut debug code and obsoleted pattern match.
David Roundy <[EMAIL PROTECTED]>**20071202110909]
[implement various fixes, and commute I figured out with Steve.
David Roundy <[EMAIL PROTECTED]>**20071202110239]
[define (potentially dangerous?) remAddP/s.
David Roundy <[EMAIL PROTECTED]>**20071202105523]
[define cleaner headPermutationsFL.
David Roundy <[EMAIL PROTECTED]>**20071201163953]
[fix bugs in commute of resolution patch.
David Roundy <[EMAIL PROTECTED]>**20071130214738]
[hokey attempt at handling better the context of the "xx" part of conflictors.
David Roundy <[EMAIL PROTECTED]>**20071130204724]
[disable a few unit tests that give overly-verbose errors.
David Roundy <[EMAIL PROTECTED]>**20071130183314]
[change code to recognize "xx" part of conflictor may depend on "ix" part.
David Roundy <[EMAIL PROTECTED]>**20071130181849]
[fix bug in parsing of (invalid) hunk patches generated by QuickCheck.
David Roundy <[EMAIL PROTECTED]>**20071130160607]
[cut Context classes
David Roundy <[EMAIL PROTECTED]>**20071130155705]
[define Duplicate more simply
David Roundy <[EMAIL PROTECTED]>**20071130155402]
[use Non RealPatch instead of Non Prim.
David Roundy <[EMAIL PROTECTED]>**20071130145351]
[avoid some more uses of NonPatch.
David Roundy <[EMAIL PROTECTED]>**20071129215311]
[make NonPatch parametrized by context type.
David Roundy <[EMAIL PROTECTED]>**20071129212644]
[indicate we can compile ApplyPatches with type witnesses.
David Roundy <[EMAIL PROTECTED]>**20071129210851]
[give better parse error messages if hunk is truncated.
David Roundy <[EMAIL PROTECTED]>**20071129203547]
[fix bug in parsing of patches with context.
David Roundy <[EMAIL PROTECTED]>**20071129201249]
[add failing test cases.
David Roundy <[EMAIL PROTECTED]>**20071129151730]
[fix infelicity in RealPatch unravelling.
David Roundy <[EMAIL PROTECTED]>**20071129134535]
[avoid '!' in comments, seems to confuse shell sometimes.
David Roundy <[EMAIL PROTECTED]>**20071129134506]
[add commented-out tracing code.
David Roundy <[EMAIL PROTECTED]>**20071129124729]
[fix up new conflict-resolution code.
David Roundy <[EMAIL PROTECTED]>**20071129124656]
[make commute_no_conflicts have default method.
David Roundy <[EMAIL PROTECTED]>**20071129124441]
[remove use of unsafeCoerce#.
David Roundy <[EMAIL PROTECTED]>**20071129124403]
[enable marking of conflicts in RealPatches.
David Roundy <[EMAIL PROTECTED]>**20071129002532]
[add type signature in Patchy.
David Roundy <[EMAIL PROTECTED]>**20071129000240]
[fix bugs in parser.
David Roundy <[EMAIL PROTECTED]>**20071128230643]
[normalize filenames in QuickCheck.
David Roundy <[EMAIL PROTECTED]>**20071128213214
Note: this is only an issue because we bypass the "safe"
functions that construct patches.
]
[fix bug in test suite where we failed to --ignore-times.
David Roundy <[EMAIL PROTECTED]>**20071128181045
This doesn't have any ill effect that i've observed, but I'm
fixing it so that we'll do what it *looks* like we're doing.
]
[avoid lazily reading patch files.
David Roundy <[EMAIL PROTECTED]>**20071128180542
Note that we're still lazy about opening the patch files, we just
parse them strictly once they're open.
]
[fix bug where parsing of setpref patch called tailPS unnecessarily.
David Roundy <[EMAIL PROTECTED]>**20071128180441]
[fix bugs in format-2
David Roundy <[EMAIL PROTECTED]>**20071128150938]
[actually generate format-2 repositories.
David Roundy <[EMAIL PROTECTED]>**20071127152917]
[fix bug in RealPatch parsing.
David Roundy <[EMAIL PROTECTED]>**20071127152720]
[enable actual use of RealPatch for darcs-2 repositories.
David Roundy <[EMAIL PROTECTED]>**20071127132923]
[fix build of unit.lhs
David Roundy <[EMAIL PROTECTED]>**20071126225113]
[eliminate use of identifyRepository outside Repository.Internal.
David Roundy <[EMAIL PROTECTED]>**20071126204844]
[define commute_no_conflicts for RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071126124023]
[move uses of identifyRepository to polymorphic constructs.
David Roundy <[EMAIL PROTECTED]>**20071125123402]
[make Repository polymorphic.
David Roundy <[EMAIL PROTECTED]>**20071124201502]
[fix tabs in QuickCheck (Bad Heffalump!)
David Roundy <[EMAIL PROTECTED]>**20071124182851]
[include in makefile listing of modules that compile with type witnesses on.
David Roundy <[EMAIL PROTECTED]>**20071124180305]
[clean up Resolution.
David Roundy <[EMAIL PROTECTED]>**20071124154307]
[make PatchSet polymorphic.
David Roundy <[EMAIL PROTECTED]>**20071124011735]
[make NamedPatch and PatchInfoAndPatch polymorphic.
David Roundy <[EMAIL PROTECTED]>**20071123230721]
[fix performance regression in readPatchInfo.
David Roundy <[EMAIL PROTECTED]>**20071122132126]
[move flatten_to_primitivesFL into Effect class.
David Roundy <[EMAIL PROTECTED]>**20071123200436]
[avoid running unit test in test suite, as it requires QC2.
David Roundy <[EMAIL PROTECTED]>**20071123200243]
[add yet more tests.
David Roundy <[EMAIL PROTECTED]>**20071121232220]
[add drivers to restrict tests to nontrivial patch pairs.
David Roundy <[EMAIL PROTECTED]>**20071121224100
This should give us better coverage...
]
[fix error in old test code with QuickCheck 2.
David Roundy <[EMAIL PROTECTED]>**20071121220946
The arbitrary instance of qc 2 generates Chars that aren't
in the 0..255 range (and thus couldn't have come from our
parsers or diff code in the first place).
]
[fix a bug, add corresponding test cases, and various commented debug code.
David Roundy <[EMAIL PROTECTED]>**20071121214347]
[cut obsoleted Conflictor module.
David Roundy <[EMAIL PROTECTED]>**20071121195356]
[finish (?) implementation of RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071121184801
RealPatch now passes all tests!
]
[move NonPatch into its own module.
David Roundy <[EMAIL PROTECTED]>**20071119163811]
[make NonPatches keep track of patch+inverse.
David Roundy <[EMAIL PROTECTED]>**20071116165849
This is a large change incorporating a few cleanups
and tests.
]
[reveal and fix some more commute bugs.
David Roundy <[EMAIL PROTECTED]>**20071116143732]
[add commented-out debug code to commute.
David Roundy <[EMAIL PROTECTED]>**20071115224157]
[fix bug in commute of effect-less conflictors.
David Roundy <[EMAIL PROTECTED]>**20071115224129]
[fix QuickCheck code to be friendly to new RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071115224113
Note also that this adds some commented-out debug code.
]
[fix my code to work with Ganesh's latest quickcheck version.
David Roundy <[EMAIL PROTECTED]>**20071115214155]
[fixup Show instances
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071106211048]
[comment out hopefully unused instance
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071106200301]
[parameterise various things over ConflictorPatch/RealPatch (and any other FromPrim types)
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071106200154]
[FromPrim class
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071106200053]
[GADT compilation fixes for QuickCheck
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071106190332]
[fix Show RealPatch instance for type witnesses
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071106190315]
[give better error messages in Properties.
David Roundy <[EMAIL PROTECTED]>**20071115212628]
[retrench: simplified conflict handling with less appealing semantics.
David Roundy <[EMAIL PROTECTED]>**20071115212543]
[add test for consistency of merge outputs.
David Roundy <[EMAIL PROTECTED]>**20071114205046]
[fix bug in merge.
David Roundy <[EMAIL PROTECTED]>**20071114201518]
[add test that merge test cases are consistent.
David Roundy <[EMAIL PROTECTED]>**20071114194558]
[make one merge work with merge_commute.
David Roundy <[EMAIL PROTECTED]>**20071114191905]
[bad code in Conflictor (but it compiles).
David Roundy <[EMAIL PROTECTED]>**20071114191011]
[preliminary version of new RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071113204828]
[define more useful Non operations.
David Roundy <[EMAIL PROTECTED]>**20071109182517]
[failing test.
David Roundy <[EMAIL PROTECTED]>**20071108215211]
[define more passing tests.
David Roundy <[EMAIL PROTECTED]>**20071108212222]
[fix show instance of :>
David Roundy <[EMAIL PROTECTED]>**20071108210809]
[another test on RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071108153759]
[add some tests of RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071108153549]
[eliminate need for defining unsafeCompare.
David Roundy <[EMAIL PROTECTED]>**20071108153323
I also move unsafeCoerceP into Patch.Ordering.
]
[define prim2real.
David Roundy <[EMAIL PROTECTED]>**20071107214439]
[export RealPatch.
David Roundy <[EMAIL PROTECTED]>**20071107211738]
[fix build of Choices.
David Roundy <[EMAIL PROTECTED]>**20071107164104]
[untested new framework for "real" patches.
David Roundy <[EMAIL PROTECTED]>**20071107162958
The idea here is to keep track of patch/inverse pairs that
we've been merged with (if we conflict with them) so we can
undo those merges.
]
[make equality check between patch sequences check all possible permutations.
David Roundy <[EMAIL PROTECTED]>**20071107013321]
[give better error message on failure.
David Roundy <[EMAIL PROTECTED]>**20071106232916]
[fix bug in prop_read_show.
David Roundy <[EMAIL PROTECTED]>**20071106232344]
[cut the always_succeeds test, which shouldn't pass.
David Roundy <[EMAIL PROTECTED]>**20071106231457]
[move patch_and_inverse_commute, and update it for new theory.
David Roundy <[EMAIL PROTECTED]>**20071106230840]
[reorder early quitting to indicate tests that still pass.
David Roundy <[EMAIL PROTECTED]>**20071106225817]
[fix up more tests and switch to commute_conflicting_conflictors.
David Roundy <[EMAIL PROTECTED]>**20071106225514]
[more moving towards merge as a first-class citizen.
David Roundy <[EMAIL PROTECTED]>**20071106224059]
[make prop_is_mergeable stricter.
David Roundy <[EMAIL PROTECTED]>**20071106221353]
[move conflictors to *not* always commute.
David Roundy <[EMAIL PROTECTED]>**20071106215440]
[fix build of docs.
David Roundy <[EMAIL PROTECTED]>**20071106212126]
[start a new paper on patch theory.
David Roundy <[EMAIL PROTECTED]>**20071106211412]
[add new test--that may no necesarily be true.
David Roundy <[EMAIL PROTECTED]>**20071105165907]
[remove redundant class constraints.
David Roundy <[EMAIL PROTECTED]>**20071105165245]
[define identity, and use it to create a couple of tests.
David Roundy <[EMAIL PROTECTED]>**20071105165001]
[add property for join (previously known as coalesce).
David Roundy <[EMAIL PROTECTED]>**20071105152539]
[move commute_inverses to Properties.
David Roundy <[EMAIL PROTECTED]>**20071105151420]
[checkpoint not-working code (before major modifications).
David Roundy <[EMAIL PROTECTED]>**20071105151058]
[add new Properties module for actual patch properties.
David Roundy <[EMAIL PROTECTED]>**20071031155814
The motivation for this is to have a simpler, smaller module that can be
easily checked using type witnesses.
]
[a stab at a more elegant commute.
David Roundy <[EMAIL PROTECTED]>**20071029203054]
[fix bug in filter_conflicting1.
David Roundy <[EMAIL PROTECTED]>**20071029180813]
[decrease precedence of =\/= and =/\=.
David Roundy <[EMAIL PROTECTED]>**20071026151319]
[implement testing (fails) of reducing and inflation of conflictors.
David Roundy <[EMAIL PROTECTED]>**20071025200415]
[add Arbitrary instance for Sealed2 ConflictorPatch.
David Roundy <[EMAIL PROTECTED]>**20071025193929]
[first (incomplete) cut at new more elegant approach to conflictors.
David Roundy <[EMAIL PROTECTED]>**20071025192614]
[don't test quite so thoroughly.
David Roundy <[EMAIL PROTECTED]>**20071025192556]
[define FlippedSeal.
David Roundy <[EMAIL PROTECTED]>**20071025192543]
[fix bugs in conflictor commute.
David Roundy <[EMAIL PROTECTED]>**20071025192453]
[define handy effect function, for computing effect of a conflictorpatch.
David Roundy <[EMAIL PROTECTED]>**20071025192426]
[enable testing of commute_conflicting_conflictors on its own.
David Roundy <[EMAIL PROTECTED]>**20071025192333]
[fix Eq ShyPatch instance.
David Roundy <[EMAIL PROTECTED]>**20071025192306]
[clean up testing a bit.
David Roundy <[EMAIL PROTECTED]>**20071025160256
There's one more important change in here (to Heffalump, anyhow),
which is that I changed the quickcheck generator.
]
[add new handy utility functions to ConflictedSet.
David Roundy <[EMAIL PROTECTED]>**20071025143535]
[add Eq instance for ShyPatch C(x x).
David Roundy <[EMAIL PROTECTED]>**20071025143510]
[fix GADT-caught bugs in filter_conflictsFL.
David Roundy <[EMAIL PROTECTED]>**20071025135851]
[define thoroughCheck.
David Roundy <[EMAIL PROTECTED]>**20071024184004]
[check for more properties using quickcheck.
David Roundy <[EMAIL PROTECTED]>**20071024173105]
[use both quickcheck generators.
David Roundy <[EMAIL PROTECTED]>**20071024172708]
[give prettier test output.
David Roundy <[EMAIL PROTECTED]>**20071024172544]
[clean up a traceDoc.
David Roundy <[EMAIL PROTECTED]>**20071024172530]
[fix another copy of same bug I hit previously.
David Roundy <[EMAIL PROTECTED]>**20071024172434
This says something, perhaps, to the effect that I could be
writing more modular code. :(
]
[fix bug in commute_multiple_conflict.
David Roundy <[EMAIL PROTECTED]>**20071024171544]
[fix another bug, led to last test case.
David Roundy <[EMAIL PROTECTED]>**20071024160111]
[add new failing case generated by quickcheck.
David Roundy <[EMAIL PROTECTED]>**20071023222751]
[fix another bug in filter_conflicting1.
David Roundy <[EMAIL PROTECTED]>**20071023221904]
[alternative way to generate pairs by always taking the last one
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071023202646]
[add another interesting test case to the QC module.
David Roundy <[EMAIL PROTECTED]>**20071023194239]
[fix bug in filter_conflicting1.
David Roundy <[EMAIL PROTECTED]>**20071023172111]
[another merge example, and some more verbosity.
David Roundy <[EMAIL PROTECTED]>**20071022195631]
[add more traces.
David Roundy <[EMAIL PROTECTED]>**20071022195615]
[move commuteWhatWeCanFL.
David Roundy <[EMAIL PROTECTED]>**20071022195313]
[fix bug in filter_conflicts1.
David Roundy <[EMAIL PROTECTED]>**20071022195141]
[fix compile on ghc 6.6.
David Roundy <[EMAIL PROTECTED]>**20071022164205]
[give prettier output in commute_and_recommute test.
David Roundy <[EMAIL PROTECTED]>**20071022152841]
[some more GADT type annotations to keep GHC 6.8 happy
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071018135856]
[add place to put example merges generated by QuickCheck.
David Roundy <[EMAIL PROTECTED]>**20071019174356]
[document behavior of commuteWhatWeCanFL/RL.
David Roundy <[EMAIL PROTECTED]>**20071019171442]
[fix pull_common_unconflicting.
David Roundy <[EMAIL PROTECTED]>**20071019171115
This change also makes it far more efficient.
]
[pastable Show instances
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071017112413]
[add some more (commented) trace code.
David Roundy <[EMAIL PROTECTED]>**20071018154339]
[fix bug in pull_common_unconflicting.
David Roundy <[EMAIL PROTECTED]>**20071018154248]
[add tracing code.
David Roundy <[EMAIL PROTECTED]>**20071017191851]
[fix is_super to return false for equal patches.
David Roundy <[EMAIL PROTECTED]>**20071017191638]
[fix bug where we failed to try all possible common unconflicting patches.
David Roundy <[EMAIL PROTECTED]>**20071017190140]
[it's now possible for commute to fail, take this into account in QC.
David Roundy <[EMAIL PROTECTED]>**20071017173933]
[add some merge tests based on quickcheck error cases.
David Roundy <[EMAIL PROTECTED]>**20071017173029]
[make it so commute of two dependent patches fails if they are conflictors.
David Roundy <[EMAIL PROTECTED]>**20071017172931
Note: I'm not sure, we might want to enable this commutation. But what we
were previously doing was just plain wrong. It's a different *kind* of
conflictor-conflictor commute. Permutability suggests that these patches
should commute.
]
[consider all plausible values for flatten position when shrinking
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071017165314]
[overkill patch to get rid of (ParTree (NilTree) (NilTree))
David Roundy <[EMAIL PROTECTED]>**20071016205307]
[don't quit early.
David Roundy <[EMAIL PROTECTED]>**20071016204358]
[order by dependencies in ununion as well.
David Roundy <[EMAIL PROTECTED]>**20071016204043]
[shrinking of conflictor pairs
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071016183738]
[missing unsafeCompare case for Prim
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071016183620]
[replace some uses of unseal with a pattern-match
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071016072521]
[just one character per line in example cases.
David Roundy <[EMAIL PROTECTED]>**20071015190303
This makes it easier to read examples.
]
[fix compile error with -Werr and ghc 6.6.
David Roundy <[EMAIL PROTECTED]>**20071015185301]
[fix bug I introduced into QuickCheck.
David Roundy <[EMAIL PROTECTED]>**20071015184534]
[finish GADT job...was it worth it?
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071015084541]
[handle sets of patches that are out of their "natural" order.
David Roundy <[EMAIL PROTECTED]>**20071015181653]
[fix warning caused by reuse of type variable x.
David Roundy <[EMAIL PROTECTED]>**20071015162110]
[remove unused import from QuickCheck.
David Roundy <[EMAIL PROTECTED]>**20071015161155]
[nearly working with GADTs
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071015070520]
[various work on getting GADTs working in Darcs.Patch.QuickCheck
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071015022736]
[remove accidentally added file
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071014104452]
[move QuickCheck stuff out into separate module
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071013172029]
[Make Arbitrary instances more specific.
David Roundy <[EMAIL PROTECTED]>**20071012194351]
[fix conflictor so it fails when merge isn't reasonable.
David Roundy <[EMAIL PROTECTED]>**20071012194316]
[a bit more refinement of Arbitrary type (experimental)
David Roundy <[EMAIL PROTECTED]>**20071012170413]
[catch errors in flattenTree, so it can be used in Arbitrary
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071012061448]
[make new commute in Prim clean with regard to type witnesses.
David Roundy <[EMAIL PROTECTED]>**20071011214743]
[make empty hunk patches (never generated by darcs) commute like identity.
David Roundy <[EMAIL PROTECTED]>**20071011213850]
[Add a test of Prim (hangs?).
David Roundy <[EMAIL PROTECTED]>**20071011212059]
[make a few Arbitrary instances more general.
David Roundy <[EMAIL PROTECTED]>**20071011212019]
[avoid warnings.
David Roundy <[EMAIL PROTECTED]>**20071011192613]
[actually use simpleCheck to do a test.
David Roundy <[EMAIL PROTECTED]>**20071011192559]
[Add a couple more Arbitrary instances.
David Roundy <[EMAIL PROTECTED]>**20071011191029]
[improve output from prop_consistent_tree_flattenings.
David Roundy <[EMAIL PROTECTED]>**20071010223913]
[fix conflict with Ganesh.
David Roundy <[EMAIL PROTECTED]>**20071010211929]
[avoid empty hunk patches
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071009233500]
[try all possible orderings when flattening
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071009233323]
[new tests
David Roundy <[EMAIL PROTECTED]>**20071010193020]
[improve shrinking
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071009092427]
[shrink patch contents
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071007112703]
[quickcheck 2
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071007104812]
[Arbitrary for lists/trees of patches, and test flattenings
Ganesh Sittampalam <[EMAIL PROTECTED]>**20071007100015]
[fix remaining tests
David Roundy <[EMAIL PROTECTED]>**20071004160552]
[add a few more test cases and fix revealed bugs in commute
David Roundy <[EMAIL PROTECTED]>**20071004150510]
[eliminate unsafe flatten.
David Roundy <[EMAIL PROTECTED]>**20071003191131]
[eliminate unsafe join_patches.
David Roundy <[EMAIL PROTECTED]>**20071003155948]
[remove commented-out code.
David Roundy <[EMAIL PROTECTED]>**20071003152607]
[fix known FIXMEs in conflictor code (and add test case that triggers known bug).
David Roundy <[EMAIL PROTECTED]>**20071003144818]
[fix bug in conflictor equality checking.
David Roundy <[EMAIL PROTECTED]>**20071003133928]
[make all removals less efficient but more certain.
David Roundy <[EMAIL PROTECTED]>**20071002214038]
[add another test that already passes.
David Roundy <[EMAIL PROTECTED]>**20071002204835]
[Fix HAVE_TERMIO_H stuff to build on Solaris.
Dave Love <[EMAIL PROTECTED]>**20071202224352]
[Add verbose mode output to exec.
Eric Kow <[EMAIL PROTECTED]>**20071104234431]
[Set global debugMode flag on -v -v -v
Eric Kow <[EMAIL PROTECTED]>**20071104234611]
[Add a new 'debugMode' global variable.
Eric Kow <[EMAIL PROTECTED]>**20071104234330]
[Count number of times the --verbose and --quiet flags are passed in.
Eric Kow <[EMAIL PROTECTED]>**20071104234219]
[Fix UI regression (darcs changes should accept -p).
Eric Kow <[EMAIL PROTECTED]>**20071122180010
Was introduced by my Darcs.Arguments refactor.
Reported by Nicolas Pouillard.
]
[Add a withBugLoc function for tracking down IO-related problems.
Eric Kow <[EMAIL PROTECTED]>**20071030162716]
[Make it easier to write functions like 'impossible'.
Eric Kow <[EMAIL PROTECTED]>**20071030160019]
[Refactored ShowRepo implementation
Kevin Quick <[EMAIL PROTECTED]>**20071121052321]
[Added "darcs show repo" command to display repository information
Kevin Quick <[EMAIL PROTECTED]>**20071116062453]
[Simplify tempdir_loc with firstJustIO; fix getCurrentDirectorySansDarcs
Kevin Quick <[EMAIL PROTECTED]>**20071116051016]
[Added maybeGetEnv and firstJustIO for get_easy_author operation reduction (and simplification).
Kevin Quick <[EMAIL PROTECTED]>**20071112080230]
[Use a single command to initialize a remote repository.
Tristan Seligmann <[EMAIL PROTECTED]>**20071107181057
This replaces the method of stringing together multiple commands with the
shell-dependent && separator.
]
[TAG darcs unstable 2007-11-04
Eric Kow <[EMAIL PROTECTED]>**20071104235616]
Patch bundle hash:
e849fcc285da89553ec8f845b2e654037f23792f
_______________________________________________
darcs-devel mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-devel
