[darcs-devel] [issue2036] pull => failed to commute common patches (2.5)
Eric Kow
bugs at darcs.net
Thu Jan 20 16:35:12 UTC 2011
Eric Kow <kowey at darcs.net> added the comment:
Here's a context file for unstable so we can reproduce this more easily
in the future.
__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue2036>
__________________________________
-------------- next part --------------
Context:
[add a --no-record option to rollback
Florent Becker <florent.becker at ens-lyon.org>**20110114154449
Ignore-this: 8267a2ea62af26f820f2ecdf038d8397
]
[abstract Prim behind a class
Ganesh Sittampalam <ganesh at earth.li>**20101123074243
Ignore-this: 57b59798ed3e459640f9d7477f9e5953
]
[Support hunk editing in rollback
Florent Becker <florent.becker at ens-lyon.org>**20101019170706
Ignore-this: 45daabc085d1a5afdf8ae25eb354ebc6
]
[move Prim instances for Show into Prim.Show
Ganesh Sittampalam <ganesh at earth.li>**20101123074227
Ignore-this: f55b3e37f27521311dfe9a0912d77d26
]
[simplify ShowPatch constraints
Ganesh Sittampalam <ganesh at earth.li>**20101123074237
Ignore-this: 4a581d574760b90e9a69eeda8898392f
]
[clean up some unused exports
Ganesh Sittampalam <ganesh at earth.li>**20101123074238
Ignore-this: 6395127883c8e6f9c04f10e59a940f9c
]
[given token replacement its own module
Ganesh Sittampalam <ganesh at earth.li>**20101123074239
Ignore-this: ae43c2e291b25ee807ef578fd5298006
]
[move FileNameFormat out of Prim
Ganesh Sittampalam <ganesh at earth.li>**20101123074202
Ignore-this: fdd4d868236866af09e910efe9c53504
Although this is essentially a legacy concept, both Prim and patch types
that build on Prim need to know about it, so it's cleanest to have it
somewhere central.
]
[hide the internals of Prim
Ganesh Sittampalam <ganesh at earth.li>**20101123072741
Ignore-this: b61471142ab8c2844c512c532e366fa6
]
[extract Darcs.Patch.Prim.Commute
Ganesh Sittampalam <ganesh at earth.li>**20101123072550
Ignore-this: 9ab7d0bb8fb07003e80a001ba8d45c6a
]
[move showPrim etc out of Darcs.Patch.Prim.Core
Ganesh Sittampalam <ganesh at earth.li>**20101123072549
Ignore-this: df8a6621d14a293e165ec89fc7c252bc
]
[move read of Prim into its own module
Ganesh Sittampalam <ganesh at earth.li>**20101123072543
Ignore-this: 7a1559d95c20d0fdae0f14828413400d
]
[move coalescing code out of Darcs.Patch.Prim.Core
Ganesh Sittampalam <ganesh at earth.li>**20101123072547
Ignore-this: 67077bfc067a10d58337d9c81357831c
]
[move Apply Prim code into separate module
Ganesh Sittampalam <ganesh at earth.li>**20101123072331
Ignore-this: cc5370951c265338f51f83704fd9e79c
]
[give applyFL a better name
Ganesh Sittampalam <ganesh at earth.li>**20101123072327
Ignore-this: 7fd692a48aed26cb752e097cbc4fb576
]
[move Population handling out of Darcs.Patch.Apply
Ganesh Sittampalam <ganesh at earth.li>**20101123072329
Ignore-this: 7ada64cad1204e32a266f2aaf54af224
]
[abstract Population over PatchInfo
Ganesh Sittampalam <ganesh at earth.li>**20101123072328
Ignore-this: 375298b05ae167c026c88ed4fa4ee6cd
]
[move Darcs.Population[Data] into Darcs.Patch namespace
Ganesh Sittampalam <ganesh at earth.li>**20101123072325
Ignore-this: 2993f6690963daf1113b2663cff394d
]
[move markupFile etc out of Darcs.Patch.Apply
Ganesh Sittampalam <ganesh at earth.li>**20101123072324
Ignore-this: e90687f3a39f06fa2b68da5e1b43b727
]
[remove dead code
Ganesh Sittampalam <ganesh at earth.li>**20101123072306
Ignore-this: 1ed64d161324b01c3bea241ae814cf09
]
[abstract MarkedUpFile etc over PatchInfo
Ganesh Sittampalam <ganesh at earth.li>**20101123072316
Ignore-this: 48cc4ff4d7c2a0b1cdc7b5bea90db100
]
[move IsHunk into its own module
Ganesh Sittampalam <ganesh at earth.li>**20101123072723
Ignore-this: ebd3a12d7e2fabfc1d409e6e46e3a643
]
[stop going via V2 patches in WhatsNew
Ganesh Sittampalam <ganesh at earth.li>**20101123074230
Ignore-this: 32a615f1aa8e266ab5585d8244ff0ec
]
[get rid of Conflict instance for Prim
Ganesh Sittampalam <ganesh at earth.li>**20101123074229
Ignore-this: 68aa1b393d45f802efaadd3ed275b736
]
[break up Summary so Prim is handled internally
Ganesh Sittampalam <ganesh at earth.li>**20101123072322
Ignore-this: bd36707c7e733d522237ec7b14c2da95
]
[move guts of Darcs.Patch.Prim into new Core module
Ganesh Sittampalam <ganesh at earth.li>**20101123072318
Ignore-this: 1df78c83a16a2882c8f6387ee6d7be2d
]
[split out Darcs.Patch.{Effect,Conflict}
Ganesh Sittampalam <ganesh at earth.li>**20101123072303
Ignore-this: 17fb8d3d32bc0b76e1acd47f67a7ba56
]
[read legacy Split patch format
Ganesh Sittampalam <ganesh at earth.li>**20101123070142
Ignore-this: 3fd0ccf9e668d133bbea222364823b35
This now gets flattened out at the FL Patch/FL RealPatch level.
]
[move MyEq superclass from Invert to Patchy
Ganesh Sittampalam <ganesh at earth.li>**20101122064312
Ignore-this: 52677b5cd1fa8160596af02e70d3880c
]
[get rid of Identity constructor from Prim
Ganesh Sittampalam <ganesh at earth.li>**20101122064315
Ignore-this: 1067a1ef4b957303b9449774fbaef9ee
]
[split out IsHunk from Effect
Ganesh Sittampalam <ganesh at earth.li>**20101122064320
Ignore-this: e824b3a7a0c47442e5fb653bd777b633
]
[drop identity member of Invert
Ganesh Sittampalam <ganesh at earth.li>**20101122064308
Ignore-this: ad8007c6d4e63fcf9cd3870892cab247
]
[get rid of Split
Ganesh Sittampalam <ganesh at earth.li>**20101122064304
Ignore-this: 5473000393dab8828eb56f182af20ab5
]
[break out Summary code into separate module
Ganesh Sittampalam <ganesh at earth.li>**20101122064255
Ignore-this: 2ae3db693c769895a9d5659d53af23d8
]
[disentangle Darcs.Patch.Named from Darcs.Patch.Viewing
Ganesh Sittampalam <ganesh at earth.li>**20101122064253
Ignore-this: 2406a3b4e7aed4093359a49d3058663f
]
[don't go via Patch to summarise changes in record
Ganesh Sittampalam <ganesh at earth.li>**20101123074235
Ignore-this: 9293d70c0bf818e1d52680bbc975efda
]
[Test issue1558: xml output for patch hash shall not include "gz" extension
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101216160034
Ignore-this: 8437fc7591752265ecd6b5601af7c34f
]
[resolve issue1558: remove ".gz" extension in xml output
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101216155428
Ignore-this: 24a5b7949daf7c662cb2db10cd8909a1
]
[Split makeFilename to get rid off the .gz suffix
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101216154647
Ignore-this: 7efae8d990fe013d1ae0a872faf4b015
]
[Add GPL version to man page.
Eric Kow <kowey at darcs.net>**20110105174019
Ignore-this: 8883c282b41bc699eeb8aca6ca4baa98
]
[Specify GPLv2+ in manual.
Eric Kow <kowey at darcs.net>**20110105173547
Ignore-this: 19f7d32352828231fc9872afebfe4159
]
[Use getBoolFlag to check for a packs flag
Alexey Levan <exlevan at gmail.com>**20101122111702
Ignore-this: 904514279a7cc9a52b0676d3ee811a7a
]
[Fix check for --packs flag
Alexey Levan <exlevan at gmail.com>**20101105175129
Ignore-this: ae85523a3f55e32de13d7feea8870716
]
[Accept issue2017: apply crash when tag missing from context.
Eric Kow <kowey at darcs.net>**20101216122006
Ignore-this: 90d850a66c5974209ccf56cd00f6de0f
]
[hunk editing test
Ganesh Sittampalam <ganesh at earth.li>**20110107204059
Ignore-this: 21a169987f432ed46e879ebfb3101176
]
[split a basic class out of ShowPatch that requires fewer deps
Ganesh Sittampalam <ganesh at earth.li>**20101122064250
Ignore-this: aded2f29e3154df418d57f95917534fd
This allows a bunch of unreachable and duplicated code to be removed
]
[Friendlier _darcs/inventory HINT message.
Eric Kow <kowey at darcs.net>**20101122115635
Ignore-this: a6edc02f057b0ccc9d8dabbb47efab9c
The idea is to focus on concrete actions or expectations, no internals!
]
[Label the unreachable repository note as a HINT.
Eric Kow <kowey at darcs.net>**20101118171446
Ignore-this: 81bcf930219eefb3e26f0c925d0cd5e
]
[Label --set-default note as a HINT.
Eric Kow <kowey at darcs.net>**20101118163634
Ignore-this: bd878dcbb9ed964041f7ddef0c187856
The goal is to uniformly mark all non-essential "helpful" prompts
in a recognisable way. The underlying message is "relax!"
]
[fix warning in Darcs.Patch.Split
Ganesh Sittampalam <ganesh at earth.li>**20101121154023
Ignore-this: 4ba29ad3adebbaaf2051f17c5d4f22a8
]
[fix warning in Darcs.Patch.Bundle
Ganesh Sittampalam <ganesh at earth.li>**20101121154016
Ignore-this: 2fc86824ab6c8c9646288e83e235e1ab
]
[resolve issue114: allow hunk-splitting in revert
Florent Becker <florent.becker at ens-lyon.org>**20101017154131
Ignore-this: 1d0d0f1643f4d0d3fac27f0442c50805
The UI is stolen from record-hunk-splitting and therefore subpar. It should be checked by native english-speakers and non-programmers.
]
[resolve issue1978
Florent Becker <florent.becker at ens-lyon.org>**20101030125001
Ignore-this: bee36780c2ca85778675e280c8aee1ac
]
[make checkUnrecordedConflicts use the correct patch type for the repo
Ganesh Sittampalam <ganesh at earth.li>**20101122063342
Ignore-this: 584f48e18763f0bd3c8dc0befc775e53
]
[Thanks to Summersault for their generous donation!
Eric Kow <kowey at darcs.net>**20101222114837
Ignore-this: d319ce144217907609b54b27ff8d6bf1
]
[Resolve import conflict in rollback work and record on test failure.
Eric Kow <kowey at darcs.net>**20101218234518
Ignore-this: 6c02965428b42df801882b7f0527962a
]
[Reinstantiate matchingHead
Florent Becker <florent.becker at ens-lyon.org>**20101115135320
Ignore-this: 2497436bac21702cd51ba210cad5ff41
]
[Limit unpull and rollback to last tag again
Florent Becker <florent.becker at ens-lyon.org>**20101110112706
Ignore-this: b5cf8ff1ade5da7e4be70781cc7fc45e
]
[resolve issue1922: output correct context in darcs unpull -O
Florent Becker <florent.becker at ens-lyon.org>**20101109213633
Ignore-this: 741866c4a645edc0b43ba889fb4e965c
]
[exit faster on null selection in Unrecord
Florent Becker <florent.becker at ens-lyon.org>**20101109170408
Ignore-this: 2bbf93f60e433dc8a0e6d85544b3004d
]
[test for issue 1922
Florent Becker <florent.becker at ens-lyon.org>**20101115152327
Ignore-this: 985fcd8af727b5c65ea49a82b89083db
]
[allow rollback and unpull to work under tags
Florent Becker <florent.becker at ens-lyon.org>**20101109164748
Ignore-this: 57b8ce407b33fd6dc0e39b0f2d26824c
Quick preliminary tests seem to work ok performance-wise,
but obliterate -a is now a very bad idea indeed.
]
[Update documentation of arbitraryTree.
Iago Abal <iago.abal at gmail.com>**20101207184655
Ignore-this: 5185788f89b841869cd31538fc6497e9
]
[Update link to the wiki UnitTests page.
Iago Abal <iago.abal at gmail.com>**20101207171135
Ignore-this: 5891902745de905077231d3477a2a57a
]
[More visible old-fashioned to hashed notice.
Eric Kow <kowey at darcs.net>**20100922100010
Ignore-this: a8ede6ade6aad4e9ae030c36556a488b
This also talks about old-fashioned as being deprecated.
]
[Update SFC address.
Eric Kow <kowey at darcs.net>**20101217093303
Ignore-this: d7f918a0edbcaa1e03434a8210c7aefd
]
[Don't require --darcs when it's not needed in darcs-test executable
Florent Becker <florent.becker at ens-lyon.org>**20101210160200
Ignore-this: f9121b902ca53bf234ae2d49ab551f21
]
[Fix linking with libdarcs under Windows
Alexey Levan <exlevan at gmail.com>**20101211225308
Ignore-this: 4cabe87f77b5cd12fd317894cc332b63
]
[simplify readPatch' for Braced
Ganesh Sittampalam <ganesh at earth.li>**20101122063209
Ignore-this: e2300350b3742b1a8959abe1f7a0abfb
]
[resolve conflict between patch reading changes and case -> maybe cleanup
Ganesh Sittampalam <ganesh at earth.li>**20101121184659
Ignore-this: 6545e303932fded4191198b8ea3ca787
]
[drop the nested Maybes in the patch parser
Ganesh Sittampalam <ganesh at earth.li>**20101022055829
Ignore-this: 8f14fbf7678212998c27243417d7354e
]
[drop the unused and often ignored "want eof" parameter to readPatch'
Ganesh Sittampalam <ganesh at earth.li>**20101022055359
Ignore-this: e5c182dbd908515426c924cc4fd8dc5c
]
[don't silently throw away remaining parse input
Ganesh Sittampalam <ganesh at earth.li>**20101022054900
Ignore-this: 7fb9da95e5f439764e4d60f5a366e1d4
]
[get rid of useless instance
Ganesh Sittampalam <ganesh at earth.li>**20101122062905
Ignore-this: 6597211f9863149d6278e8cec8897bed
]
[rename Darcs.Hopefully to Darcs.Patch.PatchInfoAnd
Ganesh Sittampalam <ganesh at earth.li>**20101122062105
Ignore-this: ee6b4444dec3c021be5514b49379ec51
The new name much better reflects the role of this module.
The Hopefully type could in principle be split out back
into a new Darcs.Hopefully module, but it's unlikely it would
have any independent value.
]
[move pending.new reading/writing into Repository.LowLevel
Ganesh Sittampalam <ganesh at earth.li>**20101122061926
Ignore-this: 7b3cd344ba227271f48f9abd37fea7e4
]
[Get rid of pointless call to effect in Darcs.Resolution
Ganesh Sittampalam <ganesh at earth.li>**20101122061049
Ignore-this: c1fbc01b8a34b4438832f3eb6a8a627a
]
[Remove an unnecessary call to effect in setTentativePending
Ganesh Sittampalam <ganesh at earth.li>**20101122061049
Ignore-this: 879310667e9fd34728727000f84ccf9c
]
[move writePatch and gzWritePatch outside ShowPatch
Ganesh Sittampalam <ganesh at earth.li>**20101122064245
Ignore-this: e3af453f31e0df8e69eaf3964de18471
]
[get rid of some spurious arguments to impossible
Ganesh Sittampalam <ganesh at earth.li>**20101122062905
Ignore-this: 6a1a5360549ce4225d01f08912654675
]
[improve name
Ganesh Sittampalam <ganesh at earth.li>**20101122061806
Ignore-this: e0ca59264e188375e1961b232d965837
]
[Darcs.Patch.Apply doesn't have orphans any more
Ganesh Sittampalam <ganesh at earth.li>**20101122061806
Ignore-this: 1f16110aa0724103970b586885e4bba6
]
[generalise type of xmlSummary
Ganesh Sittampalam <ganesh at earth.li>**20101122061031
Ignore-this: 50ff99a323a6573b944e25d710cbb88a
conflictedEffect for Named has the same behaviour as for the underlying
patch, so this should have no effect on behaviour
]
[tighten up type of handlePendForAdd
Ganesh Sittampalam <ganesh at earth.li>**20101122060846
Ignore-this: bc417d82bd97e62bb3fc6b3f398dec0f
]
[Tighten up type of applyToWorking
Ganesh Sittampalam <ganesh at earth.li>**20101121153126
Ignore-this: 79ed2bb5cfb232cf8a44e7ece4ec2e90
]
[Tighten up type in Darcs.Rollback
Ganesh Sittampalam <ganesh at earth.li>**20101121153125
Ignore-this: a2b346cb329ae466cdfdb2eb8544101f
]
[more thorough checks of _darcs/format handling
Florent Becker <florent.becker at ens-lyon.org>**20101017133418
Ignore-this: 13d9efb1af01b8ed9a24a00e79fc7630
]
[Test for issue1978
Florent Becker <florent.becker at ens-lyon.org>**20101017133304
Ignore-this: e9adb647706c5edb378fb76bcb728014
]
[Restore a missing hyphen from patch191.
Eric Kow <kowey at darcs.net>**20101122145355
Ignore-this: ba012bf1e2169b1e6b77fe918e24241d
]
[resolve issue1988: enable warn-unused-do-bind
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101121211101
Ignore-this: 1833a27ec8dac960764a6e3ffdbd04e7
This patch enables warn-unused-do-bind and silences the 163 warnings of
that kind spread accross darcs code.
Please note that that this patch has been automatically generated by a
shell script. It does not change or break anything, but might silence
warnings which are actual bugs.
]
[Explain do-notation comments in README
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101105101536
Ignore-this: 1869893336e4b719bf30a4513103d1ec
]
[update comparisons to other VCS in manual, remove section subsumed by the wiki
Guillaume Hoffmann <guillaumh at gmail.com>**20101117140753
Ignore-this: 1fbbb263f75fa23415ee5732017cb8b9
]
[update building section of manual, avoid information rot
Guillaume Hoffmann <guillaumh at gmail.com>**20101117135734
Ignore-this: 38d73b7a971e9d5af973e78471d270d3
]
[remove the mysterious add --date-trick
Guillaume Hoffmann <guillaumh at gmail.com>**20101117135301
Ignore-this: fd51f281fb8fcf1393cb69ee59619e87
]
[resolve issue1637: report HTTP response code for HTTP errors
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101115183345
Ignore-this: 67fcbd9a0d3466f21a3a045672a12218
]
[resolve conflict between Darcs.Population cleanup and catMaybes -> mapMaybe
Ganesh Sittampalam <ganesh at earth.li>**20101121203847
Ignore-this: 5ad2139d8a0b809b3f7e70e1cbf8eabb
]
[remove command optimize --relink-pristine
Guillaume Hoffmann <guillaumh at gmail.com>**20101110092122
Ignore-this: 53b07384fb2ffbc718424d1ebcb91f47
]
[haddock for createPartialsPristineDirectoryTree
Guillaume Hoffmann <guillaumh at gmail.com>**20101110090645
Ignore-this: 5344ce5e9e56b6993e448afc55651977
]
[in Pristine use bug more and remove unused functions
Guillaume Hoffmann <guillaumh at gmail.com>**20101110085028
Ignore-this: c86e42e78764924e6ec1fa40d1b5f78
]
[remove dangling doc paragraph from 2002 in DarcsRepo
Guillaume Hoffmann <guillaumh at gmail.com>**20101110084735
Ignore-this: db6090517ea15be707531842aa9b8f2b
]
[unused return value of createPristine
Guillaume Hoffmann <guillaumh at gmail.com>**20101109184733
Ignore-this: e908f8c3a1d1c4054c7a6547d2931f1
]
[remove the nopristine function
Guillaume Hoffmann <guillaumh at gmail.com>**20101109163751
Ignore-this: 6e4f6d981306f250eee5149ee45d51e
]
[remove unused getRepoPop function
Guillaume Hoffmann <guillaumh at gmail.com>**20101109181844
Ignore-this: 4fde9b5b6335ddc5a20c5e755fddc240
]
[tests/emailformat.sh: use ghc --make instead of ghci
Sergei Trofimovich <slyfox at community.haskell.org>**20101116213637
Ignore-this: 69799051c91b1b7363c1b34328f8c591
linux-alpha and linux-ia64 don't have ghci support.
No need to fail there.
]
[Repository/Internal.hs: invert if to remove negation
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113220454
Ignore-this: aaeb1950bf36c7f83af854a45527b7af
]
[Removed two unneeded returns from Repository/Internal.hs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113220049
Ignore-this: 537e2334b07013b77a1105ab21d50c97
]
[Minor readProblem-writeProblem refactoring
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113200557
Ignore-this: 6b1162780e30051ece99d793d7d7a3d7
]
[Factor out common parts of readProblem and writeProblem
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113181857
Ignore-this: 7ff378de97aaeabbc032ef957bd6d6b2
]
[Fixed some copypasted comments on xxProblem in Format.hs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101112062718
Ignore-this: 3627fffecc8a1bca0692a60c339cada2
]
[Fixed 'Use when' hlint suggestion where reasonable
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101119230756
Ignore-this: a50f6bbc7465e801b26180be75ac831f
]
[Fix 'Use mapMaybe' hlint suggestion everywhere
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101119224821
Ignore-this: 6eec387b0f79e4a9d58e768f99ae7013
]
[A couple of maybes instead of cases
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113225110
Ignore-this: 872d6a092252de0f09db303702756db6
]
[Removed an unneeded $
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113225028
Ignore-this: bbd673a4df03badb30710dbe73782d1
]
[Factor out a repeated pattern with getUMask
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101113220558
Ignore-this: f6bbbf068047638ddc885f1d9b23713a
]
[flip catch -> handle
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101116205833
Ignore-this: 46de0341ac033582cc59352db7b92e3e
]
[Hlintification of Preproc.hs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101116203134
Ignore-this: e1f30d03ede340631906d973df055c1
]
[resolve conflicts in issue332 patch
Ganesh Sittampalam <ganesh at earth.li>**20101121165331
Ignore-this: c7837424b394363d93c6e5794b2ad5ad
]
[resolve issue332: ask if test fails
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101107191955
Ignore-this: 5d050e2e7716c81efa81010f91f75916
]
[Darcs.Patch.Bundle.parseBundle: return patches from the bundle and context separately
Florent Becker <florent.becker at ens-lyon.org>**20101105142838
Ignore-this: 6327c60611887f3b5c72528f706c3963
This is intended for library users who want to parse .dpatch files, and will need to know which patches are in a bundle, and which are in the context if they want to manipulate the patches without the corresponding repo.
]
[fix warning in Ssh
Ganesh Sittampalam <ganesh at earth.li>**20101121154031
Ignore-this: be202040fd18de4d4cf28fc65269577a
]
[fix warning in Darcs.Commands.Move
Ganesh Sittampalam <ganesh at earth.li>**20101121154010
Ignore-this: cb402d504ae2097c1627c6734cbe8c3b
]
[fix warning in Darcs.Commands.Dist
Ganesh Sittampalam <ganesh at earth.li>**20101121154001
Ignore-this: bcdacd46777afa8f26a882d2d801fe87
]
[fix warning in Darcs.Commands.Changes
Ganesh Sittampalam <ganesh at earth.li>**20101121153939
Ignore-this: 263f1fb42e1aac4c279a05f1360f88cf
]
[Bump the shellish dependency to >= 0.1.3.
Petr Rockai <me at mornfall.net>**20101027095304
Ignore-this: f5e30fcd9f087ec8efc6ec5b273dcfd0
]
[correct showContextPatch documentation
Florent Becker <florent.becker at ens-lyon.org>**20101117194927
Ignore-this: fedb50bb3fef8024e2f2fe9df9ad78b0
]
[correct haddock for PartitionFL
Florent Becker <florent.becker at ens-lyon.org>**20101116141756
Ignore-this: b16f76fd47b5fb0c30f2afa85f020a0a
]
[document showContextPatch
Florent Becker <florent.becker at ens-lyon.org>**20101112085523
Ignore-this: f4e661af01ea1fe250fe9314d5f34db
]
[Remove redundant (:>>) type constructor
Florent Becker <florent.becker at ens-lyon.org>**20101109153626
Ignore-this: 9dfb6a83354ed8145e0c170507a2d5dd
]
[Resolve darcs.cabal conflict with branch-2.5.
Eric Kow <kowey at darcs.net>**20101105014442
Ignore-this: b0121ba3698b2c594b0300801a3389c8
]
[Fix conflict with darcs 2.5 backport of issue1942 patch.
Eric Kow <kowey at darcs.net>**20101104212654
Ignore-this: 437e93ac60e1832e1181e41b1cb948d3
]
[Cope with initial spaces in URLs
Florent Becker <florent.becker at ens-lyon.org>**20101102103147
Ignore-this: f0d58cb6310ffa08cfd072190f2eaea5
]
[resolve issue1970: allow ssh:// urls
Florent Becker <florent.becker at ens-lyon.org>**20101101161445
Ignore-this: 90ada77620504d0e4f1183a401e47da1
]
[remove useless unsafePerformIO
Florent Becker <florent.becker at ens-lyon.org>**20101101161205
Ignore-this: c13a931f08355bc9c21a8ab498f2a7e0
]
[Warn when running cabal test with -fno-test
Florent Becker <florent.becker at ens-lyon.org>**20101111133710
Ignore-this: 56d24b012e295240da7c5ce73ab112ab
]
[move optimization setting into a flag
Ganesh Sittampalam <ganesh at earth.li>**20101022181756
Ignore-this: bbe59a4cf4532ada81878d420d713ee5
Turning this off is particularly useful during development
]
[make test harness optional
Ganesh Sittampalam <ganesh at earth.li>**20101020054443
Ignore-this: b3b2a4c35d93f9fdece096213f0c49
]
[Resolve conflicts between test harness extensions and cleanups.
Eric Kow <kowey at darcs.net>**20101019235950
Ignore-this: 91f2ff9f7b2780faeabf1da707da3342
]
[Split unit tests into Darcs.Patch and miscellaneous ones.
Eric Kow <kowey at darcs.net>**20101019064019
Ignore-this: 7bdf86843798f9fd78523ef422267a15
]
[Sweep Darcs.Patch.Info tests into a single suite.
Eric Kow <kowey at darcs.net>**20101018224304
Ignore-this: 94418d80d9da38b632b1cd2e97834df2
]
[Sweep Darcs.Email tests into a single suite.
Eric Kow <kowey at darcs.net>**20101018224209
Ignore-this: e38592d2775769371647732150bec607
]
[Consolidate unit test running logic into test harness.
Eric Kow <kowey at darcs.net>**20101018222725
Ignore-this: 4b36bfc587a276c23b75c4dbb44001f5
]
[Remove literate Haskell from Darcs.Test.Unit.
Eric Kow <kowey at darcs.net>**20101018174915
Ignore-this: 5931f6d4a47f394bdef9d1c2432e8ad6
]
[darcs dist doesn't take any arguments
Alexey Levan <exlevan at gmail.com>**20100326142606
Ignore-this: e262f20a636a80417f65a50a233df200
]
[Resolve conflicts with Alexey's refactoring of argument handling in diff
Reinier Lamers <tux_rocker at reinier.de>**20101017091857
Ignore-this: f4d56ab4bc2cf363939d0b14b1b34c6f
This resolves conflicts with:
Thu Mar 25 22:26:01 EET 2010 Alexey Levan <exlevan at gmail.com>
* Separate arguments/repository code in Diff.lhs
]
[Separate arguments/repository code in Diff.lhs
Alexey Levan <exlevan at gmail.com>**20100325202601
Ignore-this: cc7716b8d9fdbbda393e48410496532a
]
[resolve issue1965: Resolve conflicts with argument handling work in move
Reinier Lamers <tux_rocker at reinier.de>**20101017085238
Ignore-this: 7d12c75a4806cb786d118a3cb64f8904
This resolves conflicts with:
Wed Mar 17 00:02:11 EET 2010 Alexey Levan <exlevan at gmail.com>
* Separate argument handling from repository work in Move.lhs
]
[Resolve conflicts with Alexey's refactoring of argument handling in annotate
Reinier Lamers <tux_rocker at reinier.de>**20101017085117
Ignore-this: 6620f01ad35ecf5c6147c2bd6f643cc8
This resolves conflicts with:
Thu Mar 25 22:25:56 EET 2010 Alexey Levan <exlevan at gmail.com>
* Separate arguments/repository code in Annotate.lhs
]
[Separate arguments/repository code in Annotate.lhs
Alexey Levan <exlevan at gmail.com>**20100325202556
Ignore-this: 2dd9139ee5e3b086564977396877693a
]
[Resolve conflicts with Alexey's refactoring of argument handling in changes
Reinier Lamers <tux_rocker at reinier.de>**20101017082744
Ignore-this: 778bf98a8dd3356e5b2acc934e187f7a
This resolves conflicts with:
Sun Mar 21 00:10:14 EET 2010 Alexey Levan <exlevan at gmail.com>
* Resolve issue1397: separate arguments/repository code in Changes.lhs
]
[Resolve conflicts with Alexey's refactoring of argument handling in add
Reinier Lamers <tux_rocker at reinier.de>**20101017082717
Ignore-this: 8896891037e22f7654c4829092ab4116
This resolves conflicts with:
Sun Mar 21 00:10:08 EET 2010 Alexey Levan <exlevan at gmail.com>
* Separate arguments/repository code in Add.lhs
]
[Resolve conflicts with Alexey's refactoring of argument handling in amend-record
Reinier Lamers <tux_rocker at reinier.de>**20101017082417
Ignore-this: b3c95e317d2896e8a7194eb27fe74a6
This resolves conflicts with:
Sun Mar 21 00:09:44 EET 2010 Alexey Levan <exlevan at gmail.com>
* Separate arguments/repository code in AmendRecord.lhs
]
[Resolve conflicts with Alexey's introduction of maybeFixSubPaths
Reinier Lamers <tux_rocker at reinier.de>**20101017081803
Ignore-this: 99bd3a5763cce57cc8aae0b6ba9997da
This resolves conflicts with:
Tue Mar 16 02:38:17 EET 2010 Alexey Levan <exlevan at gmail.com>
* Add Maybe variant of fixSubPaths
]
[Resolve issue1397: separate arguments/repository code in Changes.lhs
Alexey Levan <exlevan at gmail.com>**20100320221014
Ignore-this: 313b379282f1a40848fad859f3f210c8
]
[Separate arguments/repository code in Add.lhs
Alexey Levan <exlevan at gmail.com>**20100320221008
Ignore-this: 2c2b0c30ebe6287c411fee644397c7d8
]
[Separate arguments/repository code in AmendRecord.lhs
Alexey Levan <exlevan at gmail.com>**20100320220944
Ignore-this: ef083aaf623a5a8a2bc149b1b75389ef
]
[Add test for absolute paths
Alexey Levan <exlevan at gmail.com>**20100320212853
Ignore-this: 4b5865aabc2a30babbb2527aa4463bb0
]
[Separate argument handling from repository work in Move.lhs
Alexey Levan <exlevan at gmail.com>**20100316220211
Ignore-this: 943df71030537643bf3b2dc0a3b16bce
]
[Add Maybe variant of fixSubPaths
Alexey Levan <exlevan at gmail.com>**20100316003817
Ignore-this: 5fbd7cb6c9e3d61b6922e9990d835752
]
[Put back showHexLen into Darcs.Utils, it's needed on windows.
Petr Rockai <me at mornfall.net>**20101118164545
Ignore-this: 7e5fc87887c2b3fae0a99b2846652068
]
[Disable unsupported haddock.
Eric Kow <kowey at darcs.net>**20101116140631
Ignore-this: 28e66f7fb0ad5852eb4acda9244db5fb
See http://trac.haskell.org/haddock/ticket/43
]
[Fix Darcs.Repository haddock.
Eric Kow <kowey at darcs.net>**20101116140236
Ignore-this: 4ecf7457ae793af84648e90718119822
]
[make sure all of Darcs.Patch is imported with explicit import lists
Ganesh Sittampalam <ganesh at earth.li>**20101017115317
Ignore-this: 607bb79a401039d8219dd0f26b3f4286
]
[explicit import of Darcs.Test.Patch.Test
Ganesh Sittampalam <ganesh at earth.li>**20101017114148
Ignore-this: 978dee1e6d68b890eef78f2bdfdf8f7f
]
[Make send-output-v*.sh tests more robust against timezones
Florent Becker <florent.becker at ens-lyon.org>**20101114122515
Ignore-this: 7bf4cf4b8a609ec238196d0f5197c533
]
[fix regressions in V1 patch reading/hash recalc
Ganesh Sittampalam <ganesh at earth.li>**20101021180003
Ignore-this: d617c585f9b8876a78fb76503fe5d2de
]
[push FL from Repository instances into Named
Ganesh Sittampalam <ganesh at earth.li>**20101021064310
Ignore-this: e3f8617187a33dd6ccb910e4ceaabc0e
]
[remove locale sensitivity from send output tests
Ganesh Sittampalam <ganesh at earth.li>**20101022204106
Ignore-this: beab482dc602183252cadb5c3c94b9ae
]
[make send output tests for v2 repos
Ganesh Sittampalam <ganesh at earth.li>**20101021175846
Ignore-this: f1c9257ea13b0585d83b60eaa9afc8f9
]
[add test of send adding context around hunks
Ganesh Sittampalam <ganesh at earth.li>**20101021174043
Ignore-this: 508d152d1ce23b866885cbad4e811663
]
[get rid of unneeded pragma
Ganesh Sittampalam <ganesh at earth.li>**20101021171149
Ignore-this: d76997ef4e2adadc566c6f7211f962cd
]
[showContextPatch FL needs to manage braces too
Ganesh Sittampalam <ganesh at earth.li>**20101020065658
Ignore-this: d08f9b53a816be198e9c90fdc0c33c7c
]
[add test of V1 send output
Ganesh Sittampalam <ganesh at earth.li>**20101020061801
Ignore-this: eb24001122a01689ca0254ca7825e9ae
]
[add test for handling of v1 patches with nested braces
Ganesh Sittampalam <ganesh at earth.li>**20101019052236
Ignore-this: 5a0a8a0cddeff383c7535f1296403906
]
[get rid of ComP
Ganesh Sittampalam <ganesh at earth.li>**20101017104056
Ignore-this: c686d65fa84305811176862631332f7f
This makes the treatment of v1 and v2 patches more consistent.
]
[stop using Patch instances for reading/writing pending
Ganesh Sittampalam <ganesh at earth.li>**20101014202717
Ignore-this: 3a759059141166a649e6dbfbe2f2f0d8
]
[Clean up pending API a bit
Ganesh Sittampalam <ganesh at earth.li>**20101014174838
Ignore-this: c07717f1b71ad3619374faab86352f11
]
[relax type of bracketedFL
Ganesh Sittampalam <ganesh at earth.li>**20101014174748
Ignore-this: 8e4777b40518f2ab8a254af9a1cb2fae
]
[simplify showContextHunk
Ganesh Sittampalam <ganesh at earth.li>**20101014060330
Ignore-this: 8a0d3ace95df59a65b7e3817b42e6d8a
]
[replace contents of HACKING with a link to the relevant wiki page
Guillaume Hoffmann <guillaumh at gmail.com>**20101108205514
Ignore-this: e999e8fc7d46f573cf0114ad2ae4f42a
]
[make test for issue1465 not spawn real editors
Florent Becker <florent.becker at ens-lyon.org>**20101021152008
Ignore-this: e7396b0c7e4d65325b8309f68a1fff63
This is annoying because emacs < /dev/null does not fail, but can spawn a
(XWindow) emacs
]
[Make issue1465 test a bit more straightforward.
Eric Kow <kowey at darcs.net>**20101020172422
Ignore-this: 1b1ab977520178812259492d0ea7d49d
]
[Resolve issue1551: only use unchanged file content prompt in darcs send.
Eric Kow <kowey at darcs.net>**20100718093448
Ignore-this: 61cc0bf71ff2c54311834624b2a7f6d7
]
[Hlintification of Prefs.lhs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101110201252
Ignore-this: b5beef14ff46267c2a5adcbab3378cce
]
[Hlintification of Utils.hs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101110200114
Ignore-this: 56b5689f6ab2eb9da5bd46501ef77979
]
[Hlintification of Format.hs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101110200018
Ignore-this: 8ac835d3a4c9c4d3428bbc87ef2cc407
]
[Changed comment on Progress.hs - was a copypaste from elsewhere
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101107011449
Ignore-this: 13c848a420163106f0e494ec8f4c5f34
]
[Removed putTiming duplication
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101107003416
Ignore-this: 2f28a06914621d8229e9a1e7dcbe46b2
]
[Removed an extra return
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101106224143
Ignore-this: c6142e31820d363068257b4add610a0d
]
[Hlintification of SetPref.lhs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101110221559
Ignore-this: d2e25d6bd95e37cd69c10fb10a31dd31
]
[Hlintification of Lcs.hs
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101110213312
Ignore-this: dc1697b4e7e68bb6a4c35c1b95da738d
]
[add some explicit export lists in Darcs.Commands
Ganesh Sittampalam <ganesh at earth.li>**20101017114405
Ignore-this: c53d2cf0b87d264b2c499f40d0f5904
]
[explicit import list from Printer
Ganesh Sittampalam <ganesh at earth.li>**20101017114403
Ignore-this: 8138405f3bfd08eb08b21564e7bb0819
]
[drop some dead exports/code from ByteStringUtils
Ganesh Sittampalam <ganesh at earth.li>**20101017114402
Ignore-this: e6504f5e3089c187873a6d05884961e7
]
[remove some dead code in Darcs.Repository
Ganesh Sittampalam <ganesh at earth.li>**20101017114358
Ignore-this: e99978a06aa0974d5280fd95d28f855a
]
[explicit exports/imports for Darcs.Repository.Merge
Ganesh Sittampalam <ganesh at earth.li>**20101017114055
Ignore-this: 58a34ced75aee0f94214cf998908fd18
]
[drop unused flag
Ganesh Sittampalam <ganesh at earth.li>**20101017114053
Ignore-this: 14b73b60b0073ea866d27cfbc462d227
]
[remove dead code from Darcs.Utils
Ganesh Sittampalam <ganesh at earth.li>**20101017114050
Ignore-this: 3583c35af9b21b1d1728b845c7345464
]
[clean up some dead code in Darcs.Patch
Ganesh Sittampalam <ganesh at earth.li>**20101017113941
Ignore-this: f19209e04d2e453e008e081e0d06dbe
]
[drop unused verboseMode global
Ganesh Sittampalam <ganesh at earth.li>**20101017113325
Ignore-this: a61509fac2005025afb601ccb67d929e
]
[remove unused exports
Ganesh Sittampalam <ganesh at earth.li>**20101017113320
Ignore-this: 15eab75d0e275a670f2d8d8f4c97aec5
]
[Add visual emphasys to note about --set-default flag
Alexey Levan <exlevan at gmail.com>**20101105182858
Ignore-this: 23631abfc8134496d49bdd86dd797d9
]
[resolve issue1977 by considering more repositories as being NoPristine
Guillaume Hoffmann <guillaumh at gmail.com>**20101017153235
Ignore-this: 41987c65face6b464951509e4eeda1f2
]
[accept issue1977
Guillaume Hoffmann <guillaumh at gmail.com>**20101017153230
Ignore-this: d49bd9d8948ec25c1d57c0b6f4f28aa6
]
[redundant use of when inside of an else
Guillaume Hoffmann <guillaumh at gmail.com>**20101017145323
Ignore-this: 31a88e4758b7488abf6a024bf3f707dd
]
[resolve issue1984: better error message for 'darcs convert'
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20101024090802
Ignore-this: 1e1112dba335510460cffd8c377fe776
]
[Resolve issue1266: add a warning about nested repositories
Alexey Levan <exlevan at gmail.com>**20101015175449
Ignore-this: f4fdcf0e2d2b46a82da6cee22e945e30
]
[Improve issue1465 test (portability, tidiness).
Eric Kow <kowey at darcs.net>**20101020141627
Ignore-this: e03f16db3f8b333ebed783feb67f2f3e
- No env -u on MacOS X.
- No need to clean up directories (new harness)
Keeping them around makes debugging easier.
]
[Require absolute path for darcs-test --darcs.
Eric Kow <kowey at darcs.net>**20101017150041
Ignore-this: 11d3683050c5bd91699b472df93f6726
]
[Avoid 'Defined but not used' error in darcs-test.
Eric Kow <kowey at darcs.net>**20101017142326
Ignore-this: 22c7a63806806ea3c82cdd67f65f0596
We can always rename the field if we actually use it.
]
[Avoid accidentally running darcs-test on installed darcs.
Eric Kow <kowey at darcs.net>**20101017142317
Ignore-this: 986cef89265171a3415f155fe4e74260
]
[Optional --test-dir for darcs-test (for troubleshooting failed tests).
Eric Kow <kowey at darcs.net>**20101017140509
Ignore-this: b9a976a1ba46f7b5dced6d33c010161a
This is so you can look at test directory to figure out what went wrong.
]
[Tidier announcement for subcommute unit tests.
Eric Kow <kowey at darcs.net>**20101018224015
Ignore-this: 93628ba5160abf8470fb4e2c8d558653
]
[Mark sections in test.hs.
Eric Kow <kowey at darcs.net>**20101018141559
Ignore-this: c6246caab473ef215d903ba9dec20f84
]
[make progress message in pull less silly looking
Florent Becker <florent.becker at ens-lyon.org>**20101017085226
Ignore-this: 1089079298edeefb4aec9b536479cdcf
]
[Re-conditionalise setEnvCautiously
Ganesh Sittampalam <ganesh at earth.li>**20101101065509
Ignore-this: 6028944a9afd6b88b17c1ba219dbd83d
rolling back:
Fri Oct 1 23:01:49 BST 2010 Simon Michael <simon at joyful.com>
* hook env vars: clarify some conditional code
]
[hook env vars: rename defineChanges/definePatches for clarity
Simon Michael <simon at joyful.com>**20101001225602
Ignore-this: 28932a8613aa5785f9e4cd48ff004f6b
]
[hook env vars: clarify some conditional code
Simon Michael <simon at joyful.com>**20101001220149
Ignore-this: 950ea31d46c94c3cb9df8905c3e86503
]
[convert.sh should not be reserved to subjects of Her Majesty
Florent Becker <florent.becker at ens-lyon.org>**20101021154510
Ignore-this: b05c95d5ddba4b2fda5be0ded6a99bb6
]
[resolve issue1809: don't call modernizePatch during conversion
Ganesh Sittampalam <ganesh at earth.li>**20101016224848
Ignore-this: 884eedd93a6718c791494c995eedcc03
The call to modernizePatch was introduced to fix issue744, but:
(a) It seems to have been ineffective as it's only called for
patches where isMerger is true, so none of the patch transformations
can kick in.
(b) It had the apparently unwanted side-effect of completely disabling
any attempts to convert mergers into conflictors.
This patch reverts that, and adds some test material for the
'darcs convert' command.
]
[resolve issue734: --set-scripts-executable for "darcs dist"
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101025110843
Ignore-this: 15671e02277c10f4421b47378469b0a4
]
[Add darcs 2.5 to website
Reinier Lamers <tux_rocker at reinier.de>**20101030115320
Ignore-this: cd39e81cea002cdba709a04c7828c5cd
]
[Fix harness.sh to also work on windows.
me at mornfall.net**20101027060706
Ignore-this: 38cc37396c1294004de3c6300f7c3a52
]
[Avoid mkdir test, seems to throw off windows.
me at mornfall.net**20101026205710
Ignore-this: 6cea275b1aaa40bd94ca85a8e0a4c5db
]
[Do not use tar -f, it breaks on windows.
me at mornfall.net**20101026205439
Ignore-this: ebec7d5abd3948afacb290615930f21c
]
[Add missing FFI to LANGUAGE pragmas in some .hsc files.
me at mornfall.net**20101026145128
Ignore-this: 416af8f30a62d0cc89b51e903c6e4874
]
[Fix build when the HTTP library is not available.
Petr Rockai <me at mornfall.net>**20101027094301
Ignore-this: e0b5a3b815b0a3e2052b065c9101febf
]
[Fix patch382: darcs show tags --repo.
Eric Kow <kowey at darcs.net>**20101018070006
Ignore-this: 4cef691d6e2323f2c0820525feb062c3
I had fooled myself by using http://darcs.net for informal
testing when I also happened to darcs darcs repository.
]
[darcs show tags --repo (instead of --repodir).
Eric Kow <kowey at darcs.net>**20100902104617
Ignore-this: a258af0eb61f753b5988aae26145ee4c
]
[build test harness with witnesses and drop separate build
Ganesh Sittampalam <ganesh at earth.li>**20101008213021
Ignore-this: 43f5c9d14b038943c43cfd1ab74da6a0
]
[add witnesses to Darcs.Test.Unit
Ganesh Sittampalam <ganesh at earth.li>**20101008213020
Ignore-this: a32d47872418179e97aa53193d66acc
]
[add witnesses to Darcs.Test.Patch.Unit
Ganesh Sittampalam <ganesh at earth.li>**20101008213014
Ignore-this: 75ffb5781fecbce1bc4030d93509feb1
]
[add witnesses to Darcs.Test.Patch.Unit2
Ganesh Sittampalam <ganesh at earth.li>**20101008172329
Ignore-this: 878ed3be4ac86200edc0652f4c60e878
]
[abstract out functions with restricted types
Ganesh Sittampalam <ganesh at earth.li>**20101008172052
Ignore-this: eea7af82d71d97582a9d943399e2003a
]
[break Darcs.Test.Patch.Unit up to facilitate witnessing
Ganesh Sittampalam <ganesh at earth.li>**20101008165851
Ignore-this: b1996c62251999a3d3a3bd847cea1319
]
[add witnesses to Darcs.Test.Patch.Test
Ganesh Sittampalam <ganesh at earth.li>**20101004172617
Ignore-this: c41b79266788e3997125871b440c938b
]
[fix warnings
Ganesh Sittampalam <ganesh at earth.li>**20101004165056
Ignore-this: ae51af7f567c9d66fa06a6635dadaf23
]
[get rid of some unused instances
Ganesh Sittampalam <ganesh at earth.li>**20101004165055
Ignore-this: da31e64d2bc5dcd4603755873ddf272f
]
[fold simpleSmartMerge/smartMerge consistency checks into property
Ganesh Sittampalam <ganesh at earth.li>**20101004165053
Ignore-this: d77d99d601c0b934625103771b5bb44b
]
[re-enable simpleSmartMerge test
Ganesh Sittampalam <ganesh at earth.li>**20101004165052
Ignore-this: 949961ef6981b6c1e6791fff1ba5788e
]
[get rid of elegantMerge test
Ganesh Sittampalam <ganesh at earth.li>**20101004165051
Ignore-this: a9447d91ec992e9ad780b48c0f034441
Comparing the code, this test is equivalent to propSimpleSmartMergeGoodEnough
]
[Show instance for RL
Ganesh Sittampalam <ganesh at earth.li>**20101017084445
Ignore-this: 7a6517066d63e6a41246e260098f69a2
]
[fix a sed regexp in hidden_conflicts2.sh
Guillaume Hoffmann <guillaumh at gmail.com>**20101009101652
Ignore-this: 82c80480a59ff0756a298faac49f97de
]
[simplify smartMerge/simpleSmartMerge
Ganesh Sittampalam <ganesh at earth.li>**20101004165048
Ignore-this: 376e9c595aaa8a62fb89a19e9d5f70cd
They were redundantly returning one of their inputs
]
[Add flag for using repository packs
Alexey Levan <exlevan at gmail.com>**20101009120209
Ignore-this: d34ce6d1933bdc948c1ced149b51e212
]
[Use custom HTTP request for fetchFileLazyPS
Alexey Levan <exlevan at gmail.com>**20101009111021
Ignore-this: 7aceb99dd48936d9746ec63f56ba1196
]
[Moved inventories to patches tarball
Alexey Levan <exlevan at gmail.com>**20101009095453
Ignore-this: 664bc39763346e53376b83a034961532
]
[Make gzipped inventories parse correctly in readInventoryPrivate
Alexey Levan <exlevan at gmail.com>**20101009091640
Ignore-this: 82c537eedd9903dda4ee242a9bc48e9e
]
[Improve getting of packed repositories
Alexey Levan <exlevan at gmail.com>**20101006043345
Ignore-this: d033c64936164158d04380a6a6bf97af
]
[Remove warnings about name shadowing
Alexey Levan <exlevan at gmail.com>**20101006043035
Ignore-this: 2e49caec18292bf68edb5f3c33e1f52b
]
[Perform cleanup on exceptions in doOptimizeHTTP
Alexey Levan <exlevan at gmail.com>**20101006033620
Ignore-this: 8971cdbe1f1a8de2b65ae6a6be099e52
]
[Replace tmp- prefixes with meta- in packs
Alexey Levan <exlevan at gmail.com>**20100819210355
Ignore-this: 8edfd369978216575a9a1ec4318076cc
]
[get rid of some joinPatches calls
Ganesh Sittampalam <ganesh at earth.li>**20101006060156
Ignore-this: f56690f2452daf8394144d56f034ef62
]
[move conflict marking out into separate module
Ganesh Sittampalam <ganesh at earth.li>**20101005170326
Ignore-this: f361d691d22da1100e5ac2c9c5c9332
]
[remove unused export
Ganesh Sittampalam <ganesh at earth.li>**20101005170316
Ignore-this: 52812eba5de07170338aec8558879d69
]
[update some comments
Ganesh Sittampalam <ganesh at earth.li>**20101004165058
Ignore-this: 26e5afa7a519419e3c4685d6d6f9ff91
]
[replace some unexpected cases with failure
Ganesh Sittampalam <ganesh at earth.li>**20101004165049
Ignore-this: 7c3c50e2c75446e71b77e2bac639efed
]
[fail in branch that should be unreachable
Ganesh Sittampalam <ganesh at earth.li>**20101004165045
Ignore-this: 2a51d5aeec25269134a8a00dff28678f
]
[drop unused Eq instance for FL
Ganesh Sittampalam <ganesh at earth.li>**20101004165035
Ignore-this: 56fdad0ab03ebf68087fa9f96d525ab6
]
[get rid of some joinPatches calls
Ganesh Sittampalam <ganesh at earth.li>**20101004165015
Ignore-this: 2abc3f82de23f2e34cebf4c1f1e5c91d
]
[Move some Eq/Show instances to where they belong
Ganesh Sittampalam <ganesh at earth.li>**20101001212122
Ignore-this: 7740b3a54b3e4d9b991d6e152b88731d
This also means we can disable OverlappingInstances
]
[fix off-by-one error with Hunk patches in QuickCheck tests
Ganesh Sittampalam <ganesh at earth.li>**20100908060423
Ignore-this: 4f126758b77fc07a5734e45226e2cf07
It turns out the offsets are 1-based, not 0-based.
]
[Document _darcs/prefs/boring and include in manpage.
Eric Kow <kowey at darcs.net>**20100925071142
Ignore-this: c8ec96820c0762465d85d88bcce013e4
]
[get rid of commas in extension specifications
Ganesh Sittampalam <ganesh at earth.li>**20101005061931
Ignore-this: a1bd0b4078eb61ac4daa4c078cf5a7bd
]
[clean up use of language extensions
Ganesh Sittampalam <ganesh at earth.li>**20101005061744
Ignore-this: cc4cc485262c5e076329cf7064a09373
- minimise set declared in .cabal file
- make them consistent across all builds
]
[introduce type class for checkAPatch
Ganesh Sittampalam <ganesh at earth.li>**20101004165015
Ignore-this: 291aa2e83f44b4ef2718b8ef536dab71
]
[change hang into error when bad hunk encountered during resolution
Ganesh Sittampalam <ganesh at earth.li>**20100908060245
Ignore-this: 96b98588b54e20f228bbd9817d91a9ab
]
[include old text in conflict marks
Ganesh Sittampalam <ganesh at earth.li>**20100908054609
Ignore-this: 42aa3a9f115baef85d427f801f3a5846
]
[Resolve issue182: hidden darcs status alias for darcs whatsnew -ls
Eric Kow <kowey at darcs.net>**20100915210519
Ignore-this: 9ada08c78ea6e877083b56136ad46fd4
]
[Test for issue1923.
Eric Kow <kowey at darcs.net>**20101018132251
Ignore-this: 329356a1e357cac6acfeab8ff0fcf28a
]
[Solve issue1923: cache mechanism warns about sources outside your control
Adolfo Builes <builes.adolfo at googlemail.com>**20100917210653
Ignore-this: f1d720340b3ff8506c1501c11303ed5a
]
[Resolve issue1948: send BTS update emails as noreply@
Eric Kow <kowey at darcs.net>**20101016141307
Ignore-this: 611b31a8670a97f95084b8d8a2f19e21
1. This avoids confusion from pretending to be somebody we are not
(the patch author)
2. This allows roundup to detect emails from BTS/darcs integration
(because they would all come from a single email address).
]
[Distinguish between --context with and without arguments.
Eric Kow <kowey at darcs.net>**20100829095904
Ignore-this: 1e97df10d8c2bbc890946c4d524916aa
* darcs changes --context means just "output in the context format"
* darcs {get,send} --context=foo means get/send via context file foo
]
[hook env vars: haddock improvement
Simon Michael <simon at joyful.com>**20101001232909
Ignore-this: bbef4feba5977b66087f30edca207d52
]
[hook env vars: add some haddocks
Simon Michael <simon at joyful.com>**20101001215802
Ignore-this: 2b0c8e28f9ff61794bc3805bf424965e
]
[Remove misleading debug output.
Eric Kow <kowey at darcs.net>**20101001113217
Ignore-this: e5ce49b082c47eef6c2b6f8021e70e9
This debug output seems to only indicate that it succesfully *started* the
download, which is confusing because the download itself could fail.
]
[clean up OPTIONS_GHC usage
Ganesh Sittampalam <ganesh at earth.li>**20101001203601
Ignore-this: e001b3d26eb211c07540f9328600061a
no more -cpp or -fglasgow-exts
]
[fix warning about tab character
Ganesh Sittampalam <ganesh at earth.li>**20101005061826
Ignore-this: 20624e31fe2010755874ff7b4c7ab450
]
[require regex-posix >= 0.94.4 on windows to avoid link errors with with HP 2010.2.0.0
Simon Michael <simon at joyful.com>**20100914205831
Ignore-this: eb8b4dd8f6f77bd4014269dc8ca8ecdf
See http://trac.haskell.org/haskell-platform/ticket/137 . On windows we
now ensure a new enough version of regex-posix (which regex-compat uses).
]
[Improve error message when _darcs/inventory fallback check fails.
Eric Kow <kowey at darcs.net>**20100909194255
Ignore-this: c517f37cc1e05c05eef5295607f8b98a
One thing that can happen is permissions problems on hashed repositories
which makes darcs unable to read _darcs/format and therefore assume the
remote repository is old-fashioned. This extended explanation tries to
avoid confusing users. Thanks to Brent Yorgey for help with wording.
]
[HLint: use notElem.
Eric Kow <kowey at darcs.net>**20100915121147
Ignore-this: 3a218017c728412293bada9ce5b9ed70
]
[Haddock confusing naming for lastWord.
Eric Kow <kowey at darcs.net>**20100915105518
Ignore-this: 9a4c047949f456bac34ff279040de458
]
[write out tag before trying to optimize inventory
Ganesh Sittampalam <ganesh at earth.li>**20101004054713
Ignore-this: aebf3d7ace08cce188501432653fd2b7
This fixes 'darcs tag' for old-fashioned repos.
The original code seems obviously wrong, so it's hard to understand
why things only started breaking after this patch:
Sat Sep 11 19:53:55 BST 2010 Dmitry Astapov <dastapov at gmail.com>
* Resolve issue1942: fix the fix which ended up too strict due to unsealing.
(manually backpopting fix by Petr Rockai to mainline)
]
[More explicit punctuation to avoid ambiguity.
Eric Kow <kowey at darcs.net>**20100925093819
Ignore-this: ad2be70e6186f37f7e7c1234df0b89aa
]
[Update Makefile target for patch theory doc.
Eric Kow <kowey at darcs.net>**20100925093745
Ignore-this: 41efecc9e14fabc8263c25d98135de04
]
[Add commandProgramName field to DarcsCommand
Joachim Breitner <mail at joachim-breitner.de>**20100916180643
Ignore-this: 1200c9b51be2aa638b486f0f339521fe
In order to make the command handling more generic, the name of the program
(the executable) is now a field of DarcsCommand. It is used by the functions
which generate the help output.
]
[Avoid issue1599 timeout for people behind proxy servers.
Eric Kow <kowey at darcs.net>**20100917130901
Ignore-this: 88c48d5de2378a034fb8c9d010a7513a
]
[Tidy up issue1599 test a tiny bit.
Eric Kow <kowey at darcs.net>**20100917130515
Ignore-this: a429b44681ec77091e196bfad9d44ccb
]
[cut witnesses build down
Ganesh Sittampalam <ganesh at earth.li>**20100908060124
Ignore-this: e392234f8b1a562abd457fdfce8b2424
The library is now built with witnesses anyway so only the tests
need a separate build check.
]
[Tidy up test harness warnings.
Eric Kow <kowey at darcs.net>**20100901134549
Ignore-this: 136031c756fcae2a7cd1f76a5ec8b214
]
[Mark ssh test as skipped if REMOTE is not set.
Eric Kow <kowey at darcs.net>**20100913094132
Ignore-this: 58bd7bcc4dde75c9cf8131d3884bea26
]
[Move external and ssh tests to network directory.
Eric Kow <kowey at darcs.net>**20100913094048
Ignore-this: 961d6ac87c91bdfb8d4dc64c84afd643
]
[Make the tests a bit less verbose (do not print all of lib every time).
Petr Rockai <me at mornfall.net>**20100829171501
Ignore-this: 860df38824bc5fad37cc583ca893a6c9
]
[Set a $format variable in lib, depending on current repo format under test.
Petr Rockai <me at mornfall.net>**20100829171428
Ignore-this: eb53b469e40a6f0faa0da5a3d3071d06
]
[Resolve yet another darcs.cabal conflict.
Petr Rockai <me at mornfall.net>**20100903210833
Ignore-this: bc94980dc25b0ef8c6600777efc6342
]
[drop unnecessary import
Ganesh Sittampalam <ganesh at earth.li>**20100828112556
Ignore-this: a198ddfe3a7def52aa43e295250cde92
]
[move Darcs.Patch.Properties to Darcs.Test.Patch.Properties
Ganesh Sittampalam <ganesh at earth.li>**20100828112259
Ignore-this: 6f227d2693c0cfe2549dfc301100200e
]
[break up Darcs.Patch.Patchy and make Darcs.Patch.Named more self-contained
Ganesh Sittampalam <ganesh at earth.li>**20100828111250
Ignore-this: 45d8c2abee1e658e4041cff3f32bf922
Move class definitions out into their own modules and turn
Darcs.Patch.Patchy into a simple aggregator.
Move instances for Named into Darcs.Patch.Named.
]
[drop unnecessary import
Ganesh Sittampalam <ganesh at earth.li>**20100828110105
Ignore-this: 9afd40118fd5da714a365b001d977c18
]
[drop unnecessary superclass
Ganesh Sittampalam <ganesh at earth.li>**20100828105847
Ignore-this: 29b529d355f3f7fc4709782bd489fa34
]
[fix warning in Darcs.Test.Email
Ganesh Sittampalam <ganesh at earth.li>**20100828104854
Ignore-this: a3b968e226c34dd01a9770057ac53b35
]
[fix warning in Darcs.Test.Patch.Info
Ganesh Sittampalam <ganesh at earth.li>**20100828104840
Ignore-this: ee3565a554c6c95816be43881e3ff5b7
]
[drop unnecessary constraint
Ganesh Sittampalam <ganesh at earth.li>**20100828104820
Ignore-this: 3c112ec10a04e2bad52ac8f7e40b048d
]
[remove commented out imports
Ganesh Sittampalam <ganesh at earth.li>**20100828104810
Ignore-this: ed972c121c776729076b2160a5d25cc8
]
[remove unnecessary pragmas from Darcs.Patch.Match
Ganesh Sittampalam <ganesh at earth.li>**20100828104756
Ignore-this: a422eb1d3b00eb1832b72960df715b14
]
[remove unused import
Ganesh Sittampalam <ganesh at earth.li>**20100907052616
Ignore-this: e6398221e0999dfaa6321c04423af94a
]
[Fix misleading configuration documentation.
Eric Kow <kowey at darcs.net>**20100907194732
Ignore-this: cad1574acb861504531ad8cd79048296
It accidentally looked like it was saying ~/.darcs was a Windows setting.
]
[Accept issue1932: darcs add -qr . should not fail on filenames with ':'
Dmitry Astapov <dastapov at gmail.com>**20100825172835
Ignore-this: 24884784919f455a8f9b98dea2d750bf
]
[Document Darcs.Patch.Info.makeFilename.
Eric Kow <kowey at darcs.net>**20100904103153
Ignore-this: 4eb3f6f8e3dab9b1f6b8fda47c1dd3
]
[add some haddock to Darcs.Witnesses.Eq
Ganesh Sittampalam <ganesh at earth.li>**20100903181255
Ignore-this: d74343eb72dacfb027f7c83b8a312eb2
]
[drop unused concatReverseFL
Ganesh Sittampalam <ganesh at earth.li>**20100903180019
Ignore-this: 955da64a50d9bc2a248e614d73ee952c
]
[drop unused headRL
Ganesh Sittampalam <ganesh at earth.li>**20100903175722
Ignore-this: f574211dbac23a64e727bb00242ee5c3
]
[drop unsafeMap_l2f
Ganesh Sittampalam <ganesh at earth.li>**20100903174855
Ignore-this: 6f959a0ffe12580fe38ddd35efc6d703
]
[drop unused filterE/Proof
Ganesh Sittampalam <ganesh at earth.li>**20100903172525
Ignore-this: fbaea445a392023ed8ed04c785a58f37
]
[Resolve issue1884: correct report about getting lazy repository
Alexey Levan <exlevan at gmail.com>**20100903175429
Ignore-this: b533c7d2c508ae33ef37a01faa7e0863
]
[Redefine Darcs.Commands.putInfo in Darcs.Repository
Alexey Levan <exlevan at gmail.com>**20100819195331
Ignore-this: 26b1130296f8eef6840837b2abf03912
]
[Remove now-superfluous cleanup step from EXAMPLE.sh
Eric Kow <kowey at darcs.net>**20100903084324
Ignore-this: 65462aa06547454ef9dbf11f808a0f5
Hooray for the new harness!
]
[Use lib in tests/issue257.sh.
Petr Rockai <me at mornfall.net>**20100902142129
Ignore-this: 1ba89ebcf1ef1d047129f9ca89ebdb58
]
[Remove the now-defunct Distribution directory.
Petr Rockai <me at mornfall.net>**20100829191717
Ignore-this: a4af7e0874f6b189dc245b1c778dbba6
]
[Add a tarball of a small oldfashioned repository for testing purposes.
Petr Rockai <me at mornfall.net>**20100829174448
Ignore-this: c096717668219f6e821707c5aa8c3ac4
]
[Update haddock.
Petr Rockai <me at mornfall.net>**20100717084048
Ignore-this: 47776265ebb4ba397727be5e8abe982b
]
[Use more meaningful names for seal_up_patches' parameters.
Petr Rockai <me at mornfall.net>**20100715085938
Ignore-this: e467f879f05f8a0d62fac26d19babc3b
]
[Wibble path building in Repository.Prefs.
Petr Rockai <me at mornfall.net>**20100714175208
Ignore-this: 6664f81e589a919baa9e293e455cea51
]
[Document cultural reference in Darcs.Witnesses.WZipper.
Eric Kow <kowey at darcs.net>**20100902192731
Ignore-this: f88c4b9d1fc6e00f513ded7b5769995f
]
[Jot down a few more tips about testing.
Eric Kow <kowey at darcs.net>**20100826171452
Ignore-this: 93560f7f12d291899f1b3b0cc6740909
]
[Add MIT boilerplate to all public domain scripts.
Eric Kow <kowey at darcs.net>**20100809125302
Ignore-this: 92cd27ff71d7af5f4318133de3340acd
The goal is to limit Darcs authors' liability.
]
[Update issue1503 network test for new harness.
Eric Kow <kowey at darcs.net>**20100902162701
Ignore-this: acde8373c08373f589a39653bc622427
Apparently, the new harness treats network test the same as regular
tests (by copying them straight to a standalone directory)
]
[Propagate the exit code of darcs-test to exit code of cabal test.
Petr Rockai <me at mornfall.net>**20100902140203
Ignore-this: cebf3b959529c4728988d3879aacb839
]
[Allow "output=plain" to be passed to cabal test.
Petr Rockai <me at mornfall.net>**20100902135800
Ignore-this: 9394ecd4cb3e1aed3ec591906786495b
]
[Suppress check for darcs-test in Setup.
Eric Kow <kowey at darcs.net>**20100902124521
Ignore-this: 6fe4a0badaa12ef5352286850e4f30a6
It is now always built.
]
[More portable executable names in Setup.
Eric Kow <kowey at darcs.net>**20100902124519
Ignore-this: 77abdc7a3549030566d438c162faa51e
]
[Update cabal file for new test-support paths.
Eric Kow <kowey at darcs.net>**20100902123719
Ignore-this: 94f4cf40b62dc857e55492a4c8afa16f
]
[Fix conflicts between darcs-test enabling and other cabal patches.
Eric Kow <kowey at darcs.net>**20100902095835
Ignore-this: 732c023fa9a6cb6b02fbd27741c7daa9
To my awareness:
- raising base package dependency
- dropping PatternSignatures
]
[Drop the "test" cabal flag and build darcs-test unconditionally.
Petr Rockai <me at mornfall.net>**20100829135623
Ignore-this: 9363f6325c308c32a5410f81362a5f01
]
[Fix a bug in cabal test argument parsing.
Petr Rockai <me at mornfall.net>**20100829171538
Ignore-this: 1eb65db930dd9248ab4b144d9f37fc29
]
[Make it possible to pass "threads=N" to cabal test.
Petr Rockai <me at mornfall.net>**20100829164545
Ignore-this: 48cae1e80315778ba2e84f05ff3bd80c
]
[Replace some developer links with a wiki page.
Eric Kow <kowey at darcs.net>**20100902135224
Ignore-this: a193af1b73b557b44c3af330327e9104
]
[Nicer patch counting mechanism for buildbot-try.
Eric Kow <kowey at darcs.net>**20100902103104
Ignore-this: f57bfc394ce4d053f0fc11bf1014536d
]
[Use unified diff for copying unrecorded changes in buildbot-try.
Eric Kow <kowey at darcs.net>**20100902101247
Ignore-this: 29f9707e442ca9c29579bf4cd8596689
This avoids a "patch: **** Only garbage was found in the patch input."
]
[Wrap buildbot-try with ssh-agent.
Eric Kow <kowey at darcs.net>**20100902100403
Ignore-this: 72f399a232c853227fc7015d1963495f
]
[URL.hs: fix a typo in import list
Jason Dagit <dagit at codersbase.com>**20100902064509
Ignore-this: 3d1a269a53195e5d372290ff00c2b946
]
[Fix for issue1932
Dmitry Astapov <dastapov at gmail.com>**20100825173045
Ignore-this: 68db2c42ef376307271a7f609e62481c
Do _not_ check for colons in "isRelative" - everything is covered
inside Add.lhs and governed by use of "--reserved-ok" option.
Replace isRelative and isAbsolute with functions from System.FilePath
for correct handling of platform specifics.
]
[Bump shellish dependency to >= 0.1.1, to avoid the infinite loop in rm_rf problem.
Petr Rockai <me at mornfall.net>**20100829134747
Ignore-this: 4bbf50f15d3cabea8f38893bc6844340
]
[Flip "cabal test" over to use darcs-test to run the shell tests.
Petr Rockai <me at mornfall.net>**20100827220454
Ignore-this: dc18d078ee7e34eaddcd82bf2599349d
]
[Add a --network option to darcs-test to run the network shell tests.
Petr Rockai <me at mornfall.net>**20100827220414
Ignore-this: 3aaa854e05cb5274410666212aa714ab
]
[Couple of improvements in the new shell test runner.
Petr Rockai <me at mornfall.net>**20100827220353
Ignore-this: e4b0e3f6b8470c5d53cc4eeecf562920
]
[Implement a test-framework-based shell harness.
Petr Rockai <me at mornfall.net>**20100827204448
Ignore-this: 819e700538a38bf35e04eb7656b3c151
This merges the two test drivers we previously had, "unit" and
Distribution.ShellHarness (used directly by Setup), into a single "darcs-test"
binary. This patch only goes half the way, though: the new shell harness is not
used by "cabal test" yet. That will come as a separate patch.
]
[send prints remote address right away
Guillaume Hoffmann <guillaumh at gmail.com>**20100822154314
Ignore-this: bd428e547137caa1a2b9862981e63085
]
[Use long titles for more stable URLs in user manual.
Eric Kow <kowey at darcs.net>**20100812104830
Ignore-this: 98a8e736b4d2b784118075962c9af6e0
]
[Changes.lhs: remove extra (and weird) case
Jason Dagit <dagit at codersbase.com>**20100822122659
Ignore-this: 3c12488f0a953e7d79edfafbd1c74ffc
]
[TheComands.hs: fix prelude import
Jason Dagit <dagit at codersbase.com>**20100828170634
Ignore-this: 8b2edfaea4ba634f63a227ee9ce1a13e
]
[Fix conflict between base and hashed-storage deps.
Eric Kow <kowey at darcs.net>**20100828194949
Ignore-this: 7974cd005f4200156c8fad220599eba4
]
[Remove PatternSignatures as we currently require GHC 6.10 and up.
Eric Kow <kowey at darcs.net>**20100723131843
Ignore-this: 567dcb5da237e9876e6f590f062da42e
]
[Raise base package dependency to >= 4 (keeping it < 5).
Eric Kow <kowey at darcs.net>**20100825152135
Ignore-this: 944cdfa0ea7f940a4a52f24dd9bf6c5b
We now require GHC 6.10.x or higher.
]
[add missing V2.hs
Ganesh Sittampalam <ganesh at earth.li>**20100827061307
Ignore-this: 400c1d5662fc995498fea48512c5c055
]
[move some Patchy instances into a separate file
Ganesh Sittampalam <ganesh at earth.li>**20100826232436
Ignore-this: bd7663370d6b2ab5cd0ecd89ce573b8b
]
[don't export Patch/RealPatch from Darcs.Patch
Ganesh Sittampalam <ganesh at earth.li>**20100826155238
Ignore-this: b419b6e01801631fb617fa2bbcf7e0e3
This gets us closer to separating specific implementations from
the interface.
]
[split up the Commute class
Ganesh Sittampalam <ganesh at earth.li>**20100826135850
Ignore-this: f0e77899afed11193776aa998547824e
Note that Prim is not an instance of the new Merge class,
which reflects reality as Prims cannot always be merged.
]
[get rid of unnecessary superclass
Ganesh Sittampalam <ganesh at earth.li>**20100826133602
Ignore-this: 8d4ed17afe597610594376019ed4d282
]
[drop some exports from Darcs.Patch
Ganesh Sittampalam <ganesh at earth.li>**20100826132758
Ignore-this: be40ab5ed92a8e7f6be40928e73ad414
Made imports go directly to the internal modules where necessary,
on the grounds that it's better to be explicit when making use of
internal operations.
]
[break Patch-specific bits of Show and Viewing out into V1
Ganesh Sittampalam <ganesh at earth.li>**20100826125537
Ignore-this: 52f166938cef87f20d537cb0fa8b4cb7
]
[get rid of apparently unnecessary instance dependency
Ganesh Sittampalam <ganesh at earth.li>**20100826123346
Ignore-this: 20618e90cae5721e1d6c58f505bc51c2
showContextPatch for Prim was sometimes constructing a Patch
(with the PP constructor) for no apparent reason, as the end result
would be to show the underlying Prim again.
]
[move v1 Patch applying into separate module
Ganesh Sittampalam <ganesh at earth.li>**20100826122140
Ignore-this: 354af0908b377a81e06fe2312ab97ce0
]
[move v1 Patch reading into separate module
Ganesh Sittampalam <ganesh at earth.li>**20100826122137
Ignore-this: 7c99ff9c15a9041b9bfc1d1f3b0c3214
]
[Darcs.Patch.Core now just contains Named
Ganesh Sittampalam <ganesh at earth.li>**20100826110141
Ignore-this: 5768341309317a826a0edbdf07ae6379
]
[move Named instances out of V1.Commute
Ganesh Sittampalam <ganesh at earth.li>**20100826110140
Ignore-this: 4cd087b3e44d5faea1336c002661bdcf
]
[move Darcs.Patch.Commute into V1 namespace
Ganesh Sittampalam <ganesh at earth.li>**20100826110134
Ignore-this: 749ac611fd08c6f592b590e0354ad8dd
]
[move RealPatch into its own namespace
Ganesh Sittampalam <ganesh at earth.li>**20100826104437
Ignore-this: 36156baeca5f13590dceb3446678b55f
]
[remove unused re-export
Ganesh Sittampalam <ganesh at earth.li>**20100826104437
Ignore-this: 5e054202fb305236510fef9e2952024d
]
[start on moving v1 patch code into its own namespace
Ganesh Sittampalam <ganesh at earth.li>**20100826104427
Ignore-this: eec8240329032f6f255d10eb041a8e9e
]
[fix warnings in Darcs.SelectChanges
Ganesh Sittampalam <ganesh at earth.li>**20100826095122
Ignore-this: 1c777fb9d928dae858a24efddfef98fd
]
[fix warnings in Darcs.Commands.Apply
Ganesh Sittampalam <ganesh at earth.li>**20100826095113
Ignore-this: 1b76a37c73761798baa56bfde9c9d708
]
[fix warnings in Darcs.Witnesses.Ordered
Ganesh Sittampalam <ganesh at earth.li>**20100826094553
Ignore-this: 1c5efae9c25b51df7fd1331ea59f2ebe
]
[fix warning in Darcs.Repository.Repair
Ganesh Sittampalam <ganesh at earth.li>**20100826094545
Ignore-this: b85f58cb0d4fa4240779aa5c59914f0d
]
[fix warning in Darcs.Patch.Depends
Ganesh Sittampalam <ganesh at earth.li>**20100826094536
Ignore-this: 76788f91e654c3beb5ea1e17cf11ff45
]
[fix warning in Darcs.Patch.Choices
Ganesh Sittampalam <ganesh at earth.li>**20100826094519
Ignore-this: 6649d874067019ca62f759e01740f1c6
]
[fix warnings in Darcs.Commands.Send
Ganesh Sittampalam <ganesh at earth.li>**20100826094436
Ignore-this: aab88b0280ddb1c81f6457741abd86d6
]
[fix warnings in Darcs.Commands.Record
Ganesh Sittampalam <ganesh at earth.li>**20100826094428
Ignore-this: 75cc3c3c905309ca60d6282f969ed15f
]
[fix warnings in Darcs.Commands.Push
Ganesh Sittampalam <ganesh at earth.li>**20100826094247
Ignore-this: f925114d28f55010b179fd5109767bf4
]
[fix warnings in Darcs.Commands.Pull
Ganesh Sittampalam <ganesh at earth.li>**20100826094224
Ignore-this: c139ae114740ec0503bdeffa18d568ef
]
[fix warnings in tests
Ganesh Sittampalam <ganesh at earth.li>**20100826092245
Ignore-this: ed89d27a3d77fe9a60b87a8087e81351
]
[Depends.hs: add back catch all case to silence warning
Jason Dagit <dagit at codersbase.com>**20100825080244
Ignore-this: 627e1db4ae434f24ada1e158819eb2ff
]
[Fix issue1926 headers.
Eric Kow <kowey at darcs.net>**20100826162703
Ignore-this: 8badc1a7cda103f90084b55efcf65e4b
]
[Accept issue1926: amend-record ignores --index option.
Iago Abal <iago.abal at gmail.com>**20100820001354
Ignore-this: 90956b2aeb8f3ddedbc6a293e0d942dc
]
[Avoid cascading permissions error in issue612 test.
Eric Kow <kowey at darcs.net>**20100826161551
Ignore-this: b056c9686e8d0b8345c8f7ce65280a7a
The test fails, leaving behind an unwritable directory.
]
[fix unit test imports
Jason Dagit <dagit at codersbase.com>**20100825100722
Ignore-this: 129c545cc4dd973ff4cf754f4b69d5f0
]
[clean up Witnesses imports across codebase
Jason Dagit <dagit at codersbase.com>**20100825095657
Ignore-this: d9696059af803c483f204291eea89d14
]
[ArgumentDefaults.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825084359
Ignore-this: a23fd53ef800c1f2cae3917545b256d1
]
[Commands/Put.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825084340
Ignore-this: e13fc3447482e7b87e416f40b98eac12
]
[Commands/Pull.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825083920
Ignore-this: 5f6e6dc88fb6cd9093e6f8ad1d8329d5
]
[Commands/Unrevert.lhs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825083536
Ignore-this: 2bb11aeaee05c82eec5b55e516f76283
]
[Commands/Unrecord.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825083412
Ignore-this: 25fd54bd955aca1a18cb39c152e7ea38
]
[Commands/Send.lhs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825083244
Ignore-this: 1faa62977b78e48f47029a4867c6a38e
]
[Commands/Record.lhs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825083111
Ignore-this: bc229dd308ef6f77826ebc31811e65cf
]
[Commands/Apply.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825082948
Ignore-this: 358cb1b5c897e97fbf46285efd9e73c7
]
[SelectChanges.hs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825082701
Ignore-this: 29e6306b93f85ec52d29f46cf0f54d28
]
[Annotate.lhs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825081814
Ignore-this: 71c18cdd5c8fffb489245082fb797132
]
[Population.hs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825081621
Ignore-this: 444a9343bcdf7b52bd5cf4312562424f
]
[ShowFiles.lhs: rename shadowed binding
Jason Dagit <dagit at codersbase.com>**20100825081508
Ignore-this: 1466870bbca19cee11d38a0c9ed2de01
]
[Get.lhs: remove redundant import
Jason Dagit <dagit at codersbase.com>**20100825081324
Ignore-this: f5366f35d77658679b49438aaf3d72b3
]
[Commands/Diff.lhs: remove redundant import
Jason Dagit <dagit at codersbase.com>**20100825081227
Ignore-this: b6f2943dc58bf9a17381cf837c806f9f
]
[Match.lhs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825081058
Ignore-this: fa009342dac6474b59c8fe65782bb497
]
[WhatsNew.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825080822
Ignore-this: 6f4178fe4d32155fd8d47a01d9d39e45
]
[HashedRepo.hs: clean up imports to fix warnings
Jason Dagit <dagit at codersbase.com>**20100825080704
Ignore-this: cf815b7eb616ba8a72046474b5d6bd24
]
[splitout parts of Darcs.Witnesses into new modules
Jason Dagit <dagit at codersbase.com>**20100825080336
Ignore-this: 695abc0f04daf229280cbcf5a0414381
This allows us to remove an Orphan Instances warning. I also look the
liberty of regrouping the Witnesses modules in the .cabal file while I
was adding new ones.
]
[TrackDown.lhs: fix warnings
Jason Dagit <dagit at codersbase.com>**20100825075132
Ignore-this: d41b7265690aeaf8e51f023ce783af3a
]
[ShowAuthors.lhs: remove redundant import
Jason Dagit <dagit at codersbase.com>**20100825074948
Ignore-this: 57381441eb6213ff318cf77218826bde
]
[MarkConflicts.hs: rename shadowed binding
Jason Dagit <dagit at codersbase.com>**20100825074944
Ignore-this: 60d749353045dca6e5d1c2ae3ba205bb
]
[Convert.lhs: remove redundant import
Jason Dagit <dagit at codersbase.com>**20100825074614
Ignore-this: 519e804e378f0ee12d722ea6957bc29
]
[Repository.hs: remove unused binding
Jason Dagit <dagit at codersbase.com>**20100825074459
Ignore-this: 29643af7b95406931015c6cbd375974e
]
[Merge.hs: remove redundant import
Jason Dagit <dagit at codersbase.com>**20100825074347
Ignore-this: b999405e2e36d804119ad469af862f59
]
[Checkpoint.hs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825074202
Ignore-this: ecadbbb93d9dee99284b61abe6a35a2b
]
[Internal.hs: remove warnings
Jason Dagit <dagit at codersbase.com>**20100825073952
Ignore-this: dbb1a38fd632fb0614bb5e34eb50a67a
]
[Info.hs: remove redundant imports
Jason Dagit <dagit at codersbase.com>**20100825073038
Ignore-this: 8469f5e4a347ce13312be3a06b198407
]
[URL.hs: fix warning about conditional import of debugFail
Jason Dagit <dagit at codersbase.com>**20100825071513
Ignore-this: 5a99ec5562f21149bb7fdc0787ba8bc3
]
[Diff.hs: remove unused bindings
Jason Dagit <dagit at codersbase.com>**20100822205621
Ignore-this: 4bcdec6c2d73e4ea2f0c12924b24eda2
]
[ReadMonads.hs: remove unused lexStrings
Jason Dagit <dagit at codersbase.com>**20100822205419
Ignore-this: fb814316841148aec8c194e43c1b7e29
]
[Global.hs: remove import to fix warning
Jason Dagit <dagit at codersbase.com>**20100822202309
Ignore-this: 5ee771f8f5b18c6959748ced7104b782
]
[move dropWhileFL to Ordered.hs
Jason Dagit <dagit at codersbase.com>**20100822201758
Ignore-this: 16e4e0bf9db14111e1720fc339c36118
]
[move dropWhileRL to Ordered.hs
Jason Dagit <dagit at codersbase.com>**20100822201325
Ignore-this: b35648bb19b81a3da95c0df9ebf5479f
]
[Accept issue1931: Fix issue612 test and mark it as failing.
Eric Kow <kowey at darcs.net>**20100825181318
Ignore-this: f62177c4ea5ba8ff637c4289a5e470fc
Jason Dagit points out in issue1931 that this interacts badly with
issue1898, and that fixing this bad interaction reveals a regression.
]
[Modernise issue612 test (use exit 200 to skip).
Eric Kow <kowey at darcs.net>**20100825180438
Ignore-this: e9865dc321ee2e4a77828890cf17a7bf
]
[ReadMonads.hs: rename State to ParserState
Jason Dagit <dagit at codersbase.com>**20100822192811
Ignore-this: c07450667ec5ee151d0da692f93cbbdd
]
[dramatically improve the parser performance
Jason Dagit <dagit at codersbase.com>**20100813055454
Ignore-this: 4f8912e2e8bf2504e4a6db064647f747
This puts the parser's performance back to where it was before the
move to a Parsec-like API. The cruxt of the fix was to implement
linesStartingWith as a primitive instead of implementing it using
other parser primitives. Several other tricks are included, such as
using strict tuples that are partially specialized.
]
[ReadMonad.hs: fix haddocks
Jason Dagit <dagit at codersbase.com>**20100811061208
Ignore-this: cd645b569c09bc928d5c048281be3599
]
[handle whitespace lexing more intelligently in Read.hs
Jason Dagit <dagit at codersbase.com>**20100811061027
Ignore-this: 50aa395330b18eebb7ff19fffb20ff1f
]
[tidy up Info.hs
Jason Dagit <dagit at codersbase.com>**20100809032821
Ignore-this: ac5e02c985e4002c3ebc0127e6323aa0
The comment about break no longer applies as break is no longer used.
Using choice instead of (<|>) keeps linesStartingWithEndingWith a
little prettier.
]
[tidy up Real.hs and refactor space lexing
Jason Dagit <dagit at codersbase.com>**20100809024422
Ignore-this: 1a9d28746e66829a93ca0bcf56a30bd
]
[tidy up peekforc
Jason Dagit <dagit at codersbase.com>**20100809022145
Ignore-this: 5ceeaa263cc9dbefcef3c024c543aa6a
]
[remove unused import
Jason Dagit <dagit at codersbase.com>**20100809022115
Ignore-this: b2da893f3898f025d8202e4ad0152f1d
]
[tidy up readPatches
Jason Dagit <dagit at codersbase.com>**20100809021522
Ignore-this: 5929ef7369d10eaeba00ed31bf1b3a71
]
[remove unneeded export
Jason Dagit <dagit at codersbase.com>**20100809020547
Ignore-this: f71c6afa72b83c045420fae722260a43
]
[optimize char parser
Jason Dagit <dagit at codersbase.com>**20100809020539
Ignore-this: 63d6f4d23bfd7be0909e56b7ebcde1f6
]
[tidy up linesStartingWith
Jason Dagit <dagit at codersbase.com>**20100809020457
Ignore-this: 545ff01a026e1c95dd9374e487eb99c5
]
[tidy up skipNewline
Jason Dagit <dagit at codersbase.com>**20100809020446
Ignore-this: e2f01a232b79206c3df0bc7677a05ce
]
[tidy up anyChar parser
Jason Dagit <dagit at codersbase.com>**20100809001850
Ignore-this: 98b7cfbe94e99a7642ed730b32fa924b
]
[remove unused word8 parser
Jason Dagit <dagit at codersbase.com>**20100809001809
Ignore-this: 91cf66b621630592915a59d45a821054
]
[tidy up readPatchInfo
Jason Dagit <dagit at codersbase.com>**20100808233424
Ignore-this: d9f216388b1ab16db67630281ff8893a
]
[improve interface of peekforw and bracketedFL
Jason Dagit <dagit at codersbase.com>**20100808201140
Ignore-this: a40baa17b36e603c386fb2f3ec445e2e
]
[accept issue1928: removing a file then adding a directory with the same name breaks
Ganesh Sittampalam <ganesh at earth.li>**20100820212601
Ignore-this: 1c78189df95320abe701a5b1bba6a227
]
[Restore obliterate output options.
Eric Kow <kowey at darcs.net>**20100815211308
Ignore-this: 7a561054370ff4ee87f89556e391e8dd
They were removed for Darcs 2.5, but we can keep them in unstable
and resolve the underlying bug instead.
rolling back:
Sun Aug 15 20:20:10 BST 2010 Reinier Lamers <tux_rocker at reinier.de>
* resolve issue1924: remove output options of obliterate
./tests/issue1909-unrecord-O-misses-tag.sh -> ./tests/failing-issue1909-unrecord-O-misses-tag.sh
M ./src/Darcs/Commands/Unrecord.lhs -3 +1
]
[Resolve conflict between 'Also set binary mode' duplicates.
Eric Kow <kowey at darcs.net>**20100815205035
Ignore-this: dd6c205afb649768a7be93e23e7defb
]
[Reframe Darcs.Match.matchFirstPatchset documentation.
Eric Kow <kowey at darcs.net>**20100813172244
Ignore-this: b78a42d6dcc56a12eedebc31c6e82641
This says the same thing but hopefully makes it easier to grasp.
]
[Improve module-level documentation for Darcs.Match.
Eric Kow <kowey at darcs.net>**20100813171053
Ignore-this: c58ea6edfd1e1a6f1e18d13c5dd70ff
]
[Move Darcs.Match module-specific haddock to module level.
Eric Kow <kowey at darcs.net>**20100813164759
Ignore-this: fad00c742590d0775a57bc3ec4878efe
Also correct last_match to secondMatch.
]
[Tweak complaint about DARCS_CONNECTION_TIMEOUT.
Eric Kow <kowey at darcs.net>**20100812114200
Ignore-this: a8b968847283d5e726f95285db8a418b
]
[Add environment variable DARCS_CONNECTION_TIMEOUT
builes.adolfo at googlemail.com**20100811212121
Ignore-this: a9d945925956f1c9d3c27d9e02b66de6
]
[Tighten up section on per-repository caches a bit.
Eric Kow <kowey at darcs.net>**20100812112056
Ignore-this: c16eb0d0a85a18f75dfae4be5b2780c
Particularly, we want to avoid mixing in the notion of conflicts,
which could confuse users.
]
[Adding information about cache handling to manual
builes.adolfo at googlemail.com**20100811200211
Ignore-this: 3a794fa6509c0b454f89b8552b2a19cd
]
[Tweak title case for repository formats chapter for consistency.
Eric Kow <kowey at darcs.net>**20100812103910
Ignore-this: 895e769be91810a2cfd9c475541d4f08
]
[Add DARCS_CONNECTION_TIMEOUT info to user manual
builes.adolfo at googlemail.com**20100811190100
Ignore-this: cd46eca91eccf1c9d3a5643c39cec5df
]
[Correct error code for curl operation timeout
builes.adolfo at googlemail.com**20100810215522
Ignore-this: 26067bd441b2b7fabaadce67851f0ef9
]
[Adding some haddock to Cache.hs
builes.adolfo at googlemail.com**20100810215116
Ignore-this: 34560d0bfcf1da1690742421b835caf
]
[remove redundant imports in Patchy and Real
Jason Dagit <dagit at codersbase.com>**20100807160837
Ignore-this: 2babfb43cb1f340876ae9ce914c1a454
]
[fix conflict in Bundle
Jason Dagit <dagit at codersbase.com>**20100807160542
Ignore-this: 1bdbe27903b8f464838ab97b9c3df12f
]
[remove try combinator from ReadMonads
Jason Dagit <dagit at codersbase.com>**20100807160342
Ignore-this: 80bb069e6744788d69d8cec5eb1a438a
]
[micro optimizations to parser code
Jason Dagit <dagit at codersbase.com>**20100807160148
Ignore-this: 876d06693dca962b60f9a81740978765
These micro-optimizations should always be safe; prefering ByteString
over String and reducing packing/unpacking.
]
[remove all uses of try from parser code
Jason Dagit <dagit at codersbase.com>**20100807153421
Ignore-this: 904f9415cf9b0a7f773a6b9b7b099007
]
[ReadMonads no longer exports maybeWork fix other modules to match
Jason Dagit <dagit at codersbase.com>**20100725175120
Ignore-this: 437b41f08ca584d3ce0fc45cae7f207d
]
[refactor Read to not rely on 'work'
Jason Dagit <dagit at codersbase.com>**20100725163359
Ignore-this: c2ed2d0babfff2a22c3cb3918dcac78a
]
[ReadMonads no longer exports myLex, clean up imports in Real
Jason Dagit <dagit at codersbase.com>**20100725144618
Ignore-this: 7e305152e13b0a6b175c04e49ea1bd5
]
[refactor Read to use myLex'
Jason Dagit <dagit at codersbase.com>**20100725144403
Ignore-this: aa7f97c4f2661d96615294add1ced7f8
]
[ReadMonads no longer exports alterInput and clean up a few warnings
Jason Dagit <dagit at codersbase.com>**20100725142911
Ignore-this: 429ca05040f2ff94f7cbbde595f2b5de
]
[cleanup import list of Patchy
Jason Dagit <dagit at codersbase.com>**20100725141855
Ignore-this: 7b096029f7c4521e924a619d09752515
]
[remove peekInput from Real. peekInput no longer exported from ReadMonads
Jason Dagit <dagit at codersbase.com>**20100725141605
Ignore-this: c49bf70941372ba9241f13f088371f5c
]
[refactor Patchy to not use peekInput
Jason Dagit <dagit at codersbase.com>**20100725135658
Ignore-this: 853181469c09b52a5b8628a2f0dc8546
]
[refactor Read and ReadMonads to remove peekInput from Read
Jason Dagit <dagit at codersbase.com>**20100725133132
Ignore-this: 787c8b8f3b5584472cfa4f83db671fde
]
[add utility functions to ReadMonads
Jason Dagit <dagit at codersbase.com>**20100725120651
Ignore-this: 16edfdb6bb5c8c24600865854263e897
The intention of these functions is that in the future we will be able
to use more conventional notation to express parsers in the darcs source.
]
[tune the patch parser
Jason Dagit <dagit at codersbase.com>**20100725085610
Ignore-this: 869bb399d759f19b1a2fdbb466743d17
This patch is based on a few observations:
* alterInput (const foo), completly replaces the parser's input
* after peekInput, the above trick avoids redundant processing
* best to leave a packed ByteString packed
]
[Resolve issue1908: try to create a global cache before checking its availability.
Petr Rockai <me at mornfall.net>**20100808122419
Ignore-this: a93e6f5d4a1272fc49341236820a9833
]
[Add a "buildbot-try" script to contrib that submits local changes to buildbot.
Petr Rockai <me at mornfall.net>**20100808133328
Ignore-this: 96e90b4581df1f297f423611d64c7
]
[Skip testing of issue1599 on old-fashioned repos.
Petr Rockai <me at mornfall.net>**20100808123648
Ignore-this: 2bfa977b37c63dc22c8024994197d0af
]
[Test for issue1599: expire unused caches
builes.adolfo at googlemail.com**20100807211143
Ignore-this: 8b77c20113c6b1d18019810ff7e11c3d
]
[Fail more verbosely in issue1879-same-patchinfo-uncommon.sh.
Petr Rockai <me at mornfall.net>**20100808105641
Ignore-this: 88665b641ab15527c37c39b1bd78a772
]
[Also set binary mode on stderr (we already had stdin/stdout).
Petr Rockai <me at mornfall.net>**20100808095353
Ignore-this: a3c37a0fb16fd27da1f47ee101d07295
]
[Resolve issue1530: allow user to pick from multiple email address.
Eric Kow <kowey at darcs.net>**20100718113353
Ignore-this: 531e6c9498f9155c1a8f926ee56a68e3
If your global authors pref has more than one line in it, Darcs will
prompt you something like:
You have saved the following email addresses to your global settings:
1. Fred Bloggs <fred at example.net>
2. Fred Bloggs <fred at home.example.tld>
3. BLOGGS Fred <fbloggs at example.com>
4. Other
Please select an email address for this repository.
]
[Helper Darcs.Utils.askUserListItem to select from an arbitrary list.
Eric Kow <kowey at darcs.net>**20100718112610
Ignore-this: 1583cecc95940234ea5703b01094afcb
]
[Add a simple test for http get with packs.
Petr Rockai <me at mornfall.net>**20100804190930
Ignore-this: cab6334359dbf54c3087e0619d8af4b4
]
[Add a simple non-network test for darcs get over http.
Petr Rockai <me at mornfall.net>**20100804190927
Ignore-this: c3545fe52f79ce9ae720499e381f3823
]
[Resolve issue 1599: automatically expire unused caches
builes.adolfo at googlemail.com**20100807003339
Ignore-this: c12f0cd04794e2db03445b71815b9e3a
]
[resolve issue1896: enable witnesses for library
Ganesh Sittampalam <ganesh at earth.li>**20100721053731
Ignore-this: 5209e15b5d2c446eea5df2fe1fe700b5
]
[Undo an edit to the issue1829 test, since the original was clearer.
Petr Rockai <me at mornfall.net>**20100806131253
Ignore-this: 925c73124e2b3d17239ccb7c47578f19
]
[Add a test for issue1829 by Ganesh & Ian.
Petr Rockai <me at mornfall.net>**20100806125230
Ignore-this: 7e11a7b4b54f189e1864952ff048f0fb
]
[Cut functions Darcs.Utils.putStrLnError and putDocLnError.
Eric Kow <kowey at darcs.net>**20100718102621
Ignore-this: 92c29385add92fb7b875342842432b5a
]
[Tidy Darcs.Utils exports.
Eric Kow <kowey at darcs.net>**20100718101900
Ignore-this: 78740886b92947d941f0e3baa86ba3f2
]
[switch homepage to two-column format ala xmonad.org
Guillaume Hoffmann <guillaumh at gmail.com>**20100805134439
Ignore-this: 21fa11e338fd9064b526f96c2f5be12
]
[Remove a couple of redundant type variables from foralls.
Petr Rockai <me at mornfall.net>**20100806085630
Ignore-this: 552924bfd0cf15cd9c5922a88ae282f9
]
[Fix missing type signature in Darcs.Arguments.
Eric Kow <kowey at darcs.net>**20100726134237
Ignore-this: 8f69ae4defc489d4a4ec9c5734fa2376
]
[Fix warnings in Darcs.Repository.State.
Eric Kow <kowey at darcs.net>**20100723134611
Ignore-this: 5a7c4a33c95ba3285721d0ade56adf1b
]
[Fix warnings in Darcs.Repository.InternalTypes.
Eric Kow <kowey at darcs.net>**20100723134556
Ignore-this: 66a361e0ff4b1a0c616fb11dafc6467c
]
[Fix warnings in Darcs.Repository.HashedIO.
Eric Kow <kowey at darcs.net>**20100723134533
Ignore-this: af2a60a5bf64d53240dc4498696c7a42
]
[Fix warnings in Darcs.Repository.DarcsRepo.
Eric Kow <kowey at darcs.net>**20100723134515
Ignore-this: 66f45d925ab9a7bce4c6e69ded8803fe
]
[Fix warnings in Darcs.Patch.Prim.
Eric Kow <kowey at darcs.net>**20100723134501
Ignore-this: dfd3b36b4b07e6de3b558073ac6bbe27
]
[Fix redundant import warning in Darcs.Patch.Patchy.
Eric Kow <kowey at darcs.net>**20100723134447
Ignore-this: 3fa7ffaf1b8098c4c0793c3ccc5ecb36
]
[Fix redundant imports in Darcs.Patch.Commute.
Eric Kow <kowey at darcs.net>**20100723133540
Ignore-this: 1c6919da737a8fd265a5dde9e94bbf35
]
[Fix shadow warning in Darcs.Patch.Choices.
Eric Kow <kowey at darcs.net>**20100723133357
Ignore-this: 88183e55fcac7c9fa2372f35decf643f
]
[Fix redundant imports in Darcs.Patch.Apply.
Eric Kow <kowey at darcs.net>**20100723133239
Ignore-this: dbf30f383e7a0684ca2b9cf9dcd50fb7
Likely due to setScriptsExecutable refactor.
]
[Fix RemoteDarcs related imports warning in Darcs.Flags and Darcs.RemoteApply.
Eric Kow <kowey at darcs.net>**20100723132408
Ignore-this: f944bbc547fa4f8e1a70c8c3539ce6bc
]
[Fix deprecation warning on GHC.Handle in Exec module.
Eric Kow <kowey at darcs.net>**20100723131847
Ignore-this: 12a57c2a78af7d2c6428ec544cd09f98
It looks like it was deprecated in GHC 6.12 along with the
Unicode-oriented rewrite.
]
[Re-enable packs and optimize --http.
Petr Rockai <me at mornfall.net>**20100804185357
Ignore-this: f86b0ea0c1008dbd173c7b8145be6803
]
[Minimize the number of packed inventories
Alexey Levan <exlevan at gmail.com>**20100802035445
Ignore-this: 1f3d28bece5b29d599ea97be9bba5424
]
[Use cache while getting a packed repository
Alexey Levan <exlevan at gmail.com>**20100802024914
Ignore-this: 33e44bdfce82d89fd243e7d628ce2c34
]
[Hardlink files while getting a packed repository
Alexey Levan <exlevan at gmail.com>**20100801050349
Ignore-this: 8e6aa73b3a0cc84812d44beaaea701dd
]
[Add pronoun to english module
builes.adolfo at googlemail.com**20100803131432
Ignore-this: 707096c1b8c9d0328524cb85ea76193e
]
[Handle English nouns that end in y.
builes.adolfo at googlemail.com**20100724172717
Ignore-this: 49eed82e5949fc0d8e7d2775e9fd50c0
]
[Make the "error applying hunk" error a lot more readable (and useful).
Petr Rockai <me at mornfall.net>**20100727215711
Ignore-this: d748d2632528d8e95453cb8cab76cd67
]
[Haddock promptYorn.
Eric Kow <kowey at darcs.net>**20100718092334
Ignore-this: 35ea778f5a5e44b8fb08a1b340b6b8a0
]
[Add header to issue1790 test and make it follow convention more.
Eric Kow <kowey at darcs.net>**20100728142928
Ignore-this: 29e6d64c5f3089ff6b7e081da5f853a4
]
[Accept issue1790: darcs send --context foo
Eric Kow <kowey at darcs.net>**20100728142602
Ignore-this: cd5d7f148d32ddbcea8d8cbb2282c2ea
Submitted by Loup Vaillant.
]
[Modernise System.Cmd import in Distribution.ShellHarness.
Eric Kow <kowey at darcs.net>**20100725220631
Ignore-this: a785da33c6089635da687a9bfe957c2b
]
[Restore looking for version number in exact-version context dump.
Eric Kow <kowey at darcs.net>**20100726114810
Ignore-this: e18459c582c12c2e77b630f096f66190
rolling back:
Sun Jul 11 13:08:54 BST 2010 Reinier Lamers <tux_rocker at reinier.de>
* Don't look for version number in exact-version context dump
Petr says it masks a bug in the release tarballs.
]
[rename readPatchIds to better describe what it does
Jason Dagit <dagit at codersbase.com>**20100723064832
Ignore-this: aa207726cbe8894aab41c17bd01ee6ca
]
[move readPatchIds to Darcs.Patch.Info
Jason Dagit <dagit at codersbase.com>**20100723064511
Ignore-this: 53f620c0f5ffda0ffd82693c27a70235
]
[remove duplicate code, readPatchIds
Jason Dagit <dagit at codersbase.com>**20100723063526
Ignore-this: a1950afa8385b04aa9c03435e4c152cb
]
[Slightly fix context generation in Setup.
Petr Rockai <me at mornfall.net>**20100722111410
Ignore-this: eb3b6637f24d62332c9452a3c4143f39
]
[Fix "head: empty list" bug in Darcs.Flags.RemoteDarcs.
Petr Rockai <me at mornfall.net>**20100715123140
Ignore-this: fa172627824eb3937cad63223026db9e
]
[Use Compression more widely, suppressing further [DarcsFlag] uses.
Petr Rockai <me at mornfall.net>**20100715003449
Ignore-this: d582d3bc381e73a964127aa3b87d0ffb
]
[Replace some [DarcsFlag] uses with newly introduced RemoteDarcs.
Petr Rockai <me at mornfall.net>**20100715003320
Ignore-this: d018b8c9b328228b9d283b7ad824eb15
]
[Remove --nolinks, since its scope and usefulness is very limited.
Petr Rockai <me at mornfall.net>**20100715000822
Ignore-this: 71427fcd09e59d5e4f443bcc4e5ca649
]
[Restore set-scripts-executable in trackdown --bisect.
Eric Kow <kowey at darcs.net>**20100717124222
Ignore-this: efa2e2bba8227542b5a63933f0748c9d
Note: Petr Rockai originally submitted this work as an amendment to
'Remove [DarcsFlag] parameters from apply.', but I must have
accidentally pushed the first version before he sent it. This patch
has the same effect as his amendment.
]
[Remove [DarcsFlag] parameters from apply.
Petr Rockai <me at mornfall.net>**20100715002249
Ignore-this: 707f8193561ce890dc6ed91d1001253b
]
[Remove [DarcsFlag] argument from unrecordedChanges.
Petr Rockai <me at mornfall.net>**20100714155059
Ignore-this: 4ba064584b4846b0ca26f6e3199a955a
]
[Fix up tests to refer to --name instead of --patch-name.
Petr Rockai <me at mornfall.net>**20100715102618
Ignore-this: 630cc96d79db0ee7af9c93fa3dbf5f15
]
[Resolve issue1883: rename --patch-name option to --name.
Eric Kow <kowey at darcs.net>**20100715101608
Ignore-this: 85ab2f1e23f8b561b323a9dfb94baa55
This is usually used in darcs record in shorthand (-m) form.
This rename is aimed at eliminating the confusion with the --patch
matcher, which bites amend-record and rollback users.
]
[get rid of join_patches
Ganesh Sittampalam <ganesh at earth.li>**20100712165037
Ignore-this: f9a5ca3dcc690e3c1ed9f6778b07f542
]
[stop using join_patches in Darcs.Test.Unit
Ganesh Sittampalam <ganesh at earth.li>**20100712165031
Ignore-this: 563bbbd15f9f51cdfc8063b9dd7f8b0b
]
[fix warning
Ganesh Sittampalam <ganesh at earth.li>**20100707061818
Ignore-this: 4b9e468819689cfc768befa8eabe4a4f
]
[fix unused variable warning
Ganesh Sittampalam <ganesh at earth.li>**20100707065338
Ignore-this: b2a8e05c985912a78dc71748361271b1
]
[fix name shadowing warning
Ganesh Sittampalam <ganesh at earth.li>**20100707065303
Ignore-this: 79ab8367f22333f79f66e82d5f631dac
]
[rename field names to avoid shadowing warnings
Ganesh Sittampalam <ganesh at earth.li>**20100707062714
Ignore-this: 6be53f3ee1ef4915bdd722153b0675e0
]
[fix unused code warning
Ganesh Sittampalam <ganesh at earth.li>**20100707062701
Ignore-this: 3475bca718b26e5056c3ad7448a346dc
]
[fix shadowing warnings
Ganesh Sittampalam <ganesh at earth.li>**20100707062324
Ignore-this: 45d7d142735754357e7b9c53eb2c25df
]
[fix warning
Ganesh Sittampalam <ganesh at earth.li>**20100707062320
Ignore-this: 33b1a5f0d5895f04257e4eb133addfc5
]
[fix warning
Ganesh Sittampalam <ganesh at earth.li>**20100707062315
Ignore-this: ad3da11afad97816fcd832baf25c311f
]
[remove dead code
Ganesh Sittampalam <ganesh at earth.li>**20100707062309
Ignore-this: a3462879709597df56cf28d239b71eef
]
[TAG 2.5
Reinier Lamers <tux_rocker at reinier.de>**20101024151805
Ignore-this: 1561ce30bfb1950a440c03371e0e2f20
]
More information about the darcs-devel
mailing list