[darcs-devel] A forwarded darcs patch

David Roundy droundy at abridgegame.org
Tue Apr 19 05:49:42 PDT 2005


The following patch was either unsigned, or signed by a non-allowed
key, or there was a gpg failure.

>From droundy at home.abridgegame.org Tue Apr 19 08:49:40 2005
Return-path: <droundy at home.abridgegame.org>
Envelope-to: droundy at abridgegame.org
Delivery-date: Tue, 19 Apr 2005 08:49:40 -0400
Received: from user-10mt71s.cable.mindspring.com ([65.110.156.60] helo=localhost)
	by abridgegame.org with esmtp (Exim 4.50)
	id 1DNsAc-0002s4-SN
	for droundy at abridgegame.org; Tue, 19 Apr 2005 08:49:40 -0400
Received: from droundy by localhost with local (Exim 4.50)
	id 1DNs5O-0007RW-E8
	for droundy at abridgegame.org; Tue, 19 Apr 2005 08:44:14 -0400
To: Darcs Conflicts Repo <droundy at abridgegame.org>
Subject: darcs patch: increase frequency of conflicts in quick... (and 1 more)
X-Mail-Originator: Darcs Version Control System
X-Darcs-Version: 1.0.2
DarcsURL: http://abridgegame.org/repos/darcs-conflicts
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
Message-Id: <E1DNs5O-0007RW-E8 at localhost>
Date: Tue, 19 Apr 2005 08:44:14 -0400

--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Sat Apr  9 15:35:55 EDT 2005  David Roundy <droundy at abridgegame.org>
  * increase frequency of conflicts in quickCheck tests.

Mon Apr 18 08:37:45 EDT 2005  David Roundy <droundy at abridgegame.org>
  * make test by default *compile* unit, and fix compile of unit.

--=_
Content-Type: text/x-darcs-patch
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!


New patches:

[increase frequency of conflicts in quickCheck tests.
David Roundy <droundy at abridgegame.org>**20050409193555] =

