[darcs-devel] darcs patch: use impossible to document impossible case in Repair.
A simple fix, documenting that this really is considered an impossible
case, rather than just an unhandled error. In Repair.
David
Mon Dec 4 07:28:54 PST 2006 David Roundy [EMAIL PROTECTED]
* use impossible to document impossible case in Repair.
New patches:
[use impossible to document impossible case in Repair.
David Roundy [EMAIL PROTECTED]**20061204152854]
{
hunk ./Repair.lhs 40
import Lock( withTempDir )
import Check ( check_uniqueness )
import Printer ( putDocLn, text )
+#include impossible.h
\end{code}
\options{repair}
hunk ./Repair.lhs 97
apply_patches_with_feedback [] False feedback putInfo $
(chtg, Just chk)
: reverse (concat $ get_patches_beyond_tag chtg patches)
-Nothing - fail Bug in repair_cmd, please report.
+Nothing - impossible -- checkpoint is always a tag
Nothing - apply_patches_with_feedback [] False feedback putInfo
$ reverse $ concat patches
-- withTempDir ignores error on delete -- hence the hack below.
}
Context:
[Remove raw_mode functions from atomic_create.h.
Eric Kow [EMAIL PROTECTED]**20061008202738
It seems these were once implemented in compat.c and have since been
reimplemented in Haskell by Ian Lynagh on 2005-07-30. These appear to
just be leftover declarations in the C header.
]
[resolve conflicts
Tommy Pettersson [EMAIL PROTECTED]**20061117222757
between 'clean up unrevert and pending handling'
and 'ignore failure from hSetBufferin'
]
[ignore failure from hSetBuffering
Tommy Pettersson [EMAIL PROTECTED]**20061117221424
This affects:
issue41 Doesn't like pasted text.
issue94 Crash on bogus input
issue146 hSetBuffering: invalid argument
issue318 buffering error of darcs record under bash/cmd.exe
It doesn't necessarily fix anything. It prevents darcs from quiting,
instead continuing with perhaps an undesirable buffering mode, which may or
may not be better ... or worse.
]
[Fix curses stuff, especially on Solaris 10.
Dave Love [EMAIL PROTECTED]**20061120171211]
[TAG 1.0.9rc2
Tommy Pettersson [EMAIL PROTECTED]**20061116140351]
[add some changelog entries
Tommy Pettersson [EMAIL PROTECTED]**20061116135447]
[Define infodepspatch locally in AmendRecord instead of exporting it from Patch
[EMAIL PROTECTED]
]
[Make libcurl use any http authentication.
Tobias Gruetzmacher [EMAIL PROTECTED]**20061118230406
This let darcs use repositories protected with digest authentication.
]
[Redirect stderr to Null when exiting SSH control master.
Eric Kow [EMAIL PROTECTED]**20061118212115
This suppresses the output
* Pseudo-terminal will not be allocated because stdin is not a terminal.
(result of redirecting stdin from /dev/null)
* Exit request sent.
(seems to be normal output. Seems also that there is no way to suppress
this; -q does not do the job, for example)
]
[Overhaul and improve automation of ssh_test.
Eric Kow [EMAIL PROTECTED]**20061121141802
* Now quits if you don't supply REMOTE; does not have any
silly default values
* Options now passed in through environment variables, so:
NO_CONTROL_MASTER=1 [EMAIL PROTECTED] ./ssh_test
* Performs some automated success checks (which means that
it should be possible to use this from the harness if you
have ssh-agent running)
* Performs darcs send test
* Does not try to pass darcs-ssh flags (like --disable-ssh-cm)
to non-ssh-using commands like record
]
[Rename ssh_test to ssh.sh (for shell harness).
Eric Kow [EMAIL PROTECTED]**20061121141101
Note that you must set environment variables for it do anything
useful (namely [EMAIL PROTECTED]); something like the following
should work:
[EMAIL PROTECTED] make test
You need to be using public key authentication to have a fully
automated test.
]
[Support darcs send --disable-ssh-cm.
Eric Kow [EMAIL PROTECTED]**20061121134158]
[Canonize Edwin Thomson.
Eric Kow [EMAIL PROTECTED]**20061118174454]
[Make Exec.lhs not import unneeded Control.Exception functions when compiling on Windows.
[EMAIL PROTECTED]
]
[Annotate various boring patterns.
Dave Love [EMAIL PROTECTED]**20061113225701]
[Add make rules for tags files.
Dave Love [EMAIL PROTECTED]**20061113213923]
[Amending a patch doesn't remove explicit dependencies
[EMAIL PROTECTED]
[look for --disable-ssh-cm in defaults files (issue351)
Tommy Pettersson [EMAIL PROTECTED]**20061117180942]
[configure should fail if a required module isn't present.
David Roundy [EMAIL PROTECTED]**20061128024557]
[refactor is_malicious_path (for easier reading)
Tommy Pettersson [EMAIL PROTECTED]**20061113191040]
[really use new malicious file path check in pull (not in changes)
Tommy Pettersson [EMAIL PROTECTED]**20061113182628]
[Add a semi-automated test for SSH-related things.
Eric Kow [EMAIL PROTECTED]**20061110110801
Testing SSH stuff is tricky in that (1) you need some place to connect
to and (2) you
[darcs-devel] summary of my recent spurt of patches, and request for suggestions
Hi all, This is intended to be a summary of my activity over the weekend, for those who are overwhelmed by the number of darcs sends I made--I kept thinking I was done for the weekend. I've been working hard on getting support for the new hashed inventory format into good shape. If you aren't familiar with the benefits of the new format (which I've talked about with at least some of you in person), suffice to say that I see it as a precursor to working out the new way of dealing with conflicts. I've gotten most of the tests to pass when run with hashed inventories, and soon hope to get the rest under control. In the process of generalizing to a new repository format, I've been moving the code over to a more generic framework (first introduced by Juliusz, but expanded by myself) which abstracts out some of the details of the repository itself. There are still several tests that fail, which I intend to track down: TESTS FAILED! obliterate.sh partial.sh unrecord.sh and Failed Test Stat Wstat Total Fail Failed List of Failed --- optimize.pl 2 512 42 50.00% 3-4 repodir.pl 1 256161 6.25% 10 set_scripts_executable.pl1 256251 4.00% 20 This is pretty small. I don't know why the obliterate and unrecord commands fail, but partial hashed inventory repositories are still on my list to implement, so that's an understood failure, and optimize also hasn't been updated to the new code. Repair will also fail, but doesn't seem to be in the tests--we should add a repair testcase or two. I'm not sure what causes the set_scripts_executable.pl error, but know where to look. Given these caveats, I'd appreciate it if interested persons could play with hashed inventories, and see if they have any problems. Patches to the hashed_inventory.sh test would be most welcome, as I've mostly been running tests with *all* hashed inventories, but am sure that some interesting bugs will come out in the interaction between hashed inventory repositories and old-fashioned repositories. This is also the time to suggest changes to the actual format of the hashed inventories. It might be nice to add subdirectories to the patches/ directory, either by date or by the first couple characters of the hash itself. And I'm open to suggestions to make the format more parseable by third party tools. I just hacked this one together in... well quite a short period of time, and since then have been focusing on the rest of the code (which really doesn't depend on the inventory format in any interesting way). I guess that's all. The term is over (which is why I've got a bit more time and energy), but I've still got a final to give, and need to get cracking on research (which was delayed by my class), so I'm not sure how much darcs time I'll have in the upcoming weeks. But it's likely to be more than I had in the past couple of months. -- David Roundy Department of Physics Oregon State University ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
Re: [darcs-devel] summary of my recent spurt of patches, and request for suggestions
Hi David, On Mon, Dec 04, 2006 at 07:53:03 -0800, David Roundy wrote: I've been working hard on getting support for the new hashed inventory format into good shape. If you aren't familiar with the benefits of the new format (which I've talked about with at least some of you in person), suffice to say that I see it as a precursor to working out the new way of dealing with conflicts. Good stuff. Just wanted to say that I'm now back online and will be looking over the spurt, most likely on the weekend. Best, -- Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon français. pgpc5xhRq6au4.pgp Description: PGP signature ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: darcs patch: use System.Process on Windows, and a few more
Tommy Pettersson wrote: I've reviewed and tested these patches on linux with ghc 6.4. | Wed Nov 29 17:01:44 CET 2006 Simon Marlow [EMAIL PROTECTED] | * add explicit import list | Wed Nov 29 17:03:42 CET 2006 Simon Marlow [EMAIL PROTECTED] | * hFlush after waiting for lock message | Wed Nov 29 17:06:20 CET 2006 Simon Marlow [EMAIL PROTECTED] | * catch exceptions in stdout_is_a_pipe These three looks good and works fine. | Wed Nov 29 17:07:10 CET 2006 Simon Marlow [EMAIL PROTECTED] | * Use System.Process on Windows This one I couldn't compile, but the following changes fixed it: hunk ./Exec.lhs 25 -import System.Exit ( ExitCode ) +import System.Exit ( ExitCode(..) ) hunk ./Exec.lhs 39 -import System +import System.IO ( stdin ) +import Control.Exception ( bracket ) I can not test this patch since it's windows only, but I tried to compile with #define WIN32, and got: Exec.lhs:33:27: Module `Control.Exception' does not export `bracketOnError' Don't know if that's important, but I thought I'd mention it. Thanks for taking a look. These are due to changes in libraries between versions of GHC; bracketOnError only appeared in GHC 6.6, it seems. So we need some configure tests to straighten things out. Can I leave these up to you guys to sort out? Cheers, Simon ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