<
> {
hunk ./PatchTest.lhs 138
 arbpatch n =3D frequency [(3,onepatchgen),
                        -- (1,compgen n),
                         (2,flatcompgen n),
-                        (7,raw_merge_gen n),
+                        (20,raw_merge_gen n),
+                        (3, invert `liftM` (arbpatch n)),
                         (1,mergegen n),
                         (1,namedgen n),
                         (1,depgen n),
hunk ./PatchTest.lhs 234
                     (3,liftM (\n->1+abs n) arbitrary) ]
 =

 tokengen :: Gen String
-tokengen =3D oneof [return "hello", return "world", return "this",
-                  return "is", return "a", return "silly",
-                  return "token", return "test"]
+tokengen =3D oneof [return "hello", return "world", return "silly",
+                  return "goodbye"]
 =

 toklinegen :: Gen String
hunk ./PatchTest.lhs 238
-toklinegen =3D liftM unwords $ replicateM 3 tokengen
+toklinegen =3D liftM unwords $ replicateM 2 tokengen
 =

 filelinegen :: Gen PackedString
 filelinegen =3D liftM packString $
hunk ./PatchTest.lhs 242
-              frequency [(1,arbitrary),(5,toklinegen),
-                         (1,return ""), (1,return "{"), (1,return "}") ]
+              frequency [(1,arbitrary), (7,toklinegen), (1,return "")]
 =

 filepathgen :: Gen String
 filepathgen =3D liftM fixpath badfpgen
hunk ./PatchTest.lhs 257
 fpth [] =3D []
 =

 badfpgen :: Gen String
-badfpgen =3D  frequency [(1,return "test"), (1,return "hello"), (1,return =
"world"),
-                       (1,arbitrary),
+badfpgen =3D  frequency [(3,return "test"), (3,return "hello"),(1,arbitrar=
y),
                        (1,liftM2 (\a b-> a++"/"++b) filepathgen filepathge=
n) ]
 =

 instance Arbitrary Char where
}
[make test by default *compile* unit, and fix compile of unit.
David Roundy <droundy at abridgegame.org>**20050418123745] =

<
> {
hunk ./GNUmakefile 203
 =

 slowtest:	test test_unit
 =

-test check:    test_coding_standards test_perl test_shell
+test check:    test_coding_standards test_perl test_shell unit
 =

 test_perl:     darcs
 	@cd tests && perl perl_harness *.pl
hunk ./PatchTest.lhs 647
 \begin{code}
 prop_readPS_show :: Patch -> Bool
 prop_readPS_show p =3D case readPatchPS $ packString $ show p of
-                     Just (p',_) -> p' =3D=3D p
-                     Nothing -> False
+                   Just (p',_) -> p' =3D=3D p
+                   Nothing -> False
 \end{code}
 =

 %In order for merges to work right with commuted patches, inverting a patc=
h
replace ./PatchTest.lhs [A-Za-z_0-9] prop_readPS_show prop_read_show
replace ./PatchTest.lhs [A-Za-z_0-9] readPatchPS readPatch
hunk ./unit.lhs 73
 =

 \begin{code}
 pa :: Patch
-pa =3D fst $ fromJust $ readPatchPS $ packString $ unlines
+pa =3D fst $ fromJust $ readPatch $ packString $ unlines
     ["conflict",
      "move ./test ./vrJ/hello",
      "with",
hunk ./unit.lhs 174
       quickCheck prop_concatPS
       putStr "Checking that hex conversion works... "
       quickCheck prop_hex_conversion
-      putStr "Checking that show and readPS work right... "
-      quickCheck prop_readPS_show
+      putStr "Checking that show and read work right... "
+      quickCheck prop_read_show
       run "Checking known commutes... " commute_tests
       run "Checking known merges... " merge_tests
       run "Checking known canons... " canonization_tests
hunk ./unit.lhs 324
 \chapter{Show/Read tests}
 =

 This test involves calling ``show'' to print a string describing a patch,
-and then using readPatchPS to read it back in, and making sure the patch w=
e
+and then using readPatch to read it back in, and making sure the patch we
 read in is the same as the original.  Useful for making sure that I don't
 have any stupid IO bugs.
 =

hunk ./unit.lhs 330
 \begin{code}
 show_read_tests :: [String]
-show_read_tests =3D unit_tester t_show_readPS test_patches
+show_read_tests =3D unit_tester t_show_read test_patches
 primitive_show_read_tests :: [String]
hunk ./unit.lhs 332
-primitive_show_read_tests =3D unit_tester t_show_readPS primitive_test_pat=
ches
-t_show_readPS :: PatchUnitTest
-t_show_readPS p =3D
-    case readPatchPS $ renderPS $ showPatch p of
+primitive_show_read_tests =3D unit_tester t_show_read primitive_test_patch=
es
+t_show_read :: PatchUnitTest
+t_show_read p =3D
+    case readPatch $ renderPS $ showPatch p of
     Just (p',_) -> if p' =3D=3D p then []
hunk ./unit.lhs 337
-                   else ["Failed to readPS shown:  "++(show p)++"\n"]
-    Nothing -> ["Failed to readPS at all:  "++(show p)++"\n"]
+                   else ["Failed to read shown:  "++(show p)++"\n"]
+    Nothing -> ["Failed to read at all:  "++(show p)++"\n"]
 \end{code}
 =

 \chapter{Canonization tests}
hunk ./unit.lhs 744
 primitive_test_patches =3D test_patches_addfile ++
                          test_patches_rmfile ++
                          test_patches_hunk ++
-                         [fst.fromJust.readPatchPS $
+                         [fst.fromJust.readPatch $
                           packString "move ./test/test ./hello",
hunk ./unit.lhs 746
-                          fst.fromJust.readPatchPS $
+                          fst.fromJust.readPatch $
                           packString "move ./test ./hello"] ++
                          test_patches_binary
 =

}

Context:

[Remove tab
Ian Lynagh <igloo at earth.li>**20050419022849] =

[Extend the win32 Posix emulation
Josef Svenningsson <josef.svenningsson at gmail.com>**20050418171423
 Unfortunately win32 doesn't know anything about symbolic links so
 this patch simply ignores all symbol link stuff.
] =

[Resolve conflicts
Ian Lynagh <igloo at earth.li>**20050418144643] =

[Correct some typos in the documentation
Erik Schnetter <schnetter at aei.mpg.de>**20050417153927] =

[Add suffix to version number
Erik Schnetter <schnetter at aei.mpg.de>**20050417172053
 Add a suffix (release candidate #n/release/stable/unstable) etc. to
 the darcs version number.  This suffix should describe which branch
 (stable or unstable) a particulay darcs executable came from, and
 whether it includes additional modifications.
 =

 Since there are no global changeset numbers in darcs, this suffix is
 necessarily incomplete and cannot replace --exact-version.
 =

 The changes between the states have to be made manually in
 configure.ac.
] =

[Remove reference to non-existing doc chapter
Erik Schnetter <schnetter at aei.mpg.de>**20050417160232] =

[Correct some more typos in the documentation
Erik Schnetter <schnetter at aei.mpg.de>**20050417155656] =

[Avoid nested list appends when diffing
Ian Lynagh <igloo at earth.li>**20050416180306] =

[Avoid repeated work with norm_path/drop_dotdot
Ian Lynagh <igloo at earth.li>**20050416170500] =

[Avoid submerge_in_dir when diffing
Ian Lynagh <igloo at earth.li>**20050416170419] =

[More tweaking
Ian Lynagh <igloo at earth.li>**20050416160651] =

[More tweaks
Ian Lynagh <igloo at earth.li>**20050416025802] =

[Keep filenames reversed until we need them
Ian Lynagh <igloo at earth.li>**20050416011742] =

[Use getSymbolicLinkStatus more
Ian Lynagh <igloo at earth.li>**20050416002512] =

[Use getSymbolicLinkStatus to save on stat calls
Ian Lynagh <igloo at earth.li>**20050415235648] =

[Tweak SlurpDirectory
Ian Lynagh <igloo at earth.li>**20050415231336] =

[Tweak Diff.lhs
Ian Lynagh <igloo at earth.li>**20050415231250] =

[Use strings for newlines as hPutBuf doesn't do the right thing when printi=
ng them
Ian Lynagh <igloo at earth.li>**20050415173922] =

[test if the test darcs wrapper is really the test darcs wrapper
Tommy Pettersson <ptp at lysator.liu.se>**20050416194657] =

[make sure test bin darcs wrapper is executable before test scripts run
Tommy Pettersson <ptp at lysator.liu.se>**20050416194144] =

[switch to Perl built-in call for better portability
Tommy Pettersson <ptp at lysator.liu.se>**20050416193842
 Copy the change made in perl_harness by Mark Stosberg to shel_harness.
] =

[print output from failed shell tests to STDOUT
Mark Stosberg <mark at summersault.com>**20050416160723] =

[fix bug in test which caused stray warning [RT#345]
testerALL --ignore-times**20050416115030] =

[Added a wrapper script that lets you use Cygwin paths with the Windows bin=
ary.
Kannan Goundan <kannan at cakoose.com>**20050411180255] =

[Don't assume the C compiler inlines functions in fpstring.c.
Ralph Corderoy <ralph at inputplus.co.uk>**20050415163747
 Comments in fpstring.c suggest the author assumes the C compiler will
 inline some of the functions in fpstring.c.  Disassembling the Linux/x86
 executable confirms this doesn't happen.
 =

 By re-writing some of these functions to be more idiomatic C with
 preprocessor macros a `darcs record' of a just-added 4MiB binary file
 containing bytes 0..255 repeated over and over took 1/16th less time.
] =

[Fix spacing in ChangeLog
Ian Lynagh <igloo at earth.li>**20050414203007] =

[launder slurpies in Resolution--fixes createDirectory-failing bug.
David Roundy <droundy at abridgegame.org>**20050415125646] =

[Fallback if MAPIResolveName fails, and fix CC bug.
peter at zarquon.se**20050402003331] =

[resolve conflict in tests/perl_harness
David Roundy <droundy at abridgegame.org>**20050415111229] =

[test bugfix, chomp newline from pwd when setting HOME
Tommy Pettersson <ptp at lysator.liu.se>**20050411211158] =

[add test for fancy printer
Tommy Pettersson <ptp at lysator.liu.se>**20050411155954] =

[remove file name escaping tests from test add.pl
Tommy Pettersson <ptp at lysator.liu.se>**20050410092325
 to move them to a special escaping test
] =

[adjust broken-vi workaround for exec_interactive [RT#335]
Tommy Pettersson <ptp at lysator.liu.se>**20050412135126
 The old system call performed redirections, but the new raw system call
 in exec_interactive doesn't, so a wrapper script is needed.
] =

[[RT#342] bugfix, special case escaping of empty string
Tommy Pettersson <ptp at lysator.liu.se>**20050413013350
 The escaped chars were concatenated with hcat, which returns Empty for
 empty lists.
] =

[bugfix, changepref's first argument is not user data
Tommy Pettersson <ptp at lysator.liu.se>**20050413012655] =

[switch to Perl built-in call for better portability
Mark Stosberg <mark at summersault.com>**20050414120346] =

[remind user about --case-ok when warning about files that differ only in c=
ase
Mark Stosberg <mark at summersault.com>**20050413120425] =

[typo fix
Mark Stosberg <mark at summersault.com>**20050410003237] =

[Update ChangeLog with note about lazy patch reading. =

Mark Stosberg <mark at summersault.com>**20050410003207] =

[bufix in test 0_test.sh, make it work, really fix this time, promise...
Tommy Pettersson <ptp at lysator.liu.se>**20050413141722] =

[add darcs wrapper in test bin that automatically finds test target
Tommy Pettersson <ptp at lysator.liu.se>**20050412151408
 The 'darcs push' command invokes 'darcs apply' through the shell.
 This wrapper will catch that call (and all other calls to an unspecified
 darcs) and make sure the right darcs is used.  (It's no longer needed
 to explicitly locate the testing target in each test script.)
] =

[bugfix in test 0_test.sh, remove quotes
Tommy Pettersson <ptp at lysator.liu.se>**20050412150256] =

[prepend test bin directory to PATH when running test scripts
Tommy Pettersson <ptp at lysator.liu.se>**20050411214124] =

[test to make sure testscripts are run in a predictable environment
Tommy Pettersson <ptp at lysator.liu.se>**20050411140222] =

[restore darcs test suite ignores ~/.darcs [RT#217]
Tommy Pettersson <ptp at lysator.liu.se>**20050411135506
 As first worked out by Yuval Kogman.
] =

[preset a predictable and efficient environment for the tests (add perl_har=
ness)
Tommy Pettersson <ptp at lysator.liu.se>**20050411125214
 All escaping and coloring are off.
] =

[new zsh completion based on _tla and _perforce
Carlos Phillips <carlos.phillips at mail.mcgill.ca>**20050413134348] =

[Make Context.hs rather than c_context.c in predist
Ian Lynagh <igloo at earth.li>**20050413034021
 This still isn't right; e.g. Context.hs is removed right afterwards
 by the distclean, amongst other problems. At least it's not just broken
 now, though  :-)
 Spotted by Marnix Klooster.
] =

[Rename get_first_middle__last_choice to separate_first_middle_from_last
Ian Lynagh <igloo at earth.li>**20050412214602] =

[put current-old in _darcs/ in repair.
David Roundy <droundy at abridgegame.org>**20050412121540] =

[Remove unnecessary code and withSignalsBlocked
Ian Lynagh <igloo at earth.li>**20050412005145] =

[Add verbose message for timestamp syncing
Ian Lynagh <igloo at earth.li>**20050411225806] =

[Remove verbose message that got copied elsewhere
Ian Lynagh <igloo at earth.li>**20050411225741] =

[Create and use applyPristine for recording patches
Ian Lynagh <igloo at earth.li>**20050411224757] =

[Avoid code duplication
Ian Lynagh <igloo at earth.li>**20050411212931] =

[Change a can't happen error to an impossible
Ian Lynagh <igloo at earth.li>**20050411212735] =

[Don't hold patch in memory when recording
Ian Lynagh <igloo at earth.li>**20050411025804] =

[Move the apply_to_slurpy deeper
Ian Lynagh <igloo at earth.li>**20050411013748] =

[get_first_middle__last_choice
Ian Lynagh <igloo at earth.li>**20050411013701] =

[The "David Is Lame" patch! (fixing bug in is_null_patch conflict resolutio=
n.)
David Roundy <droundy at abridgegame.org>**20050410135358
 I didn't bother to compile.  Now that I've switched to 'smoke testing'
 rather than testing on send, everyone gets to see the stupid things I
 do... Doh!
] =

[resolve conflict with stable on is_null_patch fix.
David Roundy <droundy at abridgegame.org>**20050410131116] =

[touch one in tests/tag.pl, AFAICS it doesn't test behaviour for missing fi=
les
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050410060300] =

[fix bug in is_null_patch that lead to false positive when resolving (stabl=
e fix)
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050409201619] =

[don't bother running unit for "normal" make test, and add slowtest target.
David Roundy <droundy at abridgegame.org>**20050409200128] =

[turns out we don't want "multiple" conflictors...
David Roundy <droundy at abridgegame.org>**20050409200107] =

[fix bug in optimize --checkpoint.
David Roundy <droundy at abridgegame.org>**20050409163306
 What I don't understand is how I ever thought that this worked!
] =

[fix newlines in stringify.
David Roundy <droundy at abridgegame.org>**20050409154243] =

[No need to use C for Context
Ian Lynagh <igloo at earth.li>**20050409145935] =

[Handle giving different flags to different modules better
Ian Lynagh <igloo at earth.li>**20050409145655] =

[leave out surrounding braces when showing patch contents in changes.
David Roundy <droundy at abridgegame.org>**20050409150127] =

[use color when showing patch contents in changes.
David Roundy <droundy at abridgegame.org>**20050409150105] =

[fix bug in is_null_patch that lead to false positive when resolving.
David Roundy <droundy at abridgegame.org>**20050409145947] =

[Verbose changes should include the hunks themselves and a summary just the=
 files
Jim Radford <radford at blackbean.org>**20050408162443] =

[preproc.hs: Calculate the_commands from command_control_list
Florian Weimer <fw at deneb.enyo.de>**20050408143221
 =

 This patch fixes a fallout from the command grouping patch which breaks
 building from scratch.
] =

[add warning to the docs for --reorder.
David Roundy <droundy at abridgegame.org>**20050409141855] =

[explain darcs.cgi caching in the ChangeLog
Mark Stosberg <mark at summersault.com>**20050408160547] =

[mention --reorder-patches in the ChangeLog
Mark Stosberg <mark at summersault.com>**20050408160402] =

[add trivial test for 'optimize --reorder-patches'
Mark Stosberg <mark at summersault.com>**20050408160306] =

[Guess at what the docs for --reorder-patches should be.
Mark Stosberg <mark at summersault.com>**20050408160103
 =

 I would like help improving these to mention specific benefits for this co=
mmand,
 and notes any drawbacks on running it as well. =

] =

[remove debug trace from lcs
Benedikt Schmidt <beschmi at cloaked.de>**20050408174913] =

[read patches lazily in Repair.
David Roundy <droundy at abridgegame.org>**20050409125642] =

[read patches lazily in Get.
David Roundy <droundy at abridgegame.org>**20050409125557] =

[make check read patches lazily.
David Roundy <droundy at abridgegame.org>**20050409124213
 This change (and the plan is to make more commands read patches lazily)
 reduces memory usage on a linux kernel repository with just one huge patch
 by close to a factor of two, from over 700m to less than 400m.
] =

[make apply_patches avoid using slurpy at all.
David Roundy <droundy at abridgegame.org>**20050409122312] =

[simplify read_repo_private code.
David Roundy <droundy at abridgegame.org>**20050409111931] =

[finish off implementation of apply.
David Roundy <droundy at abridgegame.org>**20050409104929] =

[eliminate pthreads dependency, writing gzipped files with gzWriteFilePSs.
David Roundy <droundy at abridgegame.org>**20050409000949] =

[Apply: use get_common_and_uncommon_or_missing
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050406092824] =

[Depends.lhs: explicit error handling in get_common_and_uncommon_or_missing
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050406204633
 Throwing errors in pure code, as in get_common_and_uncommon, was a
 source of some problems. For example, 'apply' was unable to print a
 proper error message if evaluation of get_common_and_uncommon's result
 pushed such (thrown in get_extra) error to top-level.
] =

[Depends.lhs: remove unnecessary case from get_extra
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050404205515] =

[Depends.lhs: eliminate unnecessary function safehead
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050404203006] =

[Depends.lhs: remove duplicated code from gcau by introducing gcau_simple
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050404195227] =

[resolve conflicts in darcs.lhs.
David Roundy <droundy at abridgegame.org>**20050408120053] =

[make whatsnew --look-for-adds respect --no-summary (fixing #326)
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050407202208] =

[add HTTP cache control headers to darcs.cgi
Will <will at glozer.net>**20050407204412] =

[command grouping in darcs --help
peter at syncad.com**20050407211626
 This implements the grouping as it was originally proposed. Nobody realy
  indicated which gouping is better ... so I left the one I think is better=
.
] =

[Canonize email address schnetter at aei.mpg.de
Erik Schnetter <schnetter at aei.mpg.de>**20050403190311] =

[Improve error message when a Haskell package is not found
Erik Schnetter <schnetter at aei.mpg.de>**20050202124633] =

[remove verbatim markup from environment variable (for consistency)
Tommy Pettersson <ptp at lysator.liu.se>**20050407232903
 I actually discovered the espace at the end of this line thanks to the
 new trailing space escaping.  :-)
] =

[resolve conflict in PatchShow's import from Printer
Tommy Pettersson <ptp at lysator.liu.se>**20050407235424] =

[use userchunk printer in PatchShow to escape trailing spaces [RT#306]
Tommy Pettersson <ptp at lysator.liu.se>**20050407190834] =

[use prefix in showHunk
Tommy Pettersson <ptp at lysator.liu.se>**20050407151054
 as suggested by Ian Lynagh
] =

[document environment variables for controling color and escaping
Tommy Pettersson <ptp at lysator.liu.se>**20050407232529] =

[don't use hatQuote for all that many chars when escaping
Tommy Pettersson <ptp at lysator.liu.se>**20050407193945] =

[add _EXTRA environment variables for general non-/escaping
Tommy Pettersson <ptp at lysator.liu.se>**20050407193608
 All chars in DARCS_DONT_ESCAPE_EXTRA are not escaped.
 All chars in DARCS_ESCAPE_EXTRA are always escaped.
] =

[explaining comments on policy options in ColourPrinter
Tommy Pettersson <ptp at lysator.liu.se>**20050407190741] =

[add userchunk printer that escapes trailing spaces [RT#306]
Tommy Pettersson <ptp at lysator.liu.se>**20050407190638] =

[add --reorder-patches option to optimize.
David Roundy <droundy at abridgegame.org>**20050408110344
 This is a pretty primitive --reorder implementation, which only tries to
 move all patches not included in the last tag to after that tag.  A smarte=
r
 (but requiring more coding) solution would be to try to order all patches
 not included in the default (or sibling) repository such that they occur
 last.  I wouldn't be too hard, but would be just a bit more work, so I wen=
t
 with the simple method.
] =

[fix put.pl test to work with new put code.
David Roundy <droundy at abridgegame.org>**20050408104455] =

[fix add.pl test to work with new quoting of weird characters.
David Roundy <droundy at abridgegame.org>**20050408104435] =

[fix unpull test to work with new message when no patches are selected.
David Roundy <droundy at abridgegame.org>**20050408104402] =

[resolve conflicts in Put.
David Roundy <droundy at abridgegame.org>**20050407132558] =

[No interactive patch selection in put (and other fixes)
Josef Svenningsson <josef.svenningsson at gmail.com>**20050406180405] =

[Fix spelling error
Josef Svenningsson <josef.svenningsson at gmail.com>**20050403220400] =

[resolve conflicts in missed_resolution.pl.
David Roundy <droundy at abridgegame.org>**20050407111503] =

[add author flag to unit tests
Will <will at glozer.net>**20050406224718] =

[remove tabs from win32 workarounds
Will <will at glozer.net>**20050406215853] =

[rename Map module, add missing insertWith function
Benedikt Schmidt <beschmi at cloaked.de>**20050406210939] =

[add compatibility module between Data.Map and Data.FiniteMap, taken from Y=
i
Benedikt Schmidt <beschmi at cloaked.de>**20050406002216] =

[add hashPS to FastPackedString
Benedikt Schmidt <beschmi at cloaked.de>**20050405234517] =

[resolve conflict in unit.
David Roundy <droundy at abridgegame.org>**20050406120505] =

[replace Hunt/Szymanski diff algorithm with one by Myers
Benedikt Schmidt <beschmi at cloaked.de>**20050406005000] =

[color parentheses around patches and patch infos blue
Tommy Pettersson <ptp at lysator.liu.se>**20050406105542] =

[make escaped chars red instead of blue
Tommy Pettersson <ptp at lysator.liu.se>**20050406105243] =

[use new escape quoting in ColourPrinter
Tommy Pettersson <ptp at lysator.liu.se>**20050406104721] =

[new functions for quoting escaped chars in ColourPrinter
Tommy Pettersson <ptp at lysator.liu.se>**20050406104303
 These are (hopefully) both general and recognized escape quotings.
] =

[use isAscii and refactor no_escape in ColourPrinter to make it clearer
Tommy Pettersson <ptp at lysator.liu.se>**20050406103441] =

[make highlighting of escaped char an own function
Tommy Pettersson <ptp at lysator.liu.se>**20050406101626
 To prepare for escaping of trailing spaces and eol:s
] =

[make DARCS_DONT_COLOR take precedence over DARCS_ALWAYS_COLOR
Tommy Pettersson <ptp at lysator.liu.se>**20050406094730] =

[make unit work with new ColourPrinters.
David Roundy <droundy at abridgegame.org>**20050406115006] =

[when no patches match on un{pull,record} give error message, not "finished=
".
David Roundy <droundy at abridgegame.org>**20050406114140] =

[restore DARCS_USE_ISPRINT for backwards compatibility
Tommy Pettersson <ptp at lysator.liu.se>**20050405122849] =

[don't ask about number of colors if not a terminal
Tommy Pettersson <ptp at lysator.liu.se>**20050405122816] =

[Make FastPackedString more portable
Ian Lynagh <igloo at earth.li>**20050402221035] =

[Cleanup command_prereq.  Failures and succeses exclusive.
Aaron Denney <wnoise at ofb.net>**20050403165740
 Instead of returning (Maybe FilePath, String), it returns
 Either String FilePath.
] =

[RT #303
Aaron Denney <wnoise at ofb.net>**20050403143516
 A better error message on failures of am_not_in_repo, i.e. when calling
 "darcs init" in a pre-existing repository.
] =

[add control of color in ColourPrinter with environment variables
Tommy Pettersson <ptp at lysator.liu.se>**20050404152659] =

[use unsafePerformIO to get policy in ColourPrinter
Tommy Pettersson <ptp at lysator.liu.se>**20050404143656] =

[RT#318 - add TODO test for 'darcs dist' failing on FreeBSD
Mark Stosberg <mark at summersault.com>**20050404163600] =

[make escaping of output controllable with environment variables
Tommy Pettersson <ptp at lysator.liu.se>**20050404122507
 DARCS_DONT_ESCAPE_ANYTHING  turns off all escaping
 DARCS_DONT_ESCAPE_ISPRINT   use systems locale (works for single-byte)
 DARCS_DONT_ESCAPE_8BIT      works for UTF-8
] =

[propagate policy data all the way down to no_escape in ColourPrinter
Tommy Pettersson <ptp at lysator.liu.se>**20050404121904] =

[test for unpull --patch
Tommy Pettersson <ptp at lysator.liu.se>**20050403200008] =

[rewrite ColourPrinter with a policy data type (fixes RT#302)
Tommy Pettersson <ptp at lysator.liu.se>**20050403190223
 - better control of color and escaping
 - colored strings are escaped too
 - policy is determined with only synchronous IO
] =

['darcs add' prints errors to stderr, fail when no files added (fixes #53)
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050403192831] =

[Add test for darcs add behaviour on missing files.
Ralph Corderoy <ralph at inputplus.co.uk>**20041108134847
 Test for desired behaviour on adding a non-existant file, adding a file
 already added, etc.
] =

[(RT#318) set output file to stdout explicitly in tar invocation (dist)
Benedikt Schmidt <beschmi at cloaked.de>**20050404102300] =

[Remove another use of GHC internals
Ian Lynagh <igloo at earth.li>**20050402223849] =

[Hack to avoid confusing cpp
Ian Lynagh <igloo at earth.li>**20050402223406] =

[Set funfolding-use-threshold=3D20 for SHA1 rather than using ugly code
Ian Lynagh <igloo at earth.li>**20050402215145] =

[Avoid cpp \ line continuation
Ian Lynagh <igloo at earth.li>**20050402194918] =

[Extra parens around assignment used as truth value
Ian Lynagh <igloo at earth.li>**20050402193328] =

[Replace sequence_ $ map with mapM_
Ian Lynagh <igloo at earth.li>**20050402192231] =

[Remove duplicate \end{code}
Ian Lynagh <igloo at earth.li>**20050402190212] =

[Fix which header to look in for execvp_no_vtalarm
Ian Lynagh <igloo at earth.li>**20050402185440] =

[make some more flag descriptions lowercase
Tommy Pettersson <ptp at lysator.liu.se>**20050403131742] =

[initial test for optimize
Mark Stosberg <mark at summersault.com>**20050403023609] =

[changelog update -- "--modernize-patches":
Mark Stosberg <mark at summersault.com>**20050403005708] =

[changelog update for "darcs annotate missing_file.txt" fix
Mark Stosberg <mark at summersault.com>**20050403005547] =

[remove debug output from annotate failure message.
David Roundy <droundy at abridgegame.org>**20050402223235] =

[specify author in resolve.pl.
David Roundy <droundy at abridgegame.org>**20050402205329] =

[add --modernize-patches option to optimize.
David Roundy <droundy at abridgegame.org>**20050402201902] =

[automated tests for 'resolve'.
Mark Stosberg <mark at summersault.com>**20050402144236
 =

 This depends on echo_to_darcs() in Test::Darcs.
] =

[resolve conflict
Mark Stosberg <mark at summersault.com>**20050402132627] =

[refactor: get rid of test warnings
Mark Stosberg <mark at summersault.com>**20050320200712] =

[flag description should be in lowercase.
David Roundy <droundy at abridgegame.org>**20050402184740] =

[add documentation for _darcs/prefs/motd to "Configuring Darcs"
Mark Stosberg <mark at summersault.com>**20050402130713] =

[better document _darcs/prefs/email
Mark Stosberg <mark at summersault.com>**20050402130320] =

[typo fix: sevaral -> several
Mark Stosberg <mark at summersault.com>**20050402125818] =

[fix bug with $DARCS not being exported
Mark Stosberg <mark at summersault.com>**20050402014854
 =

 This patch fixes the bug with $DARCS not being exported in unpull.pl.
 It should also also fix the problem some people had with this script
 hanging. =

 =

 It depends on adding echo_to_darcs() to Test::Darcs, which is in a separat=
e
 patch, which may not have an official dependency, since --ask-deps was tak=
ing
 too long.
 =

 Hopefully, if other test scripts are hanging, we can fix them like this, t=
oo. =

 =

 Thanks to Schwern for some of the logic help here. =

 =

     Mark
] =

[bug fix: add needed call to IPC::Open2;
Mark Stosberg <mark at summersault.com>**20050402014231] =

[add echo_to_darcs to Test::Darcs
Mark Stosberg <mark at summersault.com>**20050401134748] =

[Changelog update
Mark Stosberg <mark at summersault.com>**20050401133627] =

[add to --match/--matches regexp match for author
Tommy Pettersson <ptp at lysator.liu.se>**20050401205908] =

[get rid of tab in RemoteApply.
David Roundy <droundy at abridgegame.org>**20050401123126] =

[get rid of tabs in Put.lhs.
David Roundy <droundy at abridgegame.org>**20050401123114] =

[fix a few minor bugs in the date matcher.
David Roundy <droundy at abridgegame.org>**20050401121118] =

[Work around shopt extglob being off for some users
Tuukka Hastrup <Tuukka.Hastrup at iki.fi>**20050401060527] =

[resolve conflict in Patch.
David Roundy <droundy at abridgegame.org>**20050401112959] =

[update Changelog for RT#305 - "--patch" removed from 'darcs changes'
Mark Stosberg <mark at summersault.com>**20050331212123] =

[resolve conflict in DarcsArguments.
David Roundy <droundy at abridgegame.org>**20050401112333] =

[use comment verbatim in xml output
glaweh at physik.fu-berlin.de**20050325103229
 without this patch, newlines were added before and after the comment
 content; additionally, the comment's first line was indented.
 both effects made it quite hard to transform the comment to html <pre>
 environments.
] =

[introduce withRepoLock to get rid of hardcoded "./_darcs/lock" strings
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050331163645] =

[GNUmakefile: add test_coding_standards target, included in test/check
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050331193442
 Currently it ensures that Haskell sources files contain no TABs. I
 checked that David prefers darcs sources to be tab-free. I found TABs
 only in a couple of places, so I figured it would be a good idea to
 remove them and enforce this in the future.
] =

[remove TABs from Haskell source files
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050331191041] =

[optimize most common case for add
Benedikt Schmidt <beschmi at cloaked.de>**20050331131244
 try_to_shrink is O(n^2) where n is the number of patches. The most common
 case is a list containing only AddFile/AddDir patches where shrink is
 not necessary
] =

[Work around the colon issue in bash_completion
Tuukka Hastrup <Tuukka.Hastrup at iki.fi>**20050329174505] =

[improve 'changes' description by mentioning 'changelog'
Mark Stosberg <mark at summersault.com>**20050320210306
 =

 I intentionally removed 'human-readable' from the description,
 since 'changes' now has XML output as well. =

] =

[RT#231 - ChangeLog update
Mark Stosberg <mark at summersault.com>**20050319162549] =

[make formatting of command name more consistent
Mark Stosberg <mark at summersault.com>**20041108032029] =

[add documentation and license for sendmail-command
Benedikt Schmidt <beschmi at cloaked.de>**20050330154205] =

[fix conflict with Tomasz' conflict resolution and mine.
David Roundy <droundy at abridgegame.org>**20050331120513] =

[fix double-import of stuff from Directory.
David Roundy <droundy at abridgegame.org>**20050330132638] =

[fix typo
Tommy Pettersson <ptp at lysator.liu.se>**20050330172211] =

[PR#194: add "X-Darcs-Version:" header to 'darcs send' messages
Karel Gardas <kgardas at objectsecurity.com>**20050330161821] =

[Record.lhs: merge imports of Directory and System.Directory
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050330190301] =

[be a bit quicker in unit.
David Roundy <droundy at abridgegame.org>**20050330142629] =

[resolve conflict in whatsnew.pl.
David Roundy <droundy at abridgegame.org>**20050330142532] =

[Add a dummy handleToFd to win32/System/Posix.hs to avoid configure workaro=
und on windows.
peter at zarquon.se**20050328193453] =

[fix bugs in whatsnew.pl that I don't understand.
David Roundy <droundy at abridgegame.org>**20050330135557
 i.e. this was trial-and-error bugfixing.  :(
] =

[fix non-existent file tests in record.pl.
David Roundy <droundy at abridgegame.org>**20050330135111] =

[if user specifies only nonexisting files on record, then exit.
David Roundy <droundy at abridgegame.org>**20050330134133] =

[comment out unpull all test that hangs on me... :(
David Roundy <droundy at abridgegame.org>**20050330133459] =

[PR#231: fix record to report any non-existent file/directory given as an a=
rgument
Karel Gardas <kgardas at objectsecurity.com>**20050324091401] =

[Uncommon file not actually being created
schwern at pobox.com**20050324073620
 =

 On OS X at least (perhaps elsewhere) `date >> \\` produces
 sh: -c: line 2: syntax error: unexpected end of file
 =

 Replaced with Shell::Command's touch() so that the file named \ is actuall=
y
 created.
] =

[migrate missed_resolution.pl to Test::Darcs for better portability
Mark Stosberg <mark at summersault.com>**20050324032502] =

[clarify docs for "apply --cc"
Mark Stosberg <mark at summersault.com>**20050323021830] =

[clarify 'apply --reply=3DFROM' docs
Mark Stosberg <mark at summersault.com>**20050323021333] =

[RT#233 - add test for unpull --last 1
Mark Stosberg <mark at summersault.com>**20050321034712] =

[RT#233 - test that unpull confirms after selecting "all"
Mark Stosberg <mark at summersault.com>**20050321033623] =

[export $DARCS from Test::Darcs in case we need it
Mark Stosberg <mark at summersault.com>**20050321031827
 =

 This seems to be the best way to handle piping input
 into darcs(). I can use open2() directly in my code
 along with $DARCS to solve that problem.
] =

[RT#233 Add stub test scripts for 'unpull' and 'unrecord'
Mark Stosberg <mark at summersault.com>**20050321022222] =

[fix TODO test (it was acciddently passing)
Mark Stosberg <mark at summersault.com>**20050320204631] =

[RT#225 - get rid of some warnings in the put.pl test
Mark Stosberg <mark at summersault.com>**20050320204357] =

[fix silly test failure
Mark Stosberg <mark at summersault.com>**20050320200824] =

[refactor to use Test::Darcs for better portability
Mark Stosberg <mark at summersault.com>**20050319162341] =

[RT#225 - some first tests for 'put', including TODO tests for setting the =
default REPO
Mark Stosberg <mark at summersault.com>**20050320195440] =

[RT#225 - a better "do nothing" message for put.
Mark Stosberg <mark at summersault.com>**20050320175622
 =

 No need to get sassy and tell the user what they want.
] =

[a new test for 'push' without a repo argument, and other cleanups
Mark Stosberg <mark at summersault.com>**20050320175120] =

[switch to cwd() for better portability
Mark Stosberg <mark at summersault.com>**20050320174152] =

[migrate to Test::Darcs for better portability
Mark Stosberg <mark at summersault.com>**20050320173514] =

[RT#225 - provide a more helpful message when 'put' fails
Mark Stosberg <mark at summersault.com>**20050320165530] =

[Shell::Command to replace shell calls in perl tests
schwern at pobox.com**20050312033530
 =

 The perl tests make shell calls for trivial things which can be done
 just fine in Perl like touch, mkdir, rm -rf.  These are compatibility
 problems waiting to happen.
 =

 There is an existing module which provides Perl functions similar to commo=
n
 shell commands, Shell::Command.  It is a wrapper around the core module
 ExtUtils::Command.  I've provided a copy here so darcs users do not have t=
o
 download and install it to run the tests.
 =

 This patch converts add.pl to use Shell::Command eliminating all `` calls
 in that test as a demonstration.
] =

[Convert add_in_subdir test to Perl
schwern at pobox.com**20050324060312
 =

 To demonstrate converting a shell test into Perl using Shell::Command for
 better portability, diagnostics and debugging.
 =

 Its pretty much a straightforward line-by-line mapping.
] =

[add sendmail-command option (#115)
Benedikt Schmidt <beschmi at cloaked.de>**20050327030747
 - sendmail-command specifies the commandline used to send mail, the
   commandline can contain some format strings to specify the recipient
 - the sendmail-command option is used on windows and is used instead of
   mapi if specified
             =

] =

[RT#231 - new TODO test illustrating a bug is still present
Mark Stosberg <mark at summersault.com>**20050319203457] =

[RT#231 - test for recording nonexistent files
Mark Stosberg <mark at summersault.com>**20050319162406] =

[refactor: use Test::Darcs for better portability
Mark Stosberg <mark at summersault.com>**20050319154204] =

[RT#245 - ChangeLog update and test
Mark Stosberg <mark at summersault.com>**20050319154739] =

[RT#266 - add ChangeLog entry
Mark Stosberg <mark at summersault.com>**20050319152907] =

[refactor: fix test warning output and start Test::Darcs migration
Mark Stosberg <mark at summersault.com>**20050319164331] =

[RT#278 - Add warnings to unpull, unrecord and amend-record docs
Mark Stosberg <mark at summersault.com>**20050319141334] =

[RT#278 - resolve ticket with updated docs about unpull
Mark Stosberg <mark at summersault.com>**20050319023020] =

[clarify description of --ask-deps option
Tommy Pettersson <ptp at lysator.liu.se>**20050319134738] =

[[RT #258] accept darcs help foo as equivalent to darcs foo --help.
David Roundy <droundy at abridgegame.org>**20050316133828] =

[add newline to end of "Nothing to do" message in apply.
David Roundy <droundy at abridgegame.org>**20050316131617] =

[make apply work with patch bundle given as a relative path from a subdirec=
tory.
David Roundy <droundy at abridgegame.org>**20050316131549] =

[RT#25 - document that GUI is not currently functional.
Mark Stosberg <mark at summersault.com>**20050319023847] =

[Fix RT#266. Introduce is_symlink instead of isnt_symlink.
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050317121210] =

[PR#245: whatsnew --look-for-adds implies --summary usage
Karel Gardas <kgardas at objectsecurity.com>**20050316194755] =

[remove incorrect commute rule from simple_unforce.
David Roundy <droundy at abridgegame.org>**20050316134058] =

[give more detail in test_commute.
David Roundy <droundy at abridgegame.org>**20050316132849] =

[update documentation for unrecord and unpull
Tommy Pettersson <ptp at lysator.liu.se>**20050313232216
 Document --from and --last options, and change from single patch to multip=
le
 patches
] =

[make unrecord and unpull take --from and --last options
Tommy Pettersson <ptp at lysator.liu.se>**20050313231641] =

[fix typo
Tommy Pettersson <ptp at lysator.liu.se>**20050313225130] =

[new match option match_severla_or_last
Tommy Pettersson <ptp at lysator.liu.se>**20050313215644
 It only lets you select patches in a way so that everything
 can be commuted to the end.  Good for removal.
] =

[fix typo
Tommy Pettersson <ptp at lysator.liu.se>**20050313213009] =

[Eliminate Can't exec "cd" error
Nigel Rowe <rho at swiftdsl.com.au>**20050315002116] =

[add missing newline to 'put'
Mark Stosberg <mark at summersault.com>**20050315011639] =

[make Patch export really_eq_patches.
David Roundy <droundy at abridgegame.org>**20050314135346] =

[Declare sloppy_atomic_create
Nigel Rowe <rho at swiftdsl.com.au>**20050314105803
 Eliminate warning when compiling Lock.lhs
] =

[[RT#268] Ship Test::Harness and Test::More
schwern at pobox.com**20050313195506
 =

 So we don't have to worry about what version of the Test modules users hav=
e,
 just ship em with darcs.  They're small.
 =

 PS  I threw in the Test::Tutorial and Test::TAP files even though they're =
just
 documentation.  Makes upgrading easier (can just copy everything, don't ha=
ve
 to worry about other files), they're small and who knows, someone might
 actually read them.
] =

[write_patch reads old patch and only writes if new or changed
Tommy Pettersson <ptp at lysator.liu.se>**20050313141722] =

[get rid of commute_to_before in remove_from_unrevert_context
Tommy Pettersson <ptp at lysator.liu.se>**20050312124442
 as suggested by David Roundy
] =

[change Conflictor data type to support multiple (as opposed to repeated) c=
onflicts.
David Roundy <droundy at abridgegame.org>**20050313200940] =

[typo fix - stray bracket in '--with-wx' help
Martin Bays <mbays at freeshell.org>**20050312203521] =

[a TODO test which confirms that RT#266 is a regression
Mark Stosberg <mark at summersault.com>**20050312220846
 =

 I suspect of the recent symlink patches introduced this. =

 Search 'darcs changes' for 'sym' to find it. =

] =

[RT#152 a TODO test for resolve after a conflict
Mark Stosberg <mark at summersault.com>**20050312035601
 =

 When pushing a conflict, darcs reports "There is a conflict".
 However, running 'darcs resolve' in the repo with the conflict
 reports no conflict. That seems like a big.
] =

[RT#10 demostrate conflict resolution bug is resolved
Mark Stosberg <mark at summersault.com>**20050312024532
 =

 I translated the original shell script into (mostly!) Perl.
 =

 I also tried running the shell script, and it passed to.
 =

 It appears this bug has been fixed.
 =

 Having this test in the test suite will help to prevent a regression.
 =

     Mark
] =

[copyedit section about special patches and pending in best_practices
Martin Bays <mbays at freeshell.org>**20050311211035] =

[fix typo: 'n -> \n
Martin Bays <mbays at freeshell.org>**20050312175555] =

[Allow parens to be optional when calling darcs() test command in some case=
s.
Mark Stosberg <mark at summersault.com>**20050312142220] =

[Test::Darcs.  darcs() instead of `$DARCS ...`
schwern at pobox.com**20050312031120
 =

 All the perl tests repeat this mantra to find darcs:
 =

   use vars qw/$DARCS/;
 =

   die 'darcs not found' unless $ENV{DARCS} || (-x "$ENV{PWD}/../darcs");
   $DARCS =3D $ENV{DARCS} || "$ENV{PWD}/../darcs";
 =

 And then they call $DARCS directly via a shell command.  `$DARCS ...`
 Repeated code is bad and all that shell is likely to become a compatibilit=
y
 liability.
 =

 This patch creats a library Test::Darcs and in it darcs() which replaces
 `$DARCS ...`.  I've converted add.pl to use it as a demonstration.
 =

 One of the issues is now in order to run an individual Perl test file you
 must add -Ilib/perl so it can find Test::Darcs.  Alternatively one can =

 add "use lib qw(lib/perl)" to all the Perl tests.  I don't know which is
 better for darcs developers.  The latter is redundant but potentially less
 confusing.
 =

 More testing libraries for tests/lib/perl to follow.
 =

] =

[turn wishful test into a TODO block so test script will succeed
Mark Stosberg <mark at summersault.com>**20041214024314] =

[test for changes --last affecting only given files
Mark Stosberg <mark at summersault.com>**20041026122610
 =

 I added a test to confirm that "--last" only considers patches that
 the given files are in.
 =

 It fails now because this is not implemented yet. You can save this test u=
ntil
 you are ready to do that. :)
 =

     Mark
] =

[MOre ChangeLog updates
Mark Stosberg <mark at summersault.com>**20050312140805] =

[get rid of needless warnings in test suite run.
Mark Stosberg <mark at summersault.com>**20050312140247
 =

 Thanks to Schwern for pointing this out. =

] =

[RT #255 Comprehensible shell test output
schwern at pobox.com**20050311212647] =

[fix ghc 6.4 issue in SlurpDirectory.
David Roundy <droundy at abridgegame.org>**20050312130245] =

[typo fix - s/direcotry/directory/
Mark Stosberg <mark at summersault.com>**20050311150658] =

[resolve conflict in SlurpDirectory.
David Roundy <droundy at abridgegame.org>**20050311134239] =

[refuse to use mmap on nfs systems.
David Roundy <droundy at abridgegame.org>**20050311123821] =

[fix short description of --tag-name (which should be just --tag) in optimi=
ze.
David Roundy <droundy at abridgegame.org>**20050310130040] =

[command description and help patch
peter at syncad.com**20050309230427] =

[RT#165 - TODO test for pull/rollback bug
Mark Stosberg <mark at summersault.com>**20050310031811] =

[another TODO test for mv with absolute paths. This one is for the target a=
rgument.
Mark Stosberg <mark at summersault.com>**20050309210815] =

[add TODO test for mv with absolute paths
Mark Stosberg <mark at summersault.com>**20050309210134
 =

 I'm using the ExtUtils::Command module as a perceived improvement for
 portability for some Unixy comands. It's part of the core Perl distributio=
n so
 every should have it. (Although there are still more system calls which co=
uld
 be converted). =

 =

     Mark
 =

] =

[record.pl conflict resolution and new tests
Mark Stosberg <mark at summersault.com>**20050309135405] =

[adding test for 'record --logfile'
Mark Stosberg <mark at summersault.com>**20041211213218] =

[provide example e-mail address format in prompt.
Mark Stosberg <mark at summersault.com>**20050310023528] =

[make slurp_read_and_write_dirty respect --set-scripts-executable.
David Roundy <droundy at abridgegame.org>**20050309135827] =

[recommend that test suite is run as part of the install process
Mark Stosberg <mark at summersault.com>**20050308174621] =

[add section about special patches and pending to best_practices
Tommy Pettersson <ptp at lysator.liu.se>**20050307213134] =

[RT#143, adding ChangeLog entry
Mark Stosberg <mark at summersault.com>**20050308151004] =

[make record.pl a TODO test and s/darcs/\$DARCS/.
David Roundy <droundy at abridgegame.org>**20050309122530] =

[bugfix reverse without invert for pull_lasts in PatchChoices
Tommy Pettersson <ptp at lysator.liu.se>**20050308165709
 The buggy return value is not used at present, but it migth be some day.
] =

[more changelog updates: mention diff, unrecord, unpull and put improvement=
s
Mark Stosberg <mark at summersault.com>**20050309002610] =

[RT#247: a TODO test for files name "\"
Mark Stosberg <mark at summersault.com>**20050309025808
 =

 The TODO block can be removed when the code is updated for the test to pas=
s.
] =

[convert whatsnew-with-absolutes-paths tests to a TODO test.
Mark Stosberg <mark at summersault.com>**20050309025427
 =

 TODO tests still 'succeed' when the test fails, thus test should now be OK=
 to
 'apply' to darcs before the code is written to match it. Hopefully, it may=
 even
 be an incentive to help get started on that. =

 =

] =

[switch to more portable constructs.
Mark Stosberg <mark at summersault.com>**20050309025351] =

[test for record with absolute paths (current failing)
Mark Stosberg <mark at summersault.com>**20041024000931] =

[a test for whatsnew with absolute paths
Mark Stosberg <mark at summersault.com>**20041023235658
 It was recently reported on the -users list that 'whatsnew' doesn't work w=
ith absolute paths.
 This test confirms that bug (It current fails). =

] =

[tag needs author flag in tag.pl test.
David Roundy <droundy at abridgegame.org>**20050308131311] =

[document add command with symbolic links and boring option
Tommy Pettersson <ptp at lysator.liu.se>**20050308105604] =

[fix bug in new tag code pointed out by Mark (which caused his tests to fai=
l).
David Roundy <droundy at abridgegame.org>**20050308125801] =

[some tests for darcs tag.
Mark Stosberg <mark at summersault.com>**20050308033818
 =

 These tests were made to verify the new functionality by Josef
 to include the tag name on the command line. =

 =

 Currently there are two failing tests which illustrate that success is bei=
ng reported
 different in this case, and more importantly, that the patch names generat=
ed are in =

 a new format which does include 'tagged' in the name. =

] =

[improve doc for tag name
Mark Stosberg <mark at summersault.com>**20050308033739] =

[Command tag now accepts patchname on the command line
Josef Svenningsson <josef.svenningsson at gmail.com>**20050306013356] =

[A new command: put
Josef Svenningsson <josef.svenningsson at gmail.com>**20050305153255] =

[Stylistic changes to Slurpy-pruning code (David's suggestions).
Kannan Goundan <kannan at cakoose.com>**20050306213842] =

[user must confirm choice 'a' for unrecord and unpull
Tommy Pettersson <ptp at lysator.liu.se>**20050306201403] =

[update test suite for new multi-select interface to unrecord and unpull
Tommy Pettersson <ptp at lysator.liu.se>**20050306185536] =

[make unrecord and unpull use same interface as pull, to select multiple pa=
tches
Tommy Pettersson <ptp at lysator.liu.se>**20050306183140] =

[add function commute_to_end to Depends
Tommy Pettersson <ptp at lysator.liu.se>**20050306173752] =

[add function with_selected_last_changes_reversed to SelectChanges
Tommy Pettersson <ptp at lysator.liu.se>**20050306141917] =

[make remove_from_unrevert_context take a list of patches
Tommy Pettersson <ptp at lysator.liu.se>**20050306140701
 This will enable unpull and unrecord en masse
] =

[resolve conflict with symlink error message fix.
David Roundy <droundy at abridgegame.org>**20050305164054] =

[Better error message when trying to add a symbolic link
chucky at dtek.chalmers.se**20050305134958] =

[When creating replicas to run "diff" on, only copy what's necessary.
kannan at cakoose.com**20050303042827] =

[Added functions to selectively prune a Slurpy tree.
kannan at cakoose.com**20050303042606] =

[fix MacOS hard link HFS+ problem with GUI editors.
David Roundy <droundy at abridgegame.org>**20050305151537
 On HFS+, MacOS X has to emulate hard links, since they don't exist on the
 filesystem.  It does this moderately well, but many editors (including
 xcode, which is written by Apple) can't handle files that have formerly ha=
d
 hard links made.  All files created by darcs were in this category, since
 we reused our lock-grabbing code to create files.  I've modified the code
 to instead use the sloppy lock-grabbing code when we just want to create a
 file (which isn't really a lock).  This *should* fix the bug on MacOS X.
] =

[add explanatory comment regarding snprintf on win32.
David Roundy <droundy at abridgegame.org>**20050305150309
 It's amazing some of the stuff I've learned working on darcs!
] =

[Fix an off-by-one bug in win32 mkstemp.
Josef Svenningsson <josef.svenningsson at gmail.com>**20050303151956] =

[add (optional) statistics output to list_authors.
David Roundy <droundy at abridgegame.org>**20050305134613
 I was just curious...
] =

[fix LaTeX markup: ellipsis and a dash
Tommy Pettersson <ptp at lysator.liu.se>**20050224021423] =

[fix broken footnote in best_practises
Tommy Pettersson <ptp at lysator.liu.se>**20050304003052] =

[improve tests on commutation.
David Roundy <droundy at abridgegame.org>**20050302125743] =

[give more info when new_elegant_merge fails.
David Roundy <droundy at abridgegame.org>**20050302125717] =

[use commute_no_merger in simple_commute_conflict.
David Roundy <droundy at abridgegame.org>**20050302125640] =

[fix bugs and simplify code in conflictor commutation.
David Roundy <droundy at abridgegame.org>**20050302125452] =

[update docs to reflect how darcs mv (and unix mv) actually work.
Mark Stosberg <mark at summersault.com>**20050228192022
 =

 I also updated the help syntax to use brackets, like 'darcs record' does.
] =

[Fix path to pending_buggy in user message
Thomas Zander <TZander at Factotummedia.nl>**20050225135841] =

[when patch has already been applied, exit with nicer message.
David Roundy <droundy at abridgegame.org>**20050226134928] =

[eliminate inappropriate singular flags in changes.
David Roundy <droundy at abridgegame.org>**20050225123849] =

[Improve diagnostic message with apply refuses to patch.
Mark Stosberg <mark at summersault.com>**20050226033747
 =

 Sometimes it's confusing when apply refuses to apply a patch
 that would cause a conflict. =

 =

 This is a documentation patch which explains to the user who to =

 cause darcs to apply the patch and mark the conflicts anyway, =

 if that's what they want. =

] =

[be more stubborn when running quickCheck tests patiently.
David Roundy <droundy at abridgegame.org>**20050224134503] =

[sort commands in "Ambiguous command" message.
David Roundy <droundy at abridgegame.org>**20050220141036] =

[Help texts clarification
Thomas Zander <zander at kde.org>**20050219165049] =

[fix bug in new confictor commute code.
David Roundy <droundy at abridgegame.org>**20050219192453] =

[implement some of the conflictor commutation in a more testable manner.
David Roundy <droundy at abridgegame.org>**20050219164032
 This is the start to verifying individually that all the portions of the
 conflictor commutation are correct, since they form these little sets
 (which are checed in the unit test).
] =

[don't import head twice (fixes ghc 6.4 warning).
David Roundy <droundy at abridgegame.org>**20050219120649] =

[move nubsort from PatchCommute to DarcsUtils
Benedikt Schmidt <beschmi at cloaked.de>**20050219100534
 and change all nub . sort calls to nubsort.
] =

[fix get over sftp using the putty sftp client
Benedikt Schmidt <beschmi at cloaked.de>**20050219095413
 psftp doesn't change to the directory given on the commandline as
 user at host:dir. Change url given as arg to user at host: and add a
 cd dir command to the batchfile.
] =

[add exec_interactive and use it instead of system in some places
Benedikt Schmidt <beschmi at cloaked.de>**20050218022204
 exec_interactive just uses rawSystem wich works on posix systems
 (using execvp) and should work on windows too.
] =

[clarify message and nub . sort instead of other way around
Benedikt Schmidt <beschmi at cloaked.de>**20050218014042] =

[merge_three_patches-test-use-DARCS-not-darcs-for-get-tempOld-tempB
petersen at haskell.org**20050217052705] =

[fix bug in what_sl test.
David Roundy <droundy at abridgegame.org>**20050217133957] =

[canonize peter strand.
David Roundy <droundy at abridgegame.org>**20050217130626] =

[fix non-matching regexp in unit test
Will <will at glozer.net>**20050217074209] =

[add self-test routines to cgi
Will <will at glozer.net>**20050217071519] =

[Revert to old behaviour for "whatsnew -sl" wrt. showing modified files (bu=
g #210 in RT)
peter at zarquon.se**20050216231858] =

[#217: darcs test suite ignores ~/.darcs
Yuval Kogman <nothingmuch at woobling.org>**20050216000637
 Every test run has env HOME=3D`pwd` prepended to it, which causes darcs to=
 look
 for .darcs in the src/darcs/test directory, instead of the actual home of =
the
 user running the test suite.
] =

[Less ambiguous (and context-insensitive) docpatch for --look-for-adds
Yuval Kogman <nothingmuch at woobling.org>**20050215233402
 lookforadds is documented in a way that could be interpreted as 'running "=
darcs
 whatsnew -l" will add files to the repo'. This doc patch tries to clarify =
the
 issue, but does a bad job of it.
 =

 The reason is that lookforadds is documented once, while it actually means=
 two
 different things in two different contexes - recording, and whatsnewing. T=
he
 changed texts try to make sense in both contexes.
 =

 Splitting the lookforadds documentation is beyond me, as it requires code
 modifications, but would definately be the Right Thing to do.
] =

[add -lposix4 -lpthread to LDFLAGS when present, needed on Solaris
Samuel Tardieu <sam at rfc1149.net>**20050214170152] =

[add a couple more commutation tests.
David Roundy <droundy at abridgegame.org>**20050214134235] =

[fix darcs-unstable to work with ghc 6.4.
David Roundy <droundy at abridgegame.org>**20050212162509] =

[fixes to make darcs work with ghc 6.4.
David Roundy <droundy at abridgegame.org>**20050212125212] =

[quote filename passed to $EDITOR
Benedikt Schmidt <beschmi at cloaked.de>**20050210193135
 fix bug when working directory contains spaces reported by
 Steven E. Harris.
] =

[fix bug in merger tests.
David Roundy <droundy at abridgegame.org>**20050210131025] =

[extend subcommute tests.
David Roundy <droundy at abridgegame.org>**20050209135706] =

[add subcommutation tests.
David Roundy <droundy at abridgegame.org>**20050208135139] =

[fix commuteFP.
David Roundy <droundy at abridgegame.org>**20050208134536] =

[change tab to spaces.
David Roundy <droundy at abridgegame.org>**20050207131451] =

[improvements for darcs add and adding parent directories
Benedikt Schmidt <beschmi at cloaked.de>**20050206000516
 Don't check for parents of recursively added files and
 order files given on commandline. Add test for new
 behaviour.
] =

[index.html.in: "Darcs is a revision control system."
Thomas Schwinge <schwinge at nic-nac-project.de>**20050206150322
 I'd suggest this change; IMHO there's no need to compare darcs to CVS.
] =

[Remove doubled 'on' from index.html.in.
Thomas Schwinge <schwinge at nic-nac-project.de>**20050206145156] =

[use DarcsIO classes for apply_to_filepaths.
David Roundy <droundy at abridgegame.org>**20050206142024] =

[canonize AJ... :)
David Roundy <droundy at abridgegame.org>**20050205212437] =

[RT#201 - add test for takeLock failure on pull
Mark Stosberg <mark at summersault.com>**20050206040412] =

[changelog updates
Mark Stosberg <mark at summersault.com>**20050206030948] =

[new DarcsIO framework (as yet unused).
David Roundy <droundy at abridgegame.org>**20050205163008
 This new framework is intended to unify the current apply_to_slurpy and
 (hopefully) patch_check codes.  It also will allow us to apply a patch
 directly to a filesystem, without first slurping the directory.  This
 should allow (for example) faster gets.
 =

 The code isn't yet complete.  Both PatchApply.apply and the instance of
 WriteableDirectory in SlurpDirectory are incomplete, but hopefully you can
 get an idea of where this is going.
 =

 We may be able to replace many places where slurpies are used with code
 written in the ReadableDirectory monad.
] =

[Beautification
Ian Lynagh <igloo at earth.li>**20050205131851] =

[clarify how bad the situation is when failure happens in pull.
David Roundy <droundy at abridgegame.org>**20050205135901
 This adds a function to DarcsUtils which can be used to add clarifications
 to existing error messages, so no information is lost to the user (althoug=
h
 calling functions lose the type of the exception that was thrown).  It
 would be a good idea to throw these clarifications around pretty
 liberally.  I just did this to pull because that's where the relevant bug
 report (#201) was filed.
 =

 I also reordered the writing to pending so less information will be lost i=
f
 there is a problem writing changes to the working directory.
] =

[automatically add parent directories for darcs add
Benedikt Schmidt <beschmi at cloaked.de>**20050205014603
 =

 Instead of complaining that the parent directory of the file isn't
 in the repo, add parent directories recursively. (See Bug #20)
] =

[update web page to reflect new stable release.
David Roundy <droundy at abridgegame.org>**20050205120152] =

[make favicon alpha transparent.
David Roundy <droundy at abridgegame.org>**20050205115820] =

[use slurp_recordeds in Record.lhs.
David Roundy <droundy at abridgegame.org>**20050201125158] =

[add slurp_recordeds, which does multiple slurps simultaneously and efficie=
ntly.
David Roundy <droundy at abridgegame.org>**20050129114939] =

[be more careful not to do unnecesary slurps in write_pending.
David Roundy <droundy at abridgegame.org>**20050201115209] =

[Update copyright message: 2002-2005
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050131133625] =

[Build-depend on libcurl2 or libcurl3
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050131133404
 =

 Darcs builds perfectly okay with libcurl3, so there's no need to force
 using an older version of this lib.
 =

] =

[Show patch number while (verbosely) downloading patches
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050131121046] =

[Close both ends of pipes.
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050130201542] =

[try to avoid email loops.
David Roundy <droundy at abridgegame.org>**20050129150828] =

[Show files starting with . in CGI script
Kim Hansen <kim.hansen at hp.com>**20050128180541
 Files like .htaccess were not shown i the web interface.
 This patch changes the use of glob to opendir/readdir/closedir.
 It also shows repositories starting with ..
] =

[Fix soul-hurting hardcoded file descriptor number
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050127235644] =

[Fix eye-hurting whitespace
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050127234921
 =

 I admit that I don't like indenting with whitespaces either,
 but since the file is basically written with 4-spaces, I'll
 keep this habit (unless anybody allows me to send a larger
 patch :-)
 =

] =

[Fix off-by-one error in WIN32 version of mkstemp()
Jan-Benedict Glaw <jbglaw at lug-owl.de>**20050127234048
 =

 This patch solves different issues with the mkstemp() funktion provided
 for WIN32 versions of darcs:
 =

 - THIS PATCH IS NOT TESTED: I'VE GOT NO WINDOWS AROUND!
 - Move file-local variable into the mkstemp() since it's only used
   by mkstemp().
 - Remove unneeded variable p2.
 - Remove unneeded variable fd by directly returning the result of
   open().
 - Correctly return EINVAL if the supplied template isn't at least
   6 bytes long and doesn't end in 6 consecutive 'XXXXXX'.
 - Write 6 bytes of hex garbage instead of 5 bytes of decimal garbage.
   This was caused because the final \0 wasn't put into account for
   the snprintf() call.
] =

[Clarified success message for darcs pull.
jemfinch at supybot.com**20050127065323
 When I first ran darcs pull, I saw the success message "Finished pulling" =
and
 wondered whether Darcs had just downloaded the patches, or whether it had
 also applied them.  To me (a new Darcs user) "pull" sounds like an exclusi=
vely
 network operation, so I wasn't sure whether the patches would be applied. =
 I
 think adding "and applying" clarifies to users that darcs pull not only gr=
abs
 the patches, but applies them as well.
] =

[start making commutation more modular...
David Roundy <droundy at abridgegame.org>**20050119132816
 This is the first step in making the commutation code easier to test piece
 by piece.  The change is the introductio of a Perhaps type, which indicate=
s
 whether the commutation succeeded, failed, or if the algorithm doesn't kno=
w
 how to do the commutation.  This way each sub-commute function should
 create a group on sets of patches where the result isn't unknown (I may be
 getting my terminology here mixed up as to what is a group).
 =

 In any case, the idea is that if A and B commute to A' and B', then A' and
 B' must commute back of course to A and B, and invert B and invert A had
 better commute to invert A' and invert B', etc, forming a closed set of
 patches (a group?).  And all these operations must be achieved with the
 same subcommute function, which means we can test that subcommute function
 in isolation from the rest of the algorithm.
 =

 So you can expect some new QuickCheck tests to be coming up, which will
 operate on individual (hopefully, ideally) "primitive" commute functions,
 which will be as small as is possible while still consistent with the abov=
e
 properties.
] =

[fix bug in simple_commute_conflict.
David Roundy <droundy at abridgegame.org>**20050116144700] =

[implement backwards force_commuting.
David Roundy <droundy at abridgegame.org>**20050114125130] =

[fix bug in commuting secondary conflictors.
David Roundy <droundy at abridgegame.org>**20050111122439] =

[remove tests that ought to fail for conflictors.
David Roundy <droundy at abridgegame.org>**20050110134914] =

[fix check_patch on Conflictors.
David Roundy <droundy at abridgegame.org>**20050110134856] =

[fix commute bug in Conflictors.
David Roundy <droundy at abridgegame.org>**20050110134755] =

[Be less lazy at the end of lists
Ian Lynagh <igloo at earth.li>**20050109174414] =

[remove debug traces from PatchCommute.
David Roundy <droundy at abridgegame.org>**20050109142321] =

[fix bug in Conflictor commutation.
David Roundy <droundy at abridgegame.org>**20050109141251] =

[fix bug in Conflictor commutation of recursive conflicts.
David Roundy <droundy at abridgegame.org>**20050109131414] =

[conflictor code does need Control.Monad.when.
David Roundy <droundy at abridgegame.org>**20050108172544] =

[simplify slurp_has using get_slurp
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221193648] =

[simplify slurp_hasfile using get_slurp
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221182015] =

[simplify slurp_modfile using get_slurp_context
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221175117] =

[implement get_slurp using get_slurp_context
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221170352] =

[simplify addslurp using get_slurp_context
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221140040] =

[simplify slurp_remove using get_slurp_context_maybe
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221131818] =

[add get_slurp_context, get_slurp_context_maybe and get_slurp_context_list
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20041221064941
 These functions allow to split a slurpy to a subtree specified by a file p=
ath
 and the rest of the tree (context). Hopefully this will allow to move most
 of slurpy traversal code to one place.
] =

[Infrastructure for lazy patch parsing
Ian Lynagh <igloo at earth.li>**20050104233618] =

[add Conflictor patch type.
David Roundy <droundy at abridgegame.org>**20050102154349] =

[TAG 1.0.2
David Roundy <droundy at abridgegame.org>**20050204123805] =

Patch bundle hash:
46c02ed1d0b84ab3ea1bc6175351b0c82a9d2e63

--=_--

.








More information about the darcs-devel mailing list