Re: [darcs-devel] GHC's darcs evaluation wiki page
bugs: we run into darcs bugs other than the conflict/merging bug on a regular basis. This is true, but I think things are improving. Yes they are. I would say that the bug tracker has about every significant bug in it. Darcs 2 addresses many major bugs, and our open bug count is lower than comparable projects (SVN, for certain). Git doesn't even have a bug tracker. The statement should really be qualified. If we don't know what specific bugs they are running into, there's no way to address them, short of solving every bug. Uncertain future: no critical mass of hackers/maintainers. The technical basis is not well enough understood by enough people. I know that as potential hacker I'm turned off when I see lines like this: wspfr _ _ NilRL _ = return Nothing wspfr jn matches (p::pps) skipped ( from SelectChange.lhs, line 183) In the programming culture I come from, if you name a variable wspfr, nilrl, jn, p or pps, there ought to be a comment close by explaining what the heck you meant. This compact, cryptic notation definitely shows roots in cultural math equations, and in my view makes the code much less accessible. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] zooko's idea of why buildbot run tests fail when manual ones don't
We know what happens when a process is spawned and run -- the only remaining uncertainty is what the buildbot does with the stderr, stdout, and stdin pipes of the child process. Here is the relevant source code: http://buildbot.net/trac/browser/buildbot/slave/commands.py?rev=491#L311 The call to spawnProcess is where Buildbot hands off the job of spawning a subprocess to the Twisted library. I see just before that it says if not self.keepStdinOpen: self.pp.closeStdin() I see from the script quoted above in this Mark Stosberg's message that the name of the class created is Test, respectively. Let's look at that class: http://buildbot.net/trac/browser/buildbot/steps/shell.py?rev=491#L280 It does not set the keepStdinOpen member variable, so it must still be set to the default setting. A bit of Grep Oriented Programming tells me that the default value is false, and I think that it can be set by passing a keyword 'keep_stdin_open', like this: f1.addStep(step.Test, timeout=3600, command=['bash','-c','make test'] , keep_stdin_open=True) So, my current hypothesis is that closing stdin changes the behavior of the perl tests. I don't think there is anything else that differs between the buildslave's invocation of 'make test' and a local invocation of 'make test' from a bash shell. Zooko, This sounds like a great analysis. It would be consistent with why the change to the steve_and_monica script help...I think it was the first script executed that piped data so that darcs expected on STDIN. The Perl tests would be using STDIN in two ways. First, some of them pipe data into darcs like steve_and_monica did. The harness itself may also use STDIN as part of the infrastructure. I have now made the changes you suggested in the buildbot config files and restarted buildbot. So when the next patch is applied, we can test out your suggested change. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] rollback.sh
On Sat, 8 Mar 2008, zooko wrote: If I run this bash command line on Mac OS 10.4: $ perl shell_harness rollback.sh Then it runs the rollback.sh test and quickly finishes successfully. If I run this command-line: $ python -c 'import os;os.system(perl shell_harness rollback.sh)' Which does approximately the same thing, then it hangs indefinitely. Very interesting. What if you apply the patch I sent to darcs-devel recently? It just replaces the use of yes | darcs rollback with darcs rollback -a And which version of Python is in use? For me, on Ubuntu Gutsy 7.10, the python syntax works with or without that patch. I have Python 2.5.1. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
How about 699 [darcs2 cannot check the ghc-darcs repository] ? Unless I'm doing something completely bogus (don't think so), darcs2 has developed a new performance problem recently. In the sense that it looks like a regression, it's a candidate. Mark -- topic: +FixForDarcs20 -Darcs2 __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
David Roundy wrote: On Thu, Feb 21, 2008 at 03:42:42AM -, Mark Stosberg wrote: I decided I don't like using Superseder to track dependencies for release, because there's not way to see a report of all of these tickets, so we can easily review what they are, and what the status is. So instead I'm tagging all of the issues with the FixForDarcs20 tag, so we can make such a report. Okay. How about a simple ReleaseCritical tag, which we could reuse for later releases? In that case, we could add the Show release critical search to everyone's tracker view (and not feel that after release we need to remove it). I thought of that, but our Roundup has a limitation of only really being able to search for one Topic at a time. So while searching of ReleaseCritical and Darcs20 might be ideal, it isn't practical. I suppose ReleaseCritical would work as long as there was only one release being prepared at a time. Considering there are currently sort of two (1.1 and 2.0), this case may well come up again. I'm going to leave things alone for now with FixForDarcs20 in place, but if someone wants to change it further, I'll go along with it. Mark __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
I decided I don't like using Superseder to track dependencies for release, because there's not way to see a report of all of these tickets, so we can easily review what they are, and what the status is. So instead I'm tagging all of the issues with the FixForDarcs20 tag, so we can make such a report. -- superseder: -Darcs2: changes shows revised history, darcs apply = bus error, darcs-unstable (hashed) repo fails to push to empty repo, get leaves mystery rmfiles (old format), optimize --reorder = Failure commuting patches in commute_by called by gpit! (Darcs2), record = hash failure with pre-gzipped files, wrong report of Skipped 6 patches due to dependencies __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
Adding issue568 as a dependency. It's apparent regression in the unstable branch with the title of wrong report of Skipped 6 patches due to dependencies. -- superseder: +wrong report of Skipped 6 patches due to dependencies __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
Nominating bug with pre-gzipped files as something to look into before the Darcs 2 release. That's issue673. -- superseder: +hash failure with hashed and darcs-2 format __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
I'm nominating issue585 to be addressed for the Darcs 2 to be released. This is a bug in convert where flattening mergers changes the dependency structure and can make old tags inaccessible. -- superseder: +optimize --reorder = Failure commuting patches in commute_by called by gpit! (Darcs2) __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue573] corrupted repository -- indelible conflicting local changes
From reading this bug history, it is resolved-in-unstable, and Tommy is in the process of porting this fix to darcs-stable, so that it can be resolved there, too. -- status: need-eg - resolved-in-unstable __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue573 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] darcs patch: Add a 'show authors' command.
On Thu, 14 Feb 2008, Eric Kow wrote: I notice that this command doesn't sort or perform any sorting, nubbing or counting. Is this intended so that users can perform their own counting? Yep! Somebody should update the docs to suggest darcs show authors | sort | uniq -c | sort -n -r I happen to try it before I read this thread, and I came here to report a bug. It spewed about 2000 lines to the screen with no paging, and ended like this: [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] That's not the pleasant, intelligent UI from darcs that I've come to expect. I think this format should be the default: darcs show authors | sort | uniq -c | sort -n -r | less I don't really see any drawbacks - Sorting the data adds predictability. - Reporting the count of unique entries is not lossy. You can reconstruct a boring format like the one above with the counts, if you wanted to. - paging shows the most interesting values first To contrast what darcs presented me with above, the result of sorting and showing the unique counts is much more interesting: 1451 David Roundy [EMAIL PROTECTED] 828 David Roundy [EMAIL PROTECTED] 507 [EMAIL PROTECTED] 304 Ian Lynagh [EMAIL PROTECTED] 285 Mark Stosberg [EMAIL PROTECTED] 267 Tommy Pettersson [EMAIL PROTECTED] 217 Juliusz Chroboczek [EMAIL PROTECTED] 168 Eric Kow [EMAIL PROTECTED] 142 Eric Kow [EMAIL PROTECTED] 101 [EMAIL PROTECTED] Also, the result is easily parsed between the numbers and the authors if you care to. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] Where is unstable?
On Thu, 14 Feb 2008, Jason Dagit wrote: I just tried to 'darcs send' to the unstable repository but I get this: $ darcs send http://darcs.net/repos/unstable darcs failed: Not a repository: http://darcs.net/repos/unstable (Failed to download URL http://darcs.net/repos/unstable/_darcs/inventory: ) I also tried unstable-hashed. Both of which are listed on the darcs.net home page as being darcs repositories. Can anyone restore access to these or tell me what I'm doing wrong? Jason, I'm sorry. I typed the word Google into Google earlier and I think I broke the internet. ( Reference: IT Crowd episode: http://www.youtube.com/watch?v=Fet0SCt7uGg ). Jokes aside, I think you have the addresses right. However, I noticed if I type them into Firefox, they don't seem to work, but when I darcs pull, they seem to. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] PatchPlugins / XML files
On Thu, 7 Feb 2008, Allan Lyons wrote: Hi, On http://wiki.darcs.net/DarcsWiki/PatchPlugins there is discussion about different atomic patch types. The page points out that test files are different from binary files and suggests that those two cases might be handled adequately. It also points out that XML is different from both text and binary. (XML is kind of like text but the file might have no line endings, patches really shouldn't break the well-formedness of documents, etc.) I've looked, but so far I haven't seen whether anything like treating structured data like XML separately from text and binary has been attempted. Is anyone else interested in this sort of thing? Or has handling XML in darcs already been addressed and I just haven't seen it yet? Allan, The functionality is not in darcs now,but it has been discussed before. For example, here: http://www.mail-archive.com/[EMAIL PROTECTED]/msg03808.html Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue677] pull conflicts with unrecorded changes
You can also always record a patch before you pull, and then unrecord the patch afterwards. I'm tentatively marking this as resolved-in-unstable, since I consider these options sufficient. Another contributor is welcome to re-open the issue. Mark -- nosy: +amber, markstos -amber priority: - wishlist status: chatting - resolved-in-unstable __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue677 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue672] darcs-unstable (hashed) repo fails to push to empty repo
New submission from Mark Stosberg [EMAIL PROTECTED]: To reproduce: darcs init --hashed --repodir=u2 cd darcs-unstable-repo time -p darcs push -a --no-set ../u2 Resolving conflicts 5/27 Apply failed! real 862.99 user 731.10 sys 3.98 ### Darcs takes a very long time and then results in apply failed. Another minor bug was expected in the process: The count of conflicts being resolved jumped around, rather than only increasing. The total count of conflicts to resolve went up to 600 at one point, and then back down to 27. I would have expected that the total would only increase. Perhaps this issue is considered resolved in unstable because it wouldn't happen on projects starting from scratch with Darcs 2, even though it happens this repo which created earlier. I was somewhat surprised that pushing to an empty repo didn't approach the efficiency of a darcs put. Mark -- messages: 3310 nosy: beschmi, droundy, kowey, markstos, tommy priority: urgent status: chatting title: darcs-unstable (hashed) repo fails to push to empty repo topic: Darcs2, IncludesExampleOrTest __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue672 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue256] another bug in get_extra commuting patch: with example repos
Per David's comments, this is considered resolved-in-unstable, although it can still be triggered with darcs-2 when run against repos that were originally created with darcs 1 and the old repo format. -- status: duplicate - resolved-in-unstable __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue256 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue670] Testing RoundUp Cli
New submission from Mark Stosberg [EMAIL PROTECTED]: I'm sorry if you got mail about this. You can ignore it. -- messages: 3300 nosy: beschmi, droundy, kowey, markstos, tommy priority: bug status: chatting title: Testing RoundUp Cli __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue670 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue468] darcs + ext2ifs (WinXP) = Crash
With no further feedback from the requestor in over six months, I'm marking this as wont-fix for. (More like presumed-dead). No one else has reported a dupe during that time. -- nosy: +eivuokko, jaredj, markstos, rgm, wglozer status: chatting - wont-fix topic: +Windows __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue468 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
I nominate issue579 to be fixed for the Darcs 2 release. The issue title is: Darcs2: changes shows revised history -- superseder: +Darcs2: changes shows revised history __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue659] Release Darcs 2.0
New submission from Mark Stosberg [EMAIL PROTECTED]: This ticket is created to track the release of Darcs 2.0. Other bugs or features that are blocking the release can associated as superceders. When those are all resolved, the release should happen. Based on the bug tracker activity, my sense is that Darcs 2 is already better than 1.0.9, with no significant regressions that I'm aware of. I'm adding issue648 as a superceder to start with, which refers to strange rmfile entries appearing in whatsnew after a pull. -- messages: 3204 nosy: beschmi, droundy, kowey, markstos, tommy priority: feature status: unread superseder: get leaves mystery rmfiles (old format) title: Release Darcs 2.0 __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue659 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue661] put = Malformed patch bundle
New submission from Mark Stosberg [EMAIL PROTECTED]: I'm marking this as urgent because darcs reports this as a bug itself, and it's rather easy to trigger with the current darcs-unstable. #!/bin/sh IFS=''; export IFS; EMAIL=tester; export EMAIL; set -ev; rm -rf tmp; darcs init --darcs-2 --repodir=tmp touch tmp/t.t cd tmp darcs add t.t echo 'content't.t darcs record -am 'initial add' echo 'remote change't.t darcs record -am 'remote change' darcs put tmp2 Result is: darcs failed: Malformed patch bundle: 'hunk ./t.t 1' is not 'Context:' +content Context: Patch bundle hash: 5818289a101f72e75fbbb0caf2475b58ef48bf86 Apply failed! shell returned 2 -- messages: 3227 nosy: beschmi, droundy, kowey, markstos, tommy priority: urgent status: chatting title: put = Malformed patch bundle topic: Darcs2, IncludesExampleOrTest __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue661 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue647] wish: automated benchmarking and comparison
I started on this about three years ago. You are welcome to re-use my work from then: http://lists.osuosl.org/pipermail/darcs-devel/2005-March/001524.html http://mark.stosberg.com/darcs_hive/darcs_speed_test/ Mark -- nosy: +markstos status: chatting - deferred title: automated benchmarking and comparison - wish: automated benchmarking and comparison __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue647 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue642] wish: Automatic detection of file renames
I have also accidentally done a plain mv numerous times when I should have done a darcs mv. My suggestions fo r implementing this would be: - darcs mv with no arguments could be interactive...it would look for likely moves and then prompt the user to confirm each one. I suppose could you also have an --all flag to accept all the recommendations automatically. - darcs record --look-for-moves would do the same kind of thing, the way --look-for-adds complements darcs add. -- nosy: +markstos title: Automatic detection of file renames - wish: Automatic detection of file renames __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue642 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue643] wish: darcs send -o should output the repo repo e-mail address.
I agree with the revised wish that darcs send -o also provide the e-mail of the remote repo, realizing the language would need to be different...it would just be factually reporting the address, insteading of claiming that an e-mail has been sent there. -- nosy: +markstos status: chatting - deferred title: darcs get does not get email pref - wish: darcs send -o should output the repo repo e-mail address. __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue643 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue469: test that _darcs/prefs/binarie... (and 1 more)
Fri Feb 1 21:48:05 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue469: test that _darcs/prefs/binaries matches against full path
Sat Feb 2 10:01:09 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* improved test for binaries: We now have both a positive and negative test
New patches:
[issue469: test that _darcs/prefs/binaries matches against full path
Mark Stosberg [EMAIL PROTECTED]**20080202024805] {
addfile ./tests/binary.pl
hunk ./tests/binary.pl 1
+#!/usr/bin/env perl
+
+# Test that _darcs/prefs/binaries
+
+use lib 'lib/perl';
+use Test::More 'no_plan';
+use Test::Darcs;
+use strict;
+use warnings;
+use Shell::Command;
+use File::Slurp;
+
+{
+my $test = 'binary pattern matches against full path';
+init_tmp_repo();
+ok(mkpath('d'), d created);
+touch 'd/t.t';
+
+append_file('_darcs/prefs/binaries','d/t');
+
+darcs 'add d/t.t';
+
+darcs 'record -am initial record';
+
+append_file('d/t.t','some change');
+
+# we want to see if darcs reports the file as binary or not
+my $out = echo_to_darcs('record --interactive', 'n');
+
+like($out, qr/binary/, $test);
+}
}
[improved test for binaries: We now have both a positive and negative test
Mark Stosberg [EMAIL PROTECTED]**20080202150109] {
hunk ./tests/binary.pl 18
-
-append_file('_darcs/prefs/binaries','d/t');
-
hunk ./tests/binary.pl 19
-
hunk ./tests/binary.pl 20
+append_file 'd/t.t','some change' ;
hunk ./tests/binary.pl 22
-append_file('d/t.t','some change');
+my $out = echo_to_darcs 'record --interactive', 'n' ;
+unlike($out, qr/binary/, pre-test: plain text files are not binary);
hunk ./tests/binary.pl 25
-# we want to see if darcs reports the file as binary or not
-my $out = echo_to_darcs('record --interactive', 'n');
+append_file '_darcs/prefs/binaries','d/t' ;
hunk ./tests/binary.pl 27
+# we want to see if darcs reports the file as binary or not
+$out = echo_to_darcs 'record --interactive', 'n' ;
}
Context:
[Fix --no-ephemeral.
[EMAIL PROTECTED]
[rename segregate{F,R}L into partition{F,R}L.
[EMAIL PROTECTED]
[Fix darcs get --lazy (Partial was used instead of Lazy).
[EMAIL PROTECTED]
[match absolute paths on binaries regexps.
David Roundy [EMAIL PROTECTED]**20080201152320]
[avoid needless locking of hashed repositories.
David Roundy [EMAIL PROTECTED]**20080201150941]
[don't display progress when running --list-options. (issue635)
David Roundy [EMAIL PROTECTED]**20080201144458]
[give feedback after successful push or put.
David Roundy [EMAIL PROTECTED]**20080131230525]
[use System.Process when calling darcs apply
David Roundy [EMAIL PROTECTED]**20080131230305
This allows us to get immediate feedback as to how the remote apply is
proceeding.
]
[use System.Process for running ssh and other commands.
David Roundy [EMAIL PROTECTED]**20080131223831]
[fix issue 257 by not ignoring exit code of apply.
David Roundy [EMAIL PROTECTED]**20080131220054]
[fix bug in whatsnew when replace is used.
David Roundy [EMAIL PROTECTED]**20080131201648]
[Show a replace+whatsnew -s bug.
[EMAIL PROTECTED]
[define segregateFL and segregateRL utility functions.
David Roundy [EMAIL PROTECTED]**20080131200620]
[Fix an error message, in case of using subcommands.
[EMAIL PROTECTED]
[default to get copying all patches.
David Roundy [EMAIL PROTECTED]**20080131195151
You can use --lazy (or ^C) to get a lazy repository.
]
[add test (failing) for issue257 (from vmiklos, thanks!)
David Roundy [EMAIL PROTECTED]**20080131195118]
[fix bug in unrevert. (issue366)
David Roundy [EMAIL PROTECTED]**20080131192202]
[give progress report on initial checking of repository validity.
David Roundy [EMAIL PROTECTED]**20080131181249
I'm not sure how much good this will do, since the downloading function
probably blocks progress output.
]
[clean up in unrevert_cancel.sh
David Roundy [EMAIL PROTECTED]**20080131175149]
[make bunchFL compile with type witnesses by adding a signature.
David Roundy [EMAIL PROTECTED]**20080131155718]
[refactor convert.
David Roundy [EMAIL PROTECTED]**20080131155547
This also makes convert slightly more efficient in cases where there is a
large first patch.
]
[make darcs get --hashed safe on case-insensitive filesystems.
David Roundy [EMAIL PROTECTED]**20080131155112]
[define handy bunchFL function for grouping patches into batches.
David Roundy [EMAIL PROTECTED]**20080131154631]
[fix conflict-doppleganger test to work with change in flags get accepts.
David Roundy [EMAIL PROTECTED]**20080131153250]
[oops, the build of the manual broke when I hid convert...
David Roundy [EMAIL PROTECTED]**20080130230705
rolling back:
Wed Jan 30 16:39:45 EST 2008 David Roundy [EMAIL PROTECTED]
* hide convert.
Since this is a command that *must* be performed only once per group of
related repositories, I think making it only visible in the documentation
should reduce errors.
M ./src/Darcs/TheCommands.lhs -1 +1
]
[issue366: test when unrevert
[darcs-devel] darcs patch: Add functional sh test for issue458. (and 1 more)
Sat Feb 2 04:51:22 EST 2008 Trent W. Buck [EMAIL PROTECTED]
* Add functional sh test for issue458.
Sat Feb 2 10:59:04 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue458: move currently failing test to bugs/
New patches:
[Add functional sh test for issue458.
Trent W. Buck [EMAIL PROTECTED]**20080202095122] {
addfile ./tests/issue458.sh
hunk ./tests/issue458.sh 1
+#!/bin/sh
+### http://bugs.darcs.net/issue458
+### darcs get --set-scripts-executable ignores umask
+set -ev
+: ${DARCS:=$PWD/../darcs}
+: ${DARCS_EMAIL:=tester}
+export DARCS_EMAIL
+
+d=`TMPDIR=$PWD mktemp -d`
+trap rm -rf \$d\ 0 TERM INT QUIT # cleanup on unwind
+cd $d
+
+mkdir 1
+$DARCS initialize --repodir 1
+printf 1/x '#!/bin/sh\ntrue' # make a shebang'd script
+$DARCS record --repodir 1 -lam x x
+umask 077 # DENY ALL access to group, all
+$DARCS get --set-scripts-executable 1 2
+mode=$(stat -c %a 2/x)
+test 0600 -eq $mode
}
[issue458: move currently failing test to bugs/
Mark Stosberg [EMAIL PROTECTED]**20080202155904] move ./tests/issue458.sh ./bugs/issue458.sh
Context:
[Fix --no-ephemeral.
[EMAIL PROTECTED]
[rename segregate{F,R}L into partition{F,R}L.
[EMAIL PROTECTED]
[Fix darcs get --lazy (Partial was used instead of Lazy).
[EMAIL PROTECTED]
[match absolute paths on binaries regexps.
David Roundy [EMAIL PROTECTED]**20080201152320]
[avoid needless locking of hashed repositories.
David Roundy [EMAIL PROTECTED]**20080201150941]
[don't display progress when running --list-options. (issue635)
David Roundy [EMAIL PROTECTED]**20080201144458]
[give feedback after successful push or put.
David Roundy [EMAIL PROTECTED]**20080131230525]
[use System.Process when calling darcs apply
David Roundy [EMAIL PROTECTED]**20080131230305
This allows us to get immediate feedback as to how the remote apply is
proceeding.
]
[use System.Process for running ssh and other commands.
David Roundy [EMAIL PROTECTED]**20080131223831]
[fix issue 257 by not ignoring exit code of apply.
David Roundy [EMAIL PROTECTED]**20080131220054]
[fix bug in whatsnew when replace is used.
David Roundy [EMAIL PROTECTED]**20080131201648]
[Show a replace+whatsnew -s bug.
[EMAIL PROTECTED]
[define segregateFL and segregateRL utility functions.
David Roundy [EMAIL PROTECTED]**20080131200620]
[Fix an error message, in case of using subcommands.
[EMAIL PROTECTED]
[default to get copying all patches.
David Roundy [EMAIL PROTECTED]**20080131195151
You can use --lazy (or ^C) to get a lazy repository.
]
[add test (failing) for issue257 (from vmiklos, thanks!)
David Roundy [EMAIL PROTECTED]**20080131195118]
[fix bug in unrevert. (issue366)
David Roundy [EMAIL PROTECTED]**20080131192202]
[give progress report on initial checking of repository validity.
David Roundy [EMAIL PROTECTED]**20080131181249
I'm not sure how much good this will do, since the downloading function
probably blocks progress output.
]
[clean up in unrevert_cancel.sh
David Roundy [EMAIL PROTECTED]**20080131175149]
[make bunchFL compile with type witnesses by adding a signature.
David Roundy [EMAIL PROTECTED]**20080131155718]
[refactor convert.
David Roundy [EMAIL PROTECTED]**20080131155547
This also makes convert slightly more efficient in cases where there is a
large first patch.
]
[make darcs get --hashed safe on case-insensitive filesystems.
David Roundy [EMAIL PROTECTED]**20080131155112]
[define handy bunchFL function for grouping patches into batches.
David Roundy [EMAIL PROTECTED]**20080131154631]
[fix conflict-doppleganger test to work with change in flags get accepts.
David Roundy [EMAIL PROTECTED]**20080131153250]
[oops, the build of the manual broke when I hid convert...
David Roundy [EMAIL PROTECTED]**20080130230705
rolling back:
Wed Jan 30 16:39:45 EST 2008 David Roundy [EMAIL PROTECTED]
* hide convert.
Since this is a command that *must* be performed only once per group of
related repositories, I think making it only visible in the documentation
should reduce errors.
M ./src/Darcs/TheCommands.lhs -1 +1
]
[issue366: test when unrevert reports a bug
Mark Stosberg [EMAIL PROTECTED]**20080131042313]
[roll back foolish file modification time hack.
David Roundy [EMAIL PROTECTED]**20080130224322
As it turns out, I didn't understand what ctime means, thinking that it
was actually a creation time. But alas, ctime changes whenver mtime
changes, so we can't use their equality to check if the mtime has been
set. Ugh. I feel silly.
rolling back:
Wed Jan 30 12:12:32 EST 2008 David Roundy [EMAIL PROTECTED]
* employ new hack to avoid need to wait for clock to tick.
The new hack is that if the creation time and modification time of a file
in the pristine cache are identical, then we don't believe it's meaningful
if the modification time happens to match that of the file in the working
directory.
M ./src/Darcs/Lock.lhs -1 +4
M ./src/Darcs/Repository/Prefs.lhs -4 +8
M ./src/Darcs
[darcs-devel] darcs patch: Add functional sh test for issue496. (and 1 more)
Sat Feb 2 05:38:16 EST 2008 Trent W. Buck [EMAIL PROTECTED]
* Add functional sh test for issue496.
Sat Feb 2 11:28:28 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue496: move failing test to ./bugs
New patches:
[Add functional sh test for issue496.
Trent W. Buck [EMAIL PROTECTED]**20080202103816] {
addfile ./tests/issue496.sh
hunk ./tests/issue496.sh 1
+#!/bin/sh
+### http://bugs.darcs.net/issue496
+### _darcs/prefs/defaults ignored when using --repodir
+set -ev
+: ${DARCS:=$PWD/../darcs}
+: ${DARCS_EMAIL:=tester}
+export DARCS_EMAIL
+
+d=`TMPDIR=$PWD mktemp -d`
+trap rm -rf \$d\ 0 TERM INT QUIT # cleanup on unwind
+cd $d
+
+mkdir 1
+$DARCS initialize --repodir 1
+echo 1/_darcs/prefs/defaults ALL disable # try to disable all
+## All these commands SHOULD fail (hence leading !s).
+! $DARCS changes --repodir 1
+! $DARCS changes --repodir $PWD/1
+cd 1
+! $DARCS changes
+! $DARCS changes --repodir $PWD
}
[issue496: move failing test to ./bugs
Mark Stosberg [EMAIL PROTECTED]**20080202162828] move ./tests/issue496.sh ./bugs/repodir.sh
Context:
[Fix --no-ephemeral.
[EMAIL PROTECTED]
[rename segregate{F,R}L into partition{F,R}L.
[EMAIL PROTECTED]
[Fix darcs get --lazy (Partial was used instead of Lazy).
[EMAIL PROTECTED]
[match absolute paths on binaries regexps.
David Roundy [EMAIL PROTECTED]**20080201152320]
[avoid needless locking of hashed repositories.
David Roundy [EMAIL PROTECTED]**20080201150941]
[don't display progress when running --list-options. (issue635)
David Roundy [EMAIL PROTECTED]**20080201144458]
[give feedback after successful push or put.
David Roundy [EMAIL PROTECTED]**20080131230525]
[use System.Process when calling darcs apply
David Roundy [EMAIL PROTECTED]**20080131230305
This allows us to get immediate feedback as to how the remote apply is
proceeding.
]
[use System.Process for running ssh and other commands.
David Roundy [EMAIL PROTECTED]**20080131223831]
[fix issue 257 by not ignoring exit code of apply.
David Roundy [EMAIL PROTECTED]**20080131220054]
[fix bug in whatsnew when replace is used.
David Roundy [EMAIL PROTECTED]**20080131201648]
[Show a replace+whatsnew -s bug.
[EMAIL PROTECTED]
[define segregateFL and segregateRL utility functions.
David Roundy [EMAIL PROTECTED]**20080131200620]
[Fix an error message, in case of using subcommands.
[EMAIL PROTECTED]
[default to get copying all patches.
David Roundy [EMAIL PROTECTED]**20080131195151
You can use --lazy (or ^C) to get a lazy repository.
]
[add test (failing) for issue257 (from vmiklos, thanks!)
David Roundy [EMAIL PROTECTED]**20080131195118]
[fix bug in unrevert. (issue366)
David Roundy [EMAIL PROTECTED]**20080131192202]
[give progress report on initial checking of repository validity.
David Roundy [EMAIL PROTECTED]**20080131181249
I'm not sure how much good this will do, since the downloading function
probably blocks progress output.
]
[clean up in unrevert_cancel.sh
David Roundy [EMAIL PROTECTED]**20080131175149]
[make bunchFL compile with type witnesses by adding a signature.
David Roundy [EMAIL PROTECTED]**20080131155718]
[refactor convert.
David Roundy [EMAIL PROTECTED]**20080131155547
This also makes convert slightly more efficient in cases where there is a
large first patch.
]
[make darcs get --hashed safe on case-insensitive filesystems.
David Roundy [EMAIL PROTECTED]**20080131155112]
[define handy bunchFL function for grouping patches into batches.
David Roundy [EMAIL PROTECTED]**20080131154631]
[fix conflict-doppleganger test to work with change in flags get accepts.
David Roundy [EMAIL PROTECTED]**20080131153250]
[oops, the build of the manual broke when I hid convert...
David Roundy [EMAIL PROTECTED]**20080130230705
rolling back:
Wed Jan 30 16:39:45 EST 2008 David Roundy [EMAIL PROTECTED]
* hide convert.
Since this is a command that *must* be performed only once per group of
related repositories, I think making it only visible in the documentation
should reduce errors.
M ./src/Darcs/TheCommands.lhs -1 +1
]
[issue366: test when unrevert reports a bug
Mark Stosberg [EMAIL PROTECTED]**20080131042313]
[roll back foolish file modification time hack.
David Roundy [EMAIL PROTECTED]**20080130224322
As it turns out, I didn't understand what ctime means, thinking that it
was actually a creation time. But alas, ctime changes whenver mtime
changes, so we can't use their equality to check if the mtime has been
set. Ugh. I feel silly.
rolling back:
Wed Jan 30 12:12:32 EST 2008 David Roundy [EMAIL PROTECTED]
* employ new hack to avoid need to wait for clock to tick.
The new hack is that if the creation time and modification time of a file
in the pristine cache are identical, then we don't believe it's meaningful
if the modification time happens to match that of the file in the working
directory.
M ./src/Darcs/Lock.lhs -1 +4
M ./src/Darcs/Repository/Prefs.lhs -4 +8
M ./src/Darcs/SlurpDirectory.lhs -12 +9
[darcs-devel] darcs patch: issue572: Add Some .waf files to the default boring list.
Sat Feb 2 22:15:17 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue572: Add Some .waf files to the default boring list.
New patches:
[issue572: Add Some .waf files to the default boring list.
Mark Stosberg [EMAIL PROTECTED]**20080203031517] hunk ./src/Darcs/Repository/Prefs.lhs 175
+ -- WAF files. ( http://code.google.com/p/waf/ )
+ (^|/)\\.waf-[[:digit:].]+-[[:digit:]]+($|/),
+ (^|/)\\.lock-wscript$,
Context:
[move failing issue458 test to bugs/
David Roundy [EMAIL PROTECTED]**20080202202810]
[Typo.
Trent W. Buck [EMAIL PROTECTED]**20080202083642]
[Typo.
Trent W. Buck [EMAIL PROTECTED]**20080202083347]
[clean up files we only speculatively downloaded.
David Roundy [EMAIL PROTECTED]**20080202164906]
[provide nicer output when identifying repository.
David Roundy [EMAIL PROTECTED]**20080202164843]
[print progress reports less frequently.
David Roundy [EMAIL PROTECTED]**20080202161901
On my laptop this provides a noticeable performance improvement. And to
me, having less rapid jumping on the screen is also a bonus.
]
[simplify speculation on patch contents.
David Roundy [EMAIL PROTECTED]**20080202142649]
[use faster queue type in URL.hs.
David Roundy [EMAIL PROTECTED]**20080202142619]
[refactor speculate a bit.
David Roundy [EMAIL PROTECTED]**20080201202752]
[try to make speculation and pipelining help us.
David Roundy [EMAIL PROTECTED]**20080201181524]
[avoid parsing all patches in darcs get.
David Roundy [EMAIL PROTECTED]**20080201214747]
[add friendly interface for speculative pipelining of downloads.
David Roundy [EMAIL PROTECTED]**20080201154000]
[issue496: move failing test to ./bugs
Mark Stosberg [EMAIL PROTECTED]**20080202162828]
[Don't use the builtin !; it has the wrong semantics.
Trent W. Buck [EMAIL PROTECTED]**20080202103848]
[Add functional sh test for issue496.
Trent W. Buck [EMAIL PROTECTED]**20080202103816]
[Add functional sh test for issue458.
Trent W. Buck [EMAIL PROTECTED]**20080202095122]
[improved test for binaries: We now have both a positive and negative test
Mark Stosberg [EMAIL PROTECTED]**20080202150109]
[issue469: test that _darcs/prefs/binaries matches against full path
Mark Stosberg [EMAIL PROTECTED]**20080202024805]
[Fix --no-ephemeral.
[EMAIL PROTECTED]
[rename segregate{F,R}L into partition{F,R}L.
[EMAIL PROTECTED]
[Fix darcs get --lazy (Partial was used instead of Lazy).
[EMAIL PROTECTED]
[match absolute paths on binaries regexps.
David Roundy [EMAIL PROTECTED]**20080201152320]
[avoid needless locking of hashed repositories.
David Roundy [EMAIL PROTECTED]**20080201150941]
[don't display progress when running --list-options. (issue635)
David Roundy [EMAIL PROTECTED]**20080201144458]
[give feedback after successful push or put.
David Roundy [EMAIL PROTECTED]**20080131230525]
[use System.Process when calling darcs apply
David Roundy [EMAIL PROTECTED]**20080131230305
This allows us to get immediate feedback as to how the remote apply is
proceeding.
]
[use System.Process for running ssh and other commands.
David Roundy [EMAIL PROTECTED]**20080131223831]
[fix issue 257 by not ignoring exit code of apply.
David Roundy [EMAIL PROTECTED]**20080131220054]
[fix bug in whatsnew when replace is used.
David Roundy [EMAIL PROTECTED]**20080131201648]
[Show a replace+whatsnew -s bug.
[EMAIL PROTECTED]
[define segregateFL and segregateRL utility functions.
David Roundy [EMAIL PROTECTED]**20080131200620]
[Fix an error message, in case of using subcommands.
[EMAIL PROTECTED]
[default to get copying all patches.
David Roundy [EMAIL PROTECTED]**20080131195151
You can use --lazy (or ^C) to get a lazy repository.
]
[add test (failing) for issue257 (from vmiklos, thanks!)
David Roundy [EMAIL PROTECTED]**20080131195118]
[fix bug in unrevert. (issue366)
David Roundy [EMAIL PROTECTED]**20080131192202]
[give progress report on initial checking of repository validity.
David Roundy [EMAIL PROTECTED]**20080131181249
I'm not sure how much good this will do, since the downloading function
probably blocks progress output.
]
[clean up in unrevert_cancel.sh
David Roundy [EMAIL PROTECTED]**20080131175149]
[make bunchFL compile with type witnesses by adding a signature.
David Roundy [EMAIL PROTECTED]**20080131155718]
[refactor convert.
David Roundy [EMAIL PROTECTED]**20080131155547
This also makes convert slightly more efficient in cases where there is a
large first patch.
]
[make darcs get --hashed safe on case-insensitive filesystems.
David Roundy [EMAIL PROTECTED]**20080131155112]
[define handy bunchFL function for grouping patches into batches.
David Roundy [EMAIL PROTECTED]**20080131154631]
[fix conflict-doppleganger test to work with change in flags get accepts.
David Roundy [EMAIL PROTECTED]**20080131153250]
[oops, the build of the manual broke when I hid convert...
David Roundy [EMAIL PROTECTED]**20080130230705
rolling back:
Wed Jan 30 16:39:45 EST 2008 David Roundy [EMAIL PROTECTED
[darcs-devel] [issue639] wish: new hook to support automatic commit e-mails
New submission from Mark Stosberg [EMAIL PROTECTED]: This wish was found in the Debian Bug Tracker, submitted by 'luca', who I'm adding to the 'nosy' list: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=462330 ### The Debian Common Lisp Team [2] would like to receive a mail every time a new patch (or a patch bundle) is applied to one of its darcs repositories ([3], point 3). Searching on the darcs BTS gave only bug #304 [4], which is not exactly the same issue I'm reporting. Searching on the net was far more useful, since I found a patch by Olivier Thauvin [5] which should allow such a feature in an easy way. However, I could not find any official comment about Olivier's patch, which seems to not have been applied in the stable nor unstable darcs repositories. What's available ATM is a shell script by Marco Baringer [6] (included for archive purpose), which is already used for the BESE project [7]. While I ignore the original ideas behind this script, what's funny is that its aim is exactly the same as Olivier Thauvin's patch [5]. Thx, bye, Gismo / Luca Footnotes: [1] http://darcs.debian.org [2] http://pkg-common-lisp.alioth.debian.org [3] http://lists.alioth.debian.org/pipermail/pkg-common-lisp-devel/2008-January/00.html [4] http://bugs.darcs.net/issue304 [5] http://thread.gmane.org/gmane.comp.version-control.darcs.devel/4049 [6] http://alioth.debian.org/~gismo/darcs-email-changelog.sh [7] http://common-lisp.net/project/bese/ -- messages: 3070 nosy: beschmi, droundy, kowey, luca, markstos, tommy priority: wishlist status: deferred title: wish: new hook to support automatic commit e-mails __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue639 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue635] darcs add --quiet is not quiet
New submission from Mark Stosberg [EMAIL PROTECTED]: The tab completion for darcs2 looks broken because the current line gets overwritten. This could be solved by adding --quiet in the right place in tools/darcs_completion, assuming all commands take a --quiet option. However, as you can see by testing on the darcs repo itself, the --quiet option is not currently quiet when used with the add command. It still outputs a progress report, which looks rather broken it is being used as the backend to the tab completion trick: cd tools/ darcs add --quiet --list-options -- messages: 3011 nosy: beschmi, droundy, kowey, markstos, tommy priority: bug status: unread title: darcs add --quiet is not quiet topic: Darcs2 __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue635 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue366: test when unrevert reports a bug
Wed Jan 30 23:23:13 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue366: test when unrevert reports a bug
New patches:
[issue366: test when unrevert reports a bug
Mark Stosberg [EMAIL PROTECTED]**20080131042313] {
addfile ./bugs/unrevert_cancel.sh
hunk ./bugs/unrevert_cancel.sh 1
+#!/bin/sh
+
+# From issue366 bug report
+
+set -ev
+
+test $DARCS || DARCS=$PWD/../darcs
+
+rm -rf temp1
+mkdir temp1
+cd temp1
+$DARCS init
+touch a
+touch b
+$DARCS add *
+$DARCS record -A moi -am init
+echo plim a
+echo plim b
+echo y/y/y/ | tr / \\012 | $DARCS revert
+echo ploum a
+echo ny | tr / \\012 | $DARCS unrevert
}
Context:
[roll back foolish file modification time hack.
David Roundy [EMAIL PROTECTED]**20080130224322
As it turns out, I didn't understand what ctime means, thinking that it
was actually a creation time. But alas, ctime changes whenver mtime
changes, so we can't use their equality to check if the mtime has been
set. Ugh. I feel silly.
rolling back:
Wed Jan 30 12:12:32 EST 2008 David Roundy [EMAIL PROTECTED]
* employ new hack to avoid need to wait for clock to tick.
The new hack is that if the creation time and modification time of a file
in the pristine cache are identical, then we don't believe it's meaningful
if the modification time happens to match that of the file in the working
directory.
M ./src/Darcs/Lock.lhs -1 +4
M ./src/Darcs/Repository/Prefs.lhs -4 +8
M ./src/Darcs/SlurpDirectory.lhs -12 +9
]
[refactor readPatchInfo using Maybe monad.
David Roundy [EMAIL PROTECTED]**20080130220306]
[fix issue46, parsing problem caused by wrong use of error.
David Roundy [EMAIL PROTECTED]**20080130220129]
[hide convert.
David Roundy [EMAIL PROTECTED]**20080130213945
Since this is a command that *must* be performed only once per group of
related repositories, I think making it only visible in the documentation
should reduce errors.
]
[remove --darcs-2 from get options (issue606)
David Roundy [EMAIL PROTECTED]**20080130213712]
[fix imports for win32.
David Roundy [EMAIL PROTECTED]**20080130212629]
[make rollback default to a long comment indicating what was rolled back.
David Roundy [EMAIL PROTECTED]**20080130200814]
[employ new hack to avoid need to wait for clock to tick.
David Roundy [EMAIL PROTECTED]**20080130171232
The new hack is that if the creation time and modification time of a file
in the pristine cache are identical, then we don't believe it's meaningful
if the modification time happens to match that of the file in the working
directory.
]
[fix build failure under win32 (hopefully). Sorry!
David Roundy [EMAIL PROTECTED]**20080130170953]
[rollback features that apparently are needed.
David Roundy [EMAIL PROTECTED]**20080129203711
These seem to be needed (at least some of them) to do
darcs get http://darcs.net/repos/unstable
]
[[issue558] Singular 'do you want to revert this change?'
Eric Kow [EMAIL PROTECTED]**20080129163633]
[Refactor SelectChanges English.
Eric Kow [EMAIL PROTECTED]**20080129163619]
[Add some simple English morphology.
Eric Kow [EMAIL PROTECTED]**20080129163613]
[fix ssh connection business to work if one darcs command accesses two distinct repos on same server.
David Roundy [EMAIL PROTECTED]**20080129162911]
[Remove features not used in parsing patch dates.
Eric Kow [EMAIL PROTECTED]**20080129092401]
[[issue625] Non-recursive --repodir.
Eric Kow [EMAIL PROTECTED]**20080128193459]
[Do not announce recipients in send -O.
Eric Kow [EMAIL PROTECTED]**20080128151812]
[Test for issue625.
Eric Kow [EMAIL PROTECTED]**20080128150059]
[[issue457] Check match syntax early.
Eric Kow [EMAIL PROTECTED]**20080128144840]
[ratify use of hGetContents.
David Roundy [EMAIL PROTECTED]**20080129150247]
[Fix curl version check for pipelining.
Dmitry Kurochkin [EMAIL PROTECTED]**20080128223731]
[refactor issue154 test to match Eric Kow's echo_to_darcs() refactor. The test should pass.
Mark Stosberg [EMAIL PROTECTED]**20080129004921]
[Update docs for echo_to_darcs() to match Eric Kow's code refactor
Mark Stosberg [EMAIL PROTECTED]**20080129004448]
[Adding Test/Builder/Module.pm to the tree, unmodified.
Mark Stosberg [EMAIL PROTECTED]**20080129003230
Thanks to Kevin Quick for noticing this was missing.
]
[Extract external-merge from {apply,pull} conflict options.
[EMAIL PROTECTED]
[Don't emit \r when the handle is a terminal.
[EMAIL PROTECTED]
[Replace unpull by obliterate as much as possible.
[EMAIL PROTECTED]
[Move rollback to another section of TheCommands.
[EMAIL PROTECTED]
[give progress output when getting over ssh.
David Roundy [EMAIL PROTECTED]**20080128222133]
[remove progress output that seems too often to be unhelpful.
David Roundy [EMAIL PROTECTED]**20080128221922]
[nicer error message in ssh connection code.
David Roundy [EMAIL PROTECTED]**20080128221229]
[use new ssh connection for copySSHs as well (speed my test up by 20% from the sftp code).
David Roundy [EMAIL PROTECTED
[darcs-devel] [issue498] progress indicators
There is now a progress reporting framework in the unstable branch. -- nosy: +markstos status: chatting - resolved-in-unstable __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue498 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] Darcs2 problem
On Mon, 28 Jan 2008, Andreas wrote: I've also taken the time to test the new darcs2 and I think I may have found a problem. I have 2 repositories A and B. B is bigger than A. It has all the patches from A and some more. Now I independently converted both repositories to darc2 format - A2 and B2 The intend is that for one group of repositories, darcs convert should only be run once. Perhaps this needs to be better documented. So, you could run darcs convert on the bigger repository, copy it with get, and then unpull patches until you have a copy to replace the smaller one. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: Test infrastructure improvement: Add debug mode to Per...
Sat Jan 26 10:44:44 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Test infrastructure improvement: Add debug mode to Perl test scripts.
Set this to see the output of every 'darcs' call made through this script:
DARCS_DEBUG=1 ./bin/prove -v add.pl pull.pl
New patches:
[Test infrastructure improvement: Add debug mode to Perl test scripts.
Mark Stosberg [EMAIL PROTECTED]**2008012615
Set this to see the output of every 'darcs' call made through this script:
DARCS_DEBUG=1 ./bin/prove -v add.pl pull.pl
] {
hunk ./tests/lib/perl/Test/Darcs.pm 2
+use Test::More; # provides diag;
hunk ./tests/lib/perl/Test/Darcs.pm 18
+use vars '$DEBUG';
+
+$DEBUG = $ENV{DARCS_DEBUG} || 0;
hunk ./tests/lib/perl/Test/Darcs.pm 103
-return `IFS='' $darcs @commands 21`;
+my $out = `IFS='' $darcs @commands 21`;
+
+diag DEBUG output for darcs @commands:\n\t$out if ($DEBUG $out);
+return $out;
hunk ./tests/lib/perl/Test/Darcs.pm 140
-my $output = join '', READ;
+my $out = join '', READ;
hunk ./tests/lib/perl/Test/Darcs.pm 156
-return $output;
+diag DEBUG:\n\t$out if ($DEBUG $out);
+
+return $out;
hunk ./tests/lib/perl/Test/Darcs.pm 201
+=head3 DARCS_DEBUG
+
+Set this to see the output of every 'darcs' call made through this script:
+
+ DARCS_DEBUG=1 ./bin/prove -v add.pl pull.pl
+
}
Context:
[resolve conflict with Eric on controlMasterPath.
David Roundy [EMAIL PROTECTED]**20080125203903]
[More concise backup warning.
Eric Kow [EMAIL PROTECTED]**20071105012930]
[Remove now obsolete wrapper for Map (we now require GHC = 6.4).
Eric Kow [EMAIL PROTECTED]**20071105192636]
[Modernise Data.Map import.
Eric Kow [EMAIL PROTECTED]**20071105192530]
[Give ssh CM socket a unique name for each darcs process.
Eric Kow [EMAIL PROTECTED]**20071105021956
Delete the socket in the unlikely event that a previous darcs had a socket
with the same name left over.
]
[Create ssh CM socket in $HOME/.darcs if possible.
Eric Kow [EMAIL PROTECTED]**20071105015525]
[Refactor y/n prompts.
Eric Kow [EMAIL PROTECTED]**20071019213307]
[eliminate lazy parsing of patches, which gives bad error messages (issue364)
David Roundy [EMAIL PROTECTED]**20080125191836]
[[issue492] Check that context file actually exists in darcs get.
Eric Kow [EMAIL PROTECTED]**20080125183741]
[[issue227] Platform-independent absolute paths in get --context
Eric Kow [EMAIL PROTECTED]**20080125181702]
[make uniqueoptions.sh test give friendlier output.
David Roundy [EMAIL PROTECTED]**20080125183430]
[fix code to avoid duplicate --verbose in --help (so tests will pass).
David Roundy [EMAIL PROTECTED]**20080125183420]
[Make verbosity flags advanced options universally.
Eric Kow [EMAIL PROTECTED]**20080125181005]
[More error messages for libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20080124092600]
[report progress in writing the inventory out for hashed repos.
David Roundy [EMAIL PROTECTED]**20080125172017]
[make empty key case of progress reporting fast.
David Roundy [EMAIL PROTECTED]**20080125171859]
[fix issue where we overwrote prompt with progress info.
David Roundy [EMAIL PROTECTED]**20080125164609]
[fix bug where we used show on an exception (and thus printed User error).
David Roundy [EMAIL PROTECTED]**20080125164209
This partially addresses issue168 by improving the error message.
]
[add gnulib sha1.c file as a faster sha1 option.
David Roundy [EMAIL PROTECTED]**20080123212502]
[fix embarrassing bug in External.
David Roundy [EMAIL PROTECTED]**20080125152329
(which demonstrates that I didn't compile before pushing)
]
[for now, print progress reports to stdout.
David Roundy [EMAIL PROTECTED]**20080125152105
My hope is that this will alleviate some of the issues with progress
reports overwriting prompts.
]
[revamp progress reporting, making it more efficient and adding more output.
David Roundy [EMAIL PROTECTED]**20080125151540
Note that there is still at least one time sink that remains to be identified.
]
[avoid creating darcs-ssh if we aren't using ControlMaster. (issue613)
David Roundy [EMAIL PROTECTED]**20080125150846]
[fix bug where darcs-ssh got even worse name (issue613).
David Roundy [EMAIL PROTECTED]**20080125150355]
[provide more detailed progress reports in HashedIO.
David Roundy [EMAIL PROTECTED]**20080124145156]
[print additional debug data in Progress.
David Roundy [EMAIL PROTECTED]**20080124145114]
[add a few more debug messages in Repository.Internal.
David Roundy [EMAIL PROTECTED]**20080124144829]
[fix incorrect report that we were reading patches.
David Roundy [EMAIL PROTECTED]**20080124125040]
[adding File::Temp 0.20 to tree for more consistent test results. It is GPL-licensed.
Mark Stosberg [EMAIL PROTECTED]**20080124033049]
[issue608: a new test for 'mv', following Zooko's bug report
Mark Stosberg [EMAIL PROTECTED]**20080124013856]
[ issue602: part 1: Always prefer our private copy of Test::More over the system-wide one for more consistent results
Mark Stosberg [EMAIL PROTECTED
[darcs-devel] darcs patch: remove now-unused perl_harness (and 4 more)
Sat Jan 19 19:58:50 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* remove now-unused perl_harness
Sat Jan 19 20:05:53 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Remove more unneeded --author flags in the Perl test scripts, because the
harness takes care of them
Wed Jan 23 20:35:52 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* replace system call with Perl for better portability
Wed Jan 23 23:41:37 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* improved tempdir handling-- include the script name in the directory name,
and better auto-cleanup
Wed Jan 23 23:42:45 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* make sure we are outside of the tempdir so the auto-cleanup can happen.
New patches:
[remove now-unused perl_harness
Mark Stosberg [EMAIL PROTECTED]**20080120005850]
[replace perl_harness with the more powerful and flexible prove script.
Mark Stosberg [EMAIL PROTECTED]**20080120003101
See perldoc bin/prove for feature descriptions.
]
[Take advantage of updated Perl testing infrastructure by removing needless author mentions in tests
Mark Stosberg [EMAIL PROTECTED]**20080120004503]
[Take advantage of new Perl testing infrastructure by eliminating needless --ignore-time mentions
Mark Stosberg [EMAIL PROTECTED]**20080120005242]
{
hunk ./tests/perl_harness 1
-#!/usr/bin/env perl
-
-use lib 'lib/perl';
-use Test::Harness;
-
-runtests(@ARGV) if $#ARGV -1;
rmfile ./tests/perl_harness
}
[Remove more unneeded --author flags in the Perl test scripts, because the harness takes care of them
Mark Stosberg [EMAIL PROTECTED]**20080120010553]
[remove now-unused perl_harness
Mark Stosberg [EMAIL PROTECTED]**20080120005850]
{
hunk ./tests/pending_has_conflicts.pl 32
-my $record_output = darcs(qw/record -A x -a -m foo/);
+my $record_output = darcs 'record -a -m foo';
hunk ./tests/pull.pl 39
-darcs q(record --patch-name 'uno' --all --author [EMAIL PROTECTED]);
+darcs q(record --patch-name 'uno' --all );
hunk ./tests/pull.pl 49
-darcs q(record --repodir ./temp2 --author [EMAIL PROTECTED] -a -m 'foo');
+darcs q(record --repodir ./temp2 -a -m 'foo');
hunk ./tests/pull.pl 103
-darcs 'record -lam AA --author [EMAIL PROTECTED]';
+darcs 'record -lam AA ';
hunk ./tests/pull.pl 105
-darcs 'record -lam BB --author [EMAIL PROTECTED]';
+darcs 'record -lam BB ';
hunk ./tests/pull.pl 107
-darcs 'record -lam CC --author [EMAIL PROTECTED]';
+darcs 'record -lam CC ';
hunk ./tests/pull.pl 126
- darcs 'record -am newbaz --author me';
+ darcs 'record -am newbaz ';
hunk ./tests/pull.pl 130
- darcs 'record -am bazbar --author me';
+ darcs 'record -am bazbar ';
hunk ./tests/pull.pl 146
- darcs 'record -am newdir --author me';
+ darcs 'record -am newdir ';
hunk ./tests/push.pl 41
-darcs qw!record --patch-name 'uno' --all --author [EMAIL PROTECTED];
+darcs qw!record --patch-name 'uno' --all !;
hunk ./tests/set_scripts_executable.pl 35
-like( ( darcs qw!record --patch-name 'uno' --all --author [EMAIL PROTECTED] ), qr/finished recording/i );
+like( ( darcs qw!record --patch-name 'uno' --all ! ), qr/finished recording/i );
hunk ./tests/tag.pl 15
-darcs record --patch-name 'uno' --all --author [EMAIL PROTECTED];
+darcs record --patch-name 'uno' --all ;
hunk ./tests/workingdir.pl 25
-darcs 'record -am aa --author me';
+darcs 'record -am aa ';
hunk ./tests/workingdir.pl 31
-darcs 'record -am x to y --author me';
+darcs 'record -am x to y ';
hunk ./tests/workingdir.pl 34
-darcs 'record -am bb --author me';
+darcs 'record -am bb ';
hunk ./tests/workingdir.pl 37
-darcs 'record -am dd --author me';
-my $out = darcs 'tag 1 --author me';
+darcs 'record -am dd ';
+my $out = darcs 'tag 1 ';
hunk ./tests/workingdir.pl 40
-darcs 'record -am b2 --author me';
+darcs 'record -am b2 ';
}
[replace system call with Perl for better portability
Mark Stosberg [EMAIL PROTECTED]**20080124013552] {
hunk ./tests/mv.pl 8
-use Cwd;
+use Cwd 'abs_path';
hunk ./tests/mv.pl 119
- my $repo_abs = `pwd`;
+ my $repo_abs = abs_path();
hunk ./tests/mv.pl 126
- my $repo_abs = `pwd`;
+ my $repo_abs = abs_path();
}
[improved tempdir handling-- include the script name in the directory name, and better auto-cleanup
Mark Stosberg [EMAIL PROTECTED]**20080124044137] {
hunk ./tests/lib/perl/Test/Darcs.pm 5
-use File::Temp 'tempdir';
+use File::Temp ();
hunk ./tests/lib/perl/Test/Darcs.pm 124
-use File::Temp qw/tempfile/;
-my ($fh, $filename) = tempfile();
+my $fh = File::Temp-new;
+my $filename = $fh-filename;
hunk ./tests/lib/perl/Test/Darcs.pm 144
- use Test::Builder;
- my $Test = Test::Builder-new;
- $Test-ok (0, superfluous input for $command);
+use Test::Builder;
+my $Test = Test::Builder-new;
+$Test-ok (0, superfluous input for $command);
hunk ./tests/lib/perl/Test/Darcs.pm 166
+# Using a package scope keeps the variable in scope until the script exits,
+# which helps with the automatic clean-up.
+our $dir;
hunk ./tests/lib/perl/Test/Darcs.pm
[darcs-devel] [issue589] buggy error message: Impossible case in darcs PatchRead.lhs or Patch/Read.lhs
Michael, Thank for the additional testing. I know the download/compile/test cycle can be time consuming. Based on your report, I'm marking this as resolved-in-unstable. The numbers you are seeing are part of a new progress reporting framework It is still getting the kinks worked out, but is unrelated to this bug. Thanks again for your feedback and help with darcs! Mark -- status: testing - resolved-in-unstable __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue589 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue154: regression test for pull with a directory re...
Sun Jan 27 00:38:11 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue154: regression test for pull with a directory removal conflict
New patches:
[issue154: regression test for pull with a directory removal conflict
Mark Stosberg [EMAIL PROTECTED]**20080127053811] {
addfile ./tests/pull_directory_not_empty.pl
hunk ./tests/pull_directory_not_empty.pl 1
+#!/usr/bin/env perl
+
+# A test for pulling a patch to remove a directory when the local copy is not empty.
+# Issue154
+
+use lib 'lib/perl';
+use Test::More 'no_plan';
+use Test::Darcs;
+use Shell::Command;
+use strict;
+use warnings;
+use File::Slurp;
+
+init_tmp_repo();
+
+mkdir 'd';
+darcs 'add d';
+darcs 'record -a -m Added directory d';
+
+darcs 'get ./ puller';
+chdir 'puller';
+touch 'd/moo';
+darcs 'add d/moo';
+chdir '../';
+
+rm_rf 'd';
+darcs 'record -a -m Remove directory d';
+ok( (chdir 'puller'), chdir puller);
+my $out = echo_to_darcs 'y', pull -a ../;
+like($out, qr{
+ backing\sup
+ .*
+ finished\spulling
+ }imsx
+, result is that locally directory gets backed up and pull succeeds);
+
+
+
}
Context:
[resolve conflict with Eric on controlMasterPath.
David Roundy [EMAIL PROTECTED]**20080125203903]
[More concise backup warning.
Eric Kow [EMAIL PROTECTED]**20071105012930]
[Remove now obsolete wrapper for Map (we now require GHC = 6.4).
Eric Kow [EMAIL PROTECTED]**20071105192636]
[Modernise Data.Map import.
Eric Kow [EMAIL PROTECTED]**20071105192530]
[Give ssh CM socket a unique name for each darcs process.
Eric Kow [EMAIL PROTECTED]**20071105021956
Delete the socket in the unlikely event that a previous darcs had a socket
with the same name left over.
]
[Create ssh CM socket in $HOME/.darcs if possible.
Eric Kow [EMAIL PROTECTED]**20071105015525]
[Refactor y/n prompts.
Eric Kow [EMAIL PROTECTED]**20071019213307]
[eliminate lazy parsing of patches, which gives bad error messages (issue364)
David Roundy [EMAIL PROTECTED]**20080125191836]
[[issue492] Check that context file actually exists in darcs get.
Eric Kow [EMAIL PROTECTED]**20080125183741]
[[issue227] Platform-independent absolute paths in get --context
Eric Kow [EMAIL PROTECTED]**20080125181702]
[make uniqueoptions.sh test give friendlier output.
David Roundy [EMAIL PROTECTED]**20080125183430]
[fix code to avoid duplicate --verbose in --help (so tests will pass).
David Roundy [EMAIL PROTECTED]**20080125183420]
[Make verbosity flags advanced options universally.
Eric Kow [EMAIL PROTECTED]**20080125181005]
[More error messages for libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20080124092600]
[report progress in writing the inventory out for hashed repos.
David Roundy [EMAIL PROTECTED]**20080125172017]
[make empty key case of progress reporting fast.
David Roundy [EMAIL PROTECTED]**20080125171859]
[fix issue where we overwrote prompt with progress info.
David Roundy [EMAIL PROTECTED]**20080125164609]
[fix bug where we used show on an exception (and thus printed User error).
David Roundy [EMAIL PROTECTED]**20080125164209
This partially addresses issue168 by improving the error message.
]
[add gnulib sha1.c file as a faster sha1 option.
David Roundy [EMAIL PROTECTED]**20080123212502]
[fix embarrassing bug in External.
David Roundy [EMAIL PROTECTED]**20080125152329
(which demonstrates that I didn't compile before pushing)
]
[for now, print progress reports to stdout.
David Roundy [EMAIL PROTECTED]**20080125152105
My hope is that this will alleviate some of the issues with progress
reports overwriting prompts.
]
[revamp progress reporting, making it more efficient and adding more output.
David Roundy [EMAIL PROTECTED]**20080125151540
Note that there is still at least one time sink that remains to be identified.
]
[avoid creating darcs-ssh if we aren't using ControlMaster. (issue613)
David Roundy [EMAIL PROTECTED]**20080125150846]
[fix bug where darcs-ssh got even worse name (issue613).
David Roundy [EMAIL PROTECTED]**20080125150355]
[provide more detailed progress reports in HashedIO.
David Roundy [EMAIL PROTECTED]**20080124145156]
[print additional debug data in Progress.
David Roundy [EMAIL PROTECTED]**20080124145114]
[add a few more debug messages in Repository.Internal.
David Roundy [EMAIL PROTECTED]**20080124144829]
[fix incorrect report that we were reading patches.
David Roundy [EMAIL PROTECTED]**20080124125040]
[adding File::Temp 0.20 to tree for more consistent test results. It is GPL-licensed.
Mark Stosberg [EMAIL PROTECTED]**20080124033049]
[issue608: a new test for 'mv', following Zooko's bug report
Mark Stosberg [EMAIL PROTECTED]**20080124013856]
[ issue602: part 1: Always prefer our private copy of Test::More over the system-wide one for more consistent results
Mark Stosberg [EMAIL PROTECTED]**20080124005407]
[reenable mandatory sha1 checks, now that we can link with a faster sha1.
David Roundy [EMAIL PROTECTED]**20080123203104]
[remove (broken) git support and add openssl sha1 support
[darcs-devel] [issue610] wish: hide advanced with --help-advanced
Wagner Ferenc wrote: David Roundy [EMAIL PROTECTED] writes: On Thu, Jan 24, 2008 at 09:56:18AM +0100, Nicolas Pouillard wrote: What about automatically launching a pager ($PAGER) when the output is a tty? Note: That's git default I think this is probably the better option. It would be especially nice if the pager preserved coloring of the output. Is there a way to get darcs1 output escape sequences when writing to a pipe? Er, I could as well have a look... I think what you are getting at might be how the defaults are set up for the Perl-based 'ack' program: If the output is a tty, color is on by default. However, if output is a pipe, color is off by default, since other programs tend to expect plain text. Related: I believe less doesn't handle color escape codes by default. You have to invoke it with -R for that. Mark __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue610 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue227] get --context fails with absolute path in win32
Is there anyone on darcs-devel that could help with what looks an easy bug fix
for Windows? See the issue tracker link online for more context:
On Thu, Jan 24, 2008 at 02:32:01 -, Mark Stosberg wrote:
let opts = fix_context orig_opts
fix_context o@(Context ('/':_):_) = o
fix_context (Context f:os) = Context (former_dir++/++f):os
fix_context (o:os) = o : fix_context os
fix_context [] = []
Hmm, darcs does have a more platform-independent is_absolute function
(Darcs.Url, I think) we could use. Want to try plugging it in?
--
nosy: +darcs-devel, jaredj, rgm
topic: +ProbablyEasy
__
Darcs bug tracker [EMAIL PROTECTED]
http://bugs.darcs.net/issue227
__
___
darcs-devel mailing list
darcs-devel@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue610] wish: hide advanced with --help-advanced
What about automatically launching a pager ($PAGER) when the output is a tty? That would help because it would leave the basic help visible at the top of the screen. And I suppose I could quit the pager before scrolling down to view the advanced text. There definitely other uses of darcs where I wish that was the default. For example, on a project with any history, you almost always want darcs changes | $PAGER not just darcs changes anyway. Mark __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue610 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue608: a new test for 'mv', following Zooko's bug r...
Wed Jan 23 20:38:56 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue608: a new test for 'mv', following Zooko's bug report
New patches:
[issue608: a new test for 'mv', following Zooko's bug report
Mark Stosberg [EMAIL PROTECTED]**20080124013856] {
hunk ./tests/mv.pl 6
-use Test::More tests = 12;
+use Test::More tests = 13;
hunk ./tests/mv.pl 132
+# issue608
+{
+ touch 'gonna_be_deleted';
+ darcs add gonna_be_deleted;
+ darcs record -am 'added doomed file';
+ rm_rf gonna_be_deleted;
+ darcs record -am 'deleted file';
+ touch 'new_file';
+ darcs add new_file;
+ my $out = darcs mv new_file gonna_be_deleted;
+ is($out, , darcs mv should succeed);
+}
+
+
+
}
Context:
[reenable mandatory sha1 checks, now that we can link with a faster sha1.
David Roundy [EMAIL PROTECTED]**20080123203104]
[remove (broken) git support and add openssl sha1 support.
David Roundy [EMAIL PROTECTED]**20080123202025
These two changes got merged together as I was introducing the configure.ac
changes to support openssl as a sha1 alternative to our Haskell code.
(Yes, I'm lazy.)
]
[remove redundant hash checks in hashed IO code.
David Roundy [EMAIL PROTECTED]**20080123173022]
[output nicer progress in convert.
David Roundy [EMAIL PROTECTED]**20080123170428]
[output timings when --timings is specified.
David Roundy [EMAIL PROTECTED]**20080123170314]
[remove inaccurate message in convert.
David Roundy [EMAIL PROTECTED]**20080123170243]
[use debugMessage in HashedIO.
David Roundy [EMAIL PROTECTED]**20080123160835]
[add --timings flag (that as yet does nothing).
David Roundy [EMAIL PROTECTED]**20080123154931]
[add regression test for amend-record removed file
Tommy Pettersson [EMAIL PROTECTED]**2008013231]
[use UTC in date matching test untill match handles time zones
Tommy Pettersson [EMAIL PROTECTED]**20080122134322]
[fix bug with timestamps and obliterate.
David Roundy [EMAIL PROTECTED]**2008014607]
[Test: unpull may hide changes when using timestamp optimisation.
[EMAIL PROTECTED]
[avoid printing totals that are less than our current progress.
David Roundy [EMAIL PROTECTED]**20080122210546]
[TAG 2.0.0pre3
David Roundy [EMAIL PROTECTED]**20080122200612]
[fix bug in restrictive_upstream_permissions test, and mark it as passing.
David Roundy [EMAIL PROTECTED]**20080122200429]
[match against any repo (not just last) in determining version/state.
David Roundy [EMAIL PROTECTED]**20080122194501]
[add a few changelog entries.
David Roundy [EMAIL PROTECTED]**20080122194307]
[avoid a withCurrentDirectory if there's nothing to test.
David Roundy [EMAIL PROTECTED]**20080122192426]
[Libwww: fix invalid read reported by valgrind.
Dmitry Kurochkin [EMAIL PROTECTED]**20080122162936]
[fix obliterate to work even on old patches before tags.
David Roundy [EMAIL PROTECTED]**20080122150520]
[make match_a_patch and friends return true for all patches if no match is specified.
David Roundy [EMAIL PROTECTED]**20080122150210]
[fix changes_moved_files bug.
David Roundy [EMAIL PROTECTED]**20080122141421]
[mark optimize-relink as passing now.
David Roundy [EMAIL PROTECTED]**20080121191822]
[don't compate pending and pending.tentative in optimize_relink.sh.
David Roundy [EMAIL PROTECTED]**20080121191656]
[add patch to repo in optimize_relink.sh.
David Roundy [EMAIL PROTECTED]**20080121191642]
[handle relative sibling directory properly.
David Roundy [EMAIL PROTECTED]**20080121191225]
[simplify optimize --relink test, always calling directory temp.
David Roundy [EMAIL PROTECTED]**20080121182231]
[if fs doesn't support hard links, we should pass the relink test.
David Roundy [EMAIL PROTECTED]**20080121181647]
[Libwww new API: waitUrl, copyUrlFirst added; copyUrls removed.
Dmitry Kurochkin [EMAIL PROTECTED]**20080120215022]
[avoid overwriting prompt when waiting for input.
David Roundy [EMAIL PROTECTED]**20080121162814]
[add withoutProgress to halt progress messages for a bit.
David Roundy [EMAIL PROTECTED]**20080121162513]
[add some changelog entries
Tommy Pettersson [EMAIL PROTECTED]**20080120003041]
[print progress messages to stderr.
David Roundy [EMAIL PROTECTED]**20080121154515
Note that to get clean results, we still need to print overwrite spaces to
stdout, so I'm not sure this is the best of plans.
]
[make changes show no progess unless debug mode is on.
David Roundy [EMAIL PROTECTED]**20080121151145]
[make progress report quieter.
David Roundy [EMAIL PROTECTED]**20080119171250]
[no progress reports when running quietly.
David Roundy [EMAIL PROTECTED]**20080119165947]
[change directory name in which we run tests.
David Roundy [EMAIL PROTECTED]**20080119165251]
[issue600: bug fix refinement sent on behalf of twb
Mark Stosberg [EMAIL PROTECTED]**20080121040050]
[issue600: a test for optimize --relink
Mark Stosberg [EMAIL PROTECTED]**20080121034028]
[issue562: Update the .sh scripts and the shell_harness so the tests can succeed when the path name has a space in it.
Mark Stosberg
[darcs-devel] darcs patch: update some ChangeLog entries to also cr... (and 1 more)
Tue Jan 22 18:54:35 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* update some ChangeLog entries to also credit those who contributed through
bug reporting, test writing or feedback.
Tue Jan 22 19:04:17 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* update restrictive perms test to run a temporary directory and clean up
after itself.
Running in a tru temporary directory allows the potential to run tests in
parallel.
New patches:
[update some ChangeLog entries to also credit those who contributed through bug reporting, test writing or feedback.
Mark Stosberg [EMAIL PROTECTED]**20080122235435] {
hunk ./changelog.in/entries/droundy 16
- a file that has an unrecorded mv. (David Roundy)
+ a file that has an unrecorded mv. (David Roundy, Mark Stosberg, Tuomo Valkonen)
hunk ./changelog.in/entries/droundy 20
- Fix issue 600, bug in darcs optimize --relink. (David Roundy)
+ Fix issue 600, bug in darcs optimize --relink. (David Roundy, Trent Buck, Mark Stosberg, Tommy Pettersson)
}
[update restrictive perms test to run a temporary directory and clean up after itself.
Mark Stosberg [EMAIL PROTECTED]**20080123000417
Running in a tru temporary directory allows the potential to run tests in parallel.
] {
hunk ./tests/restrictive_upstream_permissions.pl 22
+# Start in a randomly named temporary directory that deletes itself when we're done.
+use File::Temp 'tempdir';
+chdir tempdir( CLEANUP = 1 );
+
hunk ./tests/restrictive_upstream_permissions.pl 30
-
-cleanup 'tmp_remote';
-cleanup 'tmp_restrictive';
-
hunk ./tests/restrictive_upstream_permissions.pl 50
-
-ok(-d 'tmp_remote', tmp_remote exists here) || `ls -l`;
-rm_rf('tmp_remote');
-ok((!-d 'tmp_remote'), 'tmp_remote directory was deleted');
-
-ok(-d 'tmp_restrictive', tmp_restrictive exists here);
hunk ./tests/restrictive_upstream_permissions.pl 52
-rm_rf('tmp_restrictive');
-ok((!-d 'tmp_restrictive'), 'tmp_restictive directory was deleted');
-
}
Context:
[reenable mandatory sha1 checks, now that we can link with a faster sha1.
David Roundy [EMAIL PROTECTED]**20080123203104]
[remove (broken) git support and add openssl sha1 support.
David Roundy [EMAIL PROTECTED]**20080123202025
These two changes got merged together as I was introducing the configure.ac
changes to support openssl as a sha1 alternative to our Haskell code.
(Yes, I'm lazy.)
]
[remove redundant hash checks in hashed IO code.
David Roundy [EMAIL PROTECTED]**20080123173022]
[output nicer progress in convert.
David Roundy [EMAIL PROTECTED]**20080123170428]
[output timings when --timings is specified.
David Roundy [EMAIL PROTECTED]**20080123170314]
[remove inaccurate message in convert.
David Roundy [EMAIL PROTECTED]**20080123170243]
[use debugMessage in HashedIO.
David Roundy [EMAIL PROTECTED]**20080123160835]
[add --timings flag (that as yet does nothing).
David Roundy [EMAIL PROTECTED]**20080123154931]
[add regression test for amend-record removed file
Tommy Pettersson [EMAIL PROTECTED]**2008013231]
[use UTC in date matching test untill match handles time zones
Tommy Pettersson [EMAIL PROTECTED]**20080122134322]
[fix bug with timestamps and obliterate.
David Roundy [EMAIL PROTECTED]**2008014607]
[Test: unpull may hide changes when using timestamp optimisation.
[EMAIL PROTECTED]
[avoid printing totals that are less than our current progress.
David Roundy [EMAIL PROTECTED]**20080122210546]
[TAG 2.0.0pre3
David Roundy [EMAIL PROTECTED]**20080122200612]
[fix bug in restrictive_upstream_permissions test, and mark it as passing.
David Roundy [EMAIL PROTECTED]**20080122200429]
[match against any repo (not just last) in determining version/state.
David Roundy [EMAIL PROTECTED]**20080122194501]
[add a few changelog entries.
David Roundy [EMAIL PROTECTED]**20080122194307]
[avoid a withCurrentDirectory if there's nothing to test.
David Roundy [EMAIL PROTECTED]**20080122192426]
[Libwww: fix invalid read reported by valgrind.
Dmitry Kurochkin [EMAIL PROTECTED]**20080122162936]
[fix obliterate to work even on old patches before tags.
David Roundy [EMAIL PROTECTED]**20080122150520]
[make match_a_patch and friends return true for all patches if no match is specified.
David Roundy [EMAIL PROTECTED]**20080122150210]
[fix changes_moved_files bug.
David Roundy [EMAIL PROTECTED]**20080122141421]
[mark optimize-relink as passing now.
David Roundy [EMAIL PROTECTED]**20080121191822]
[don't compate pending and pending.tentative in optimize_relink.sh.
David Roundy [EMAIL PROTECTED]**20080121191656]
[add patch to repo in optimize_relink.sh.
David Roundy [EMAIL PROTECTED]**20080121191642]
[handle relative sibling directory properly.
David Roundy [EMAIL PROTECTED]**20080121191225]
[simplify optimize --relink test, always calling directory temp.
David Roundy [EMAIL PROTECTED]**20080121182231]
[if fs doesn't support hard links, we should pass the relink test.
David Roundy [EMAIL PROTECTED]**20080121181647]
[Libwww new API: waitUrl, copyUrlFirst added; copyUrls removed
[darcs-devel] [issue611] wish: --debug, --debug-verbose and --timings should be moved to Advanced Help
New submission from Mark Stosberg [EMAIL PROTECTED]: I think the --debug, --debug-verbose and --timings flags should be moved out of the regular help and into the Advanced Help. Like many of the other advanced options, they are not related to the specific command and are common for many commands. Also, debug commands should hopefully be infrequently needed. -- messages: 2709 nosy: beschmi, droundy, kowey, markstos, tommy priority: wishlist status: unread title: wish: --debug, --debug-verbose and --timings should be moved to Advanced Help __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue611 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] testing: tmp repo names and parallel testing
Sat Jan 19 22:56:51 EST 2008 Mark Stosberg [EMAIL PROTECTED] * Major Perl test suite clean-up. The primary purpose of this patch was make sure all the tests are executed in randomly named directories, which allows us to run Perl tests in parallel, without the directory names collided. This isn't enabled by default for make test, but it is there to play with. In the test directory, you can now do: ./bin/prove -j9 *.pl to run 9 tests in parallel. There is also --fork option which should be a win on multi-CPU computers. See perldoc ./bin/prove for details. As part of this, a lot of boiler-plate code at the top and bottom of the scripts could be eliminated, and I made few other minor style clean-ups while I had the files open. There should be no functional changes to the tests. I'm not sure I like this idea, as it seems likely to lead to greater difficulty in understanding and debugging failing test results. We can already run up to six tests in parallel just by running make -j6 test. Unless I misunderstand how this would work, it is quite likely both tests would have tried to create a repo named temp1 in the same directory at the same time, and there would be a conflict. Also, why make the directory names random? It's the standard tempfile/tempdir way to name temporary files and directories. Couldn't we just generate a unique directory name from the test name itself? So then init_tmp_repo() in test foo.pl would generate a repository named temp1-foo. I have now sent a patch for something like this, that, so that the directory name is like add.pl-tmpdir-, where the become random characters. I discovered I need to go back and update the Perl tests again to add a final chdir to them, so that the auto-deletion of the directories can work properly. There is a way to disable the deleting of the directories if you want to debug them, which I'll also try to document. Also, I'm not necessarily advocating turning parallel tests by default, but I'm interesting in supporting it as an option. Here's another useful new testing technique to try: ./bin/prove --directives *.pl That will show you just tests marked TODO or SKIP. Because it has been hard to report on these in the past, the remaining TODO tests have been largely forgetten. The bugs/ directory serves the same purpose now. With an improved harness for the shell tests, the same script and techniques could work on them, too. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue26] Darcs needs real MIME parsing, fails with Mail.app, Courier
David Roundy wrote: On Sat, Jan 19, 2008 at 02:21:36AM -, Mark Stosberg wrote: My co-worker uses Mail.app and can't detach darcs patches, so my team is directly affected by this. This sounds like it's an issue of darcs generating correct MIME emails, rather than parsing them correctly? Or is it that when he attaches the darcs patches manually to his email, the resulting email can't be parsed by darcs? My understanding is that the patches generated are valid MIME it is the parser on the receiving end that is naive: - It expects the boundary to be a particular thing, but it could be rewritten, as Courier does. - Darcs also assumes the Content-Description header exists and is the last one. Tommy says a simple fix could be to look for the Content-Type header line and search for a blank line from there. (But real MIME parsing would be better). Also, it seems the final dot might be getting mangled. (which might be a considered a Mail.app bug, but would be nice to be robust against). This prior message has a good summary: http://bugs.darcs.net/msg200 Mark __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue26 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue595] get to remote repo fails when upstream directory permisions are restrictive
Assigning to myself as test-script cleanup issue. -- assignedto: - markstos nosy: +markstos status: resolved - chatting __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue595 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue595] get to remote repo fails when upstream directory permisions are restrictive
David beat me to the test-cleanup work. (Thanks!). I'm going to consider this resolved for now, since we now lack a test case which triggers an unresolved problem. -- status: chatting - resolved __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue595 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue605] match.pl tests fails 5 tests with GHC 6.6.1 and 6.8
New submission from Mark Stosberg [EMAIL PROTECTED]: clanehin reported this on IRC, but I was getting the same failures with 6.6.1, but hadn't reported them yet for fear it was something unique to my environment. It seems they might be a real issue. The tests are indicating that in 5 cases, date matching is failing. If it matters, my failures have happened in the Eastern Standard Time timezone at various times of day, and clanehin was also running the tests in the same time zone. My platform was Ubuntu 7.10. clanehin's was Debian/Unstable. # # merging_newlines...ok # match..1/? # # Failed test (match.pl at line 233) # # '' # # doesn't match '(?-xism:tester)' # # # Failed test (match.pl at line 233) # # '' # # doesn't match '(?-xism:tester)' # match..19/? # # Failed test (match.pl at line 233) # # '' # # doesn't match '(?-xism:tester)' # # # Failed test (match.pl at line 233) # # '' # # doesn't match '(?-xism:tester)' # # # Failed test (match.pl at line 233) # # '' # # doesn't match '(?-xism:tester)' # # Looks like you failed 5 tests of 80. # match.. Dubious, test returned 5 (wstat 1280, 0x500) # Failed 5/80 subtests -- assignedto: Coder messages: 2671 nosy: Coder, beschmi, droundy, kowey, markstos, tommy priority: bug status: unread title: match.pl tests fails 5 tests with GHC 6.6.1 and 6.8 topic: Darcs2, Testing __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue605 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue562: update Perl test infrastructur... (and 1 more)
Sun Jan 20 20:42:46 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue562: update Perl test infrastructure so all Perl tests pass with a
space in the path to darcs
Sun Jan 20 22:11:03 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue562: Update the .sh scripts and the shell_harness so the tests can
succeed when the path name has a space in it.
New patches:
[issue562: update Perl test infrastructure so all Perl tests pass with a space in the path to darcs
Mark Stosberg [EMAIL PROTECTED]**20080121014246] {
hunk ./tests/lib/perl/Test/Darcs.pm 70
-return `$darcs @commands 21`;
+# The inclusion of IFS prevents a space in the path to darcs from causing a problem.
+return `IFS='' $darcs @commands 21`;
hunk ./tests/lib/perl/Test/Darcs.pm 101
-my $pid = open2(*READ, *WRITE, $darcs $command ; cat $filename);
+my $pid = open2(*READ, *WRITE, qq( $darcs $command ; cat $filename));
}
[issue562: Update the .sh scripts and the shell_harness so the tests can succeed when the path name has a space in it.
Mark Stosberg [EMAIL PROTECTED]**20080121031103] {
hunk ./tests/addexitval.sh 1
-#! /bin/sh
+#!/bin/sh
hunk ./tests/addexitval.sh 5
-test $DARCS || DARCS=`pwd`/../darcs
-darcs=$DARCS
+test $DARCS || DARCS=$PWD/../darcs
+ACTUAL_DARCS=`which $DARCS`
+DARCSPATH=`dirname $ACTUAL_DARCS`
+PATH=$DARCSPATH:$PATH
+export PATH
+
+# This test seems to be sensitive to having IFS='' set by the test harness, so
+# we set it back and always quote $DARCS instead. Without one or the other
+# approach in place, the test could fail if run on a path with a space init.
+IFS=' '
hunk ./tests/addexitval.sh 19
-$darcs init
+$DARCS init
hunk ./tests/addexitval.sh 25
-$darcs add foo stdout 2stderr exit 1 || true
+$DARCS add foo stdout 2stderr exit 1 || true
hunk ./tests/addexitval.sh 30
-$darcs add foo stdout 2stderr
+$DARCS add foo stdout 2stderr
hunk ./tests/addexitval.sh 34
-$darcs add foo stdout 2stderr exit 1 || true
+$DARCS add foo stdout 2stderr exit 1 || true
hunk ./tests/addexitval.sh 39
-$darcs add foo stdout 2stderr exit 1 || true
+$DARCS add foo stdout 2stderr exit 1 || true
hunk ./tests/issue381.sh 4
+# for issue381: darcs send -o message --edit-description doesn't work
+
hunk ./tests/issue381.sh 38
-DARCS_EDITOR=$PWD/editor $DARCS send --debug --author=me -a --output=bundle --edit-description ../temp2
+DARCS_EDITOR=./editor $DARCS send --debug --author=me -a --output=bundle --edit-description ../temp2
hunk ./tests/issue381.sh 47
-$DARCS send --author=me -a --subject=it works --to [EMAIL PROTECTED] --sendmail-command='grep ^Subject: it works$ %' ../temp2
+IFS=' ' $DARCS send --author=me -a --subject=it works --to [EMAIL PROTECTED] --sendmail-command='grep ^Subject: it works$ %' ../temp2
hunk ./tests/issue588.sh 2
+
+# For issue588, amend-record --look-for-adds end up with two addfile entries
+
hunk ./tests/issue588.sh 14
-R1='--repodir temp1'
-$DARCS init $R1
+$DARCS init --repodir temp1
hunk ./tests/issue588.sh 20
-$DARCS add $R1 f
-$DARCS rec $R1 -am p1
+$DARCS add --repodir temp1 f
+$DARCS rec --repodir temp1 -am p1
hunk ./tests/issue588.sh 26
-echo yyd | $DARCS amend-record $R1 --look-for-adds
+echo yyd | $DARCS amend-record --repodir temp1 --look-for-adds
hunk ./tests/issue588.sh 28
-$DARCS changes $R1 --last 1 -v
+$DARCS changes --repodir temp1 --last 1 -v
hunk ./tests/issue588.sh 34
-echo y | $DARCS amend-record $R1 --all
+echo y | $DARCS amend-record --repodir temp1 --all
hunk ./tests/issue588.sh 36
-$DARCS changes $R1 --last 1 -v
+$DARCS changes --repodir temp1 --last 1 -v
hunk ./tests/issue588.sh 38
-$DARCS check $R1 --no-test
+$DARCS check --repodir temp1 --no-test
hunk ./tests/pull_compl.sh 68
-$DARCS pull $* | grep ' \*'
+IFS=' '
+$DARCS pull $* | grep ' \*'
+IFS=''
hunk ./tests/push.sh 3
+
hunk ./tests/query_manifest.sh 5
+IFS=' '
hunk ./tests/query_manifest.sh 17
-$DARCS query manifest $3 --files --no-directories | sort darcs-files.tmp
-$DARCS query manifest $3 --no-files --directories | sort darcs-dirs.tmp
-$DARCS query manifest $3 --files --directories | sort darcs-files-dirs.tmp
+$DARCS query manifest $3 --files --no-directories | sort darcs-files.tmp
+$DARCS query manifest $3 --no-files --directories | sort darcs-dirs.tmp
+$DARCS query manifest $3 --files --directories | sort darcs-files-dirs.tmp
hunk ./tests/query_manifest.sh 21
- sort -o sorted-$x.tmp $x.tmp
- diff sorted-$x.tmp darcs-$x.tmp
+sort -o sorted-$x.tmp $x.tmp
+diff sorted-$x.tmp darcs-$x.tmp
hunk ./tests/query_manifest.sh 24
+IFS=''
hunk ./tests/shell_harness 31
+
+# Setting this helps us run the tests in path that as a space in it.
+# man sh explains it more.
+$ENV{IFS} = '';
+
}
Context:
[fix bugs driver to not fail on known bugs.
David Roundy [EMAIL PROTECTED]**20080119164642]
[give reasonable answer in impossible cases.
David Roundy [EMAIL PROTECTED]**20080119161935]
[add more progress annotations.
David Roundy [EMAIL PROTECTED
[darcs-devel] [issue600] wish automated test for optimize --relink
New submission from Mark Stosberg [EMAIL PROTECTED]: Trent Buck wondered on IRC tonight of optimize --relink was broken in Darcs2. I observed that we don't have an automated test for --relink, although there is a tests/optimize.pl already. It would be nice to have one. [21:15] twb Is darcs optimize --relink broken in 2.0.0~pre2, or am I using it [21:17] twb du -s and du -sl report the same number, even after relinking -- messages: 2627 nosy: beschmi, droundy, jaredj, kowey, markstos, tommy priority: wishlist status: unread title: wish automated test for optimize --relink topic: Darcs2, ProbablyEasy __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue600 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue600: a test for optimize --relink
Sun Jan 20 22:40:28 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue600: a test for optimize --relink
New patches:
[issue600: a test for optimize --relink
Mark Stosberg [EMAIL PROTECTED]**20080121034028] {
addfile ./bugs/optimize_relink.sh
hunk ./bugs/optimize_relink.sh 1
+#!/bin/sh
+
+# For issue600, testing optimize --relink
+
+set -ev
+
+test $DARCS || DARCS=$PWD/../darcs
+ACTUAL_DARCS=`which $DARCS`
+DARCSPATH=`dirname $ACTUAL_DARCS`
+PATH=$DARCSPATH:$PATH
+export PATH
+
+
+## compare succeeds iff there are hard links
+compare () { test `c -cs $@` -ne `c -csl $@`; }
+c () { du $@ | sed -n '$ { s/[[:space:]].*//; p; }'; }
+
+
+d=`mktemp -d`
+trap rm -rf \$d\ 0 TERM INT QUIT
+cd $d
+
+mkdir x
+$DARCS init --repodir x
+
+## Does the filesystem support hard linking at all?
+cp -a x y
+cp -al x z
+if compare x y || ! compare x z
+then
+echo Filesystem for $d does not support hard links.
+exit 1
+fi
+
+## Now try relinking using darcs.
+rm -rf z
+$DARCS optimize --verbose --relink --repodir x/_darcs/patches --sibling y/_darcs/patches
+if compare x y
+then echo darcs --relink is working, hard links were done.
+else echo darcs --relink is not working, it did not make any hard links.
+ exit 2
+fi
}
Context:
[fix bugs driver to not fail on known bugs.
David Roundy [EMAIL PROTECTED]**20080119164642]
[give reasonable answer in impossible cases.
David Roundy [EMAIL PROTECTED]**20080119161935]
[add more progress annotations.
David Roundy [EMAIL PROTECTED]**20080119140141]
[fix bugs in unrecord.sh.
David Roundy [EMAIL PROTECTED]**20080119000839]
[allow debug output from unrecord and friendds.
David Roundy [EMAIL PROTECTED]**20080119000801]
[move ApplyPatches to use Progress framework.
David Roundy [EMAIL PROTECTED]**20080118224309]
[move get to use new progress framework.
David Roundy [EMAIL PROTECTED]**20080118220003]
[add progress-reporting framework.
David Roundy [EMAIL PROTECTED]**20080118212816]
[issue174: behave better when we want to obliterate a patch that comes before a tag. (a test)
Mark Stosberg [EMAIL PROTECTED]**20080119053111]
[issue244: test how 'changes' works with file names moved in the working directory
Mark Stosberg [EMAIL PROTECTED]**20080119051151]
[Mostly updates to use File::Slurp in more Perl test scripts
Mark Stosberg [EMAIL PROTECTED]**20080119043737
By avoiding direct system calls, the scripts become more portable.
]
[issue157: A test for how rollback handles dependencies and conflicts.
Mark Stosberg [EMAIL PROTECTED]**20080119034531]
[Adding File-Slurp-.12 perl module to tree, to add with testing.
Mark Stosberg [EMAIL PROTECTED]**20080119032726
It is licensed under the GPL, and includes easy functions
to read, write and append to files.
]
[issue595: A test when darcs fails with a possibly-avoidable permissions error
Mark Stosberg [EMAIL PROTECTED]**20080119014220]
[issue549 - Pekka Pessi's rollback test.
Eric Kow [EMAIL PROTECTED]**20080117205705]
[Add test for issue194.
Eric Kow [EMAIL PROTECTED]**20080117204147
Prior to darcs2, this triggered a bug in function reconcile_unwindings.
]
[fix issue381, send allows --edit-description with --output.
David Roundy [EMAIL PROTECTED]**20080117210250]
[fix bug in pull.pl test.
David Roundy [EMAIL PROTECTED]**20080117205042]
[make progress messages print with debugMessage.
David Roundy [EMAIL PROTECTED]**20080117203354]
[Tell user when we are checking for conflicts.
Eric Kow [EMAIL PROTECTED]**20080117201208
Otherwise we mislead the user into thinking the slow part is the
'diffing dir...'
]
[Actually run perl tests.
Eric Kow [EMAIL PROTECTED]**20080117200149
Fix my harness refactor.
]
[tiny cleanup in Send.
David Roundy [EMAIL PROTECTED]**20080117191703]
[move debugMessage to Darcs.Utils.
David Roundy [EMAIL PROTECTED]**20080117190043]
[fix bug in running of test suite with hashed repos and add test for bug.
David Roundy [EMAIL PROTECTED]**20080117185403]
[add a couple more debug messages.
David Roundy [EMAIL PROTECTED]**20080117185059]
[clean up debug output in record.
David Roundy [EMAIL PROTECTED]**20080117183922]
[fix bug where record --look-for-adds left patches in pending.
David Roundy [EMAIL PROTECTED]**20080117182618]
[Canonize Andrew J. Kroll and Erik Schnetter.
Eric Kow [EMAIL PROTECTED]**20080117162329
Wrong email address for Erik. Googled name for Andrew.
]
[Fix cannot stat `../tests/{lib,perl_harness}' in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117172215]
[Refactor test/bug harness calls in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117171706]
[Move issue381 test to bugs directory.
Eric Kow [EMAIL PROTECTED]**20080117161704]
[Added test for issue381.
Marnix Klooster [EMAIL PROTECTED]**20070109210835]
[mark look_for_add.sh as buggy.
David Roundy [EMAIL PROTECTED]**20080117160348]
[Check that using 'record --look-for-add --all' left an empty pending patch.
[EMAIL PROTECTED]
[update docs on rollback.
David Roundy [EMAIL PROTECTED]**20080117152948
[darcs-devel] darcs patch: issue595: A test when darcs fails with a possibly-avoi...
Fri Jan 18 20:42:20 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue595: A test when darcs fails with a possibly-avoidable permissions
error
New patches:
[issue595: A test when darcs fails with a possibly-avoidable permissions error
Mark Stosberg [EMAIL PROTECTED]**20080119014220] {
addfile ./bugs/restrictive_upstream_permissions.pl
hunk ./bugs/restrictive_upstream_permissions.pl 1
+#!/usr/bin/env perl
+
+# Issue595
+#
+# A test for running darcs get when the parent directory has restrictive
+# permissions. The bug is that darcs trys to chdir to the current directory
+# using the full path. The permissions on the parent directory prevent this
+# from working, even though the current repo and the remote have sufficient
+# permissions.
+#
+# The real-world case where this would happen would be a web-server with
+# restrictive permissions on /home, with a user running darcs within that.
+
+use Test::More 'no_plan';
+# Also find the right path from the bugs directory.
+use lib ('lib/perl', '../tests/lib/perl');
+use Test::Darcs;
+use Shell::Command;
+use strict;
+use warnings;
+
+use Cwd 'realpath';
+
+# Set up a remote repo
+# and a directory with restrictive permissions with
+
+cleanup 'tmp_remote';
+cleanup 'tmp_restrictive';
+
+ok(mkpath('tmp_remote'), tmp_remote created);
+ok(mkpath('tmp_restrictive/liberal'), tmp_restrictive/liberal created);
+
+ok(chdir('tmp_remote'), chdir tmp_remote);
+darcs 'init';
+
+ok( chdir('../tmp_restrictive/liberal'), chdir to liberal) || die;;
+
+
+# Get the path just above these repos;
+my $top_path = realpath();
+$top_path =~ s?tmp_restrictive/liberal??;
+my $remote_full_path = $top_path/tmp_remote;
+
+ok(chmod('', '../../tmp_restrictive'), 'chmod of tmp_restrictive');
+
+my $out = darcs get $remote_full_path;
+unlike($out, qr/permission denied/i, Avoid permission denied error);
+
+ok(chdir($top_path), chdir $top_path);
+
+ok(-d 'tmp_remote', tmp_remote exists here) || `ls -l`;
+rm_rf('tmp_remote');
+ok((!-d 'tmp_remote'), 'tmp_remote directory was deleted');
+
+ok(-d 'tmp_restrictive', tmp_restrictive exists here);
+# We have to fix the permissions, just so we can delete it.
+ok(chmod('0755', 'tmp_restrictive'), 'chmod 0755 of tmp_restrictive');
+rm_rf('tmp_restrictive');
+ok((!-d 'tmp_restrictive'), 'tmp_restictive directory was deleted');
+
}
Context:
[issue549 - Pekka Pessi's rollback test.
Eric Kow [EMAIL PROTECTED]**20080117205705]
[Add test for issue194.
Eric Kow [EMAIL PROTECTED]**20080117204147
Prior to darcs2, this triggered a bug in function reconcile_unwindings.
]
[fix issue381, send allows --edit-description with --output.
David Roundy [EMAIL PROTECTED]**20080117210250]
[fix bug in pull.pl test.
David Roundy [EMAIL PROTECTED]**20080117205042]
[make progress messages print with debugMessage.
David Roundy [EMAIL PROTECTED]**20080117203354]
[Tell user when we are checking for conflicts.
Eric Kow [EMAIL PROTECTED]**20080117201208
Otherwise we mislead the user into thinking the slow part is the
'diffing dir...'
]
[Actually run perl tests.
Eric Kow [EMAIL PROTECTED]**20080117200149
Fix my harness refactor.
]
[tiny cleanup in Send.
David Roundy [EMAIL PROTECTED]**20080117191703]
[move debugMessage to Darcs.Utils.
David Roundy [EMAIL PROTECTED]**20080117190043]
[fix bug in running of test suite with hashed repos and add test for bug.
David Roundy [EMAIL PROTECTED]**20080117185403]
[add a couple more debug messages.
David Roundy [EMAIL PROTECTED]**20080117185059]
[clean up debug output in record.
David Roundy [EMAIL PROTECTED]**20080117183922]
[fix bug where record --look-for-adds left patches in pending.
David Roundy [EMAIL PROTECTED]**20080117182618]
[Canonize Andrew J. Kroll and Erik Schnetter.
Eric Kow [EMAIL PROTECTED]**20080117162329
Wrong email address for Erik. Googled name for Andrew.
]
[Fix cannot stat `../tests/{lib,perl_harness}' in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117172215]
[Refactor test/bug harness calls in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117171706]
[Move issue381 test to bugs directory.
Eric Kow [EMAIL PROTECTED]**20080117161704]
[Added test for issue381.
Marnix Klooster [EMAIL PROTECTED]**20070109210835]
[mark look_for_add.sh as buggy.
David Roundy [EMAIL PROTECTED]**20080117160348]
[Check that using 'record --look-for-add --all' left an empty pending patch.
[EMAIL PROTECTED]
[update docs on rollback.
David Roundy [EMAIL PROTECTED]**20080117152948]
[libwww: do not fail when server reports Content-Encoding.
Dmitry Kurochkin [EMAIL PROTECTED]**20080117121621]
[libwww: use waitNextUrl instead of libwww_wait_next_url in copyUrl.
Dmitry Kurochkin [EMAIL PROTECTED]**20080117121544]
[add changelog entry for rollback.
David Roundy [EMAIL PROTECTED]**20080116212037]
[rollback my simplification of conflict options for pull and apply.
David Roundy [EMAIL PROTECTED]**20080116211650]
[eliminate apply_conflict_options and pull_[same] in favor of unified conflict_options.
David Roundy [EMAIL
[darcs-devel] [issue26] Darcs needs real MIME parsing, fails with Mail.app, Courier
I looked into this some. The current meager mail parsing happens in Darcs/Email.hs in the read_mail routine around line 122. However, I suspect it would be fairly easy to take advantage of one of the Haskell MIME parsing libraries which have appeared since the darcs project started. For example, here's one from 2006, which appears to have a compatible license: http://www.mail-archive.com/[EMAIL PROTECTED]/msg19533.html Maybe it wouldn't be so hard to plug in it ? My co-worker uses Mail.app and can't detach darcs patches, so my team is directly affected by this. -- nosy: +beschmi, darcs-devel, kowey, markstos title: Darcs fails to treat rewritten MIME mails correctly - Darcs needs real MIME parsing, fails with Mail.app, Courier __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue26 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: Adding File-Slurp-9999.12 perl module to... (and 2 more)
Fri Jan 18 22:27:26 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Adding File-Slurp-.12 perl module to tree, to add with testing.
It is licensed under the GPL, and includes easy functions
to read, write and append to files.
Fri Jan 18 22:45:31 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue157: A test for how rollback handles dependencies and conflicts.
Fri Jan 18 23:37:37 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Mostly updates to use File::Slurp in more Perl test scripts
By avoiding direct system calls, the scripts become more portable.
New patches:
[Adding File-Slurp-.12 perl module to tree, to add with testing.
Mark Stosberg [EMAIL PROTECTED]**20080119032726
It is licensed under the GPL, and includes easy functions
to read, write and append to files.
] {
adddir ./tests/lib/perl/File
addfile ./tests/lib/perl/File/Slurp.pm
hunk ./tests/lib/perl/File/Slurp.pm 1
+package File::Slurp;
+
+use strict;
+
+use Carp ;
+use POSIX qw( :fcntl_h ) ;
+use Fcntl qw( :DEFAULT ) ;
+use Symbol ;
+
+my $is_win32 = $^O =~ /win32/i ;
+
+# Install subs for various constants that aren't set in older perls
+# ( 5.005). Fcntl on old perls uses Exporter to define subs without a
+# () prototype These can't be overridden with the constant pragma or
+# we get a prototype mismatch. Hence this less than aesthetically
+# appealing BEGIN block:
+
+BEGIN {
+ unless( eval { defined SEEK_SET() } ) {
+ *SEEK_SET = sub { 0 };
+ *SEEK_CUR = sub { 1 };
+ *SEEK_END = sub { 2 };
+ }
+
+ unless( eval { defined O_BINARY() } ) {
+ *O_BINARY = sub { 0 };
+ *O_RDONLY = sub { 0 };
+ *O_WRONLY = sub { 1 };
+ }
+
+ unless ( eval { defined O_APPEND() } ) {
+
+ if ( $^O =~ /olaris/ ) {
+ *O_APPEND = sub { 8 };
+ *O_CREAT = sub { 256 };
+ *O_EXCL = sub { 1024 };
+ }
+ elsif ( $^O =~ /inux/ ) {
+ *O_APPEND = sub { 1024 };
+ *O_CREAT = sub { 64 };
+ *O_EXCL = sub { 128 };
+ }
+ elsif ( $^O =~ /BSD/i ) {
+ *O_APPEND = sub { 8 };
+ *O_CREAT = sub { 512 };
+ *O_EXCL = sub { 2048 };
+ }
+ }
+}
+
+# print OS [$^O]\n ;
+
+# print O_BINARY = , O_BINARY(), \n ;
+# print O_RDONLY = , O_RDONLY(), \n ;
+# print O_WRONLY = , O_WRONLY(), \n ;
+# print O_APPEND = , O_APPEND(), \n ;
+# print O_CREAT , O_CREAT(), \n ;
+# print O_EXCL , O_EXCL(), \n ;
+
+use base 'Exporter' ;
+use vars qw( %EXPORT_TAGS @EXPORT_OK $VERSION @EXPORT ) ;
+
+%EXPORT_TAGS = ( 'all' = [
+ qw( read_file write_file overwrite_file append_file read_dir ) ] ) ;
+
[EMAIL PROTECTED] = ( @{ $EXPORT_TAGS{'all'} } );
[EMAIL PROTECTED] = qw( slurp ) ;
+
+$VERSION = '.12';
+
+*slurp = \read_file ;
+
+sub read_file {
+
+ my( $file_name, %args ) = @_ ;
+
+# set the buffer to either the passed in one or ours and init it to the null
+# string
+
+ my $buf ;
+ my $buf_ref = $args{'buf_ref'} || \$buf ;
+ ${$buf_ref} = '' ;
+
+ my( $read_fh, $size_left, $blk_size ) ;
+
+# check if we are reading from a handle (glob ref or IO:: object)
+
+ if ( ref $file_name ) {
+
+# slurping a handle so use it and don't open anything.
+# set the block size so we know it is a handle and read that amount
+
+ $read_fh = $file_name ;
+ $blk_size = $args{'blk_size'} || 1024 * 1024 ;
+ $size_left = $blk_size ;
+
+# DEEP DARK MAGIC. this checks the UNTAINT IO flag of a
+# glob/handle. only the DATA handle is untainted (since it is from
+# trusted data in the source file). this allows us to test if this is
+# the DATA handle and then to do a sysseek to make sure it gets
+# slurped correctly. on some systems, the buffered i/o pointer is not
+# left at the same place as the fd pointer. this sysseek makes them
+# the same so slurping with sysread will work.
+
+ eval{ require B } ;
+
+ if ( $@ ) {
+
+ @_ = ( \%args, ERR ) ;
+Can't find B.pm with this Perl: $!.
+That module is needed to slurp the DATA handle.
+ERR
+ goto _error ;
+ }
+
+ if ( B::svref_2object( $read_fh )-IO-IoFLAGS 16 ) {
+
+# set the seek position to the current tell.
+
+ sysseek( $read_fh, tell( $read_fh ), SEEK_SET ) ||
+croak sysseek $! ;
+ }
+ }
+ else {
+
+# a regular file. set the sysopen mode
+
+ my $mode = O_RDONLY ;
+ $mode |= O_BINARY if $args{'binmode'} ;
+
+#printf RD: BINARY %x MODE %x\n, O_BINARY, $mode ;
+
+# open the file and handle any error
+
+ $read_fh = gensym ;
+ unless ( sysopen( $read_fh, $file_name, $mode ) ) {
+ @_ = ( \%args, read_file '$file_name' - sysopen: $!);
+ goto _error ;
+ }
+
+# get the size of the file for use in the read loop
+
+ $size_left = -s $read_fh ;
+
+ unless( $size_left ) {
+
+ $blk_size = $args{'blk_size'} || 1024 * 1024 ;
+ $size_left = $blk_size ;
+ }
+ }
+
+# infinite read loop. we exit when we are done slurping
+
+ while( 1 ) {
+
+# do the read and see how much we got
+
+ my $read_cnt = sysread( $read_fh, ${$buf_ref},
+$size_left, length ${$buf_ref} ) ;
+
+ if ( defined $read_cnt ) {
+
+# good read. see if we hit EOF (nothing left to read)
+
+ last if $read_cnt == 0 ;
+
+# loop if we
[darcs-devel] darcs patch: Adding File-Slurp-9999.12 perl module to... (and 3 more)
Fri Jan 18 22:27:26 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Adding File-Slurp-.12 perl module to tree, to add with testing.
It is licensed under the GPL, and includes easy functions
to read, write and append to files.
Fri Jan 18 22:45:31 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue157: A test for how rollback handles dependencies and conflicts.
Fri Jan 18 23:37:37 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Mostly updates to use File::Slurp in more Perl test scripts
By avoiding direct system calls, the scripts become more portable.
Sat Jan 19 00:11:51 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue244: test how 'changes' works with file names moved in the working
directory
New patches:
[Adding File-Slurp-.12 perl module to tree, to add with testing.
Mark Stosberg [EMAIL PROTECTED]**20080119032726
It is licensed under the GPL, and includes easy functions
to read, write and append to files.
] {
adddir ./tests/lib/perl/File
addfile ./tests/lib/perl/File/Slurp.pm
hunk ./tests/lib/perl/File/Slurp.pm 1
+package File::Slurp;
+
+use strict;
+
+use Carp ;
+use POSIX qw( :fcntl_h ) ;
+use Fcntl qw( :DEFAULT ) ;
+use Symbol ;
+
+my $is_win32 = $^O =~ /win32/i ;
+
+# Install subs for various constants that aren't set in older perls
+# ( 5.005). Fcntl on old perls uses Exporter to define subs without a
+# () prototype These can't be overridden with the constant pragma or
+# we get a prototype mismatch. Hence this less than aesthetically
+# appealing BEGIN block:
+
+BEGIN {
+ unless( eval { defined SEEK_SET() } ) {
+ *SEEK_SET = sub { 0 };
+ *SEEK_CUR = sub { 1 };
+ *SEEK_END = sub { 2 };
+ }
+
+ unless( eval { defined O_BINARY() } ) {
+ *O_BINARY = sub { 0 };
+ *O_RDONLY = sub { 0 };
+ *O_WRONLY = sub { 1 };
+ }
+
+ unless ( eval { defined O_APPEND() } ) {
+
+ if ( $^O =~ /olaris/ ) {
+ *O_APPEND = sub { 8 };
+ *O_CREAT = sub { 256 };
+ *O_EXCL = sub { 1024 };
+ }
+ elsif ( $^O =~ /inux/ ) {
+ *O_APPEND = sub { 1024 };
+ *O_CREAT = sub { 64 };
+ *O_EXCL = sub { 128 };
+ }
+ elsif ( $^O =~ /BSD/i ) {
+ *O_APPEND = sub { 8 };
+ *O_CREAT = sub { 512 };
+ *O_EXCL = sub { 2048 };
+ }
+ }
+}
+
+# print OS [$^O]\n ;
+
+# print O_BINARY = , O_BINARY(), \n ;
+# print O_RDONLY = , O_RDONLY(), \n ;
+# print O_WRONLY = , O_WRONLY(), \n ;
+# print O_APPEND = , O_APPEND(), \n ;
+# print O_CREAT , O_CREAT(), \n ;
+# print O_EXCL , O_EXCL(), \n ;
+
+use base 'Exporter' ;
+use vars qw( %EXPORT_TAGS @EXPORT_OK $VERSION @EXPORT ) ;
+
+%EXPORT_TAGS = ( 'all' = [
+ qw( read_file write_file overwrite_file append_file read_dir ) ] ) ;
+
[EMAIL PROTECTED] = ( @{ $EXPORT_TAGS{'all'} } );
[EMAIL PROTECTED] = qw( slurp ) ;
+
+$VERSION = '.12';
+
+*slurp = \read_file ;
+
+sub read_file {
+
+ my( $file_name, %args ) = @_ ;
+
+# set the buffer to either the passed in one or ours and init it to the null
+# string
+
+ my $buf ;
+ my $buf_ref = $args{'buf_ref'} || \$buf ;
+ ${$buf_ref} = '' ;
+
+ my( $read_fh, $size_left, $blk_size ) ;
+
+# check if we are reading from a handle (glob ref or IO:: object)
+
+ if ( ref $file_name ) {
+
+# slurping a handle so use it and don't open anything.
+# set the block size so we know it is a handle and read that amount
+
+ $read_fh = $file_name ;
+ $blk_size = $args{'blk_size'} || 1024 * 1024 ;
+ $size_left = $blk_size ;
+
+# DEEP DARK MAGIC. this checks the UNTAINT IO flag of a
+# glob/handle. only the DATA handle is untainted (since it is from
+# trusted data in the source file). this allows us to test if this is
+# the DATA handle and then to do a sysseek to make sure it gets
+# slurped correctly. on some systems, the buffered i/o pointer is not
+# left at the same place as the fd pointer. this sysseek makes them
+# the same so slurping with sysread will work.
+
+ eval{ require B } ;
+
+ if ( $@ ) {
+
+ @_ = ( \%args, ERR ) ;
+Can't find B.pm with this Perl: $!.
+That module is needed to slurp the DATA handle.
+ERR
+ goto _error ;
+ }
+
+ if ( B::svref_2object( $read_fh )-IO-IoFLAGS 16 ) {
+
+# set the seek position to the current tell.
+
+ sysseek( $read_fh, tell( $read_fh ), SEEK_SET ) ||
+croak sysseek $! ;
+ }
+ }
+ else {
+
+# a regular file. set the sysopen mode
+
+ my $mode = O_RDONLY ;
+ $mode |= O_BINARY if $args{'binmode'} ;
+
+#printf RD: BINARY %x MODE %x\n, O_BINARY, $mode ;
+
+# open the file and handle any error
+
+ $read_fh = gensym ;
+ unless ( sysopen( $read_fh, $file_name, $mode ) ) {
+ @_ = ( \%args, read_file '$file_name' - sysopen: $!);
+ goto _error ;
+ }
+
+# get the size of the file for use in the read loop
+
+ $size_left = -s $read_fh ;
+
+ unless( $size_left ) {
+
+ $blk_size = $args{'blk_size'} || 1024 * 1024 ;
+ $size_left = $blk_size ;
+ }
+ }
+
+# infinite read loop. we exit when we are done slurping
+
+ while( 1 ) {
+
+# do the read and see how much we got
+
+ my $read_cnt = sysread( $read_fh, ${$buf_ref},
+$size_left, length ${$buf_ref
[darcs-devel] darcs patch: issue174: behave better when we want to obliterate a p...
Sat Jan 19 00:31:11 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue174: behave better when we want to obliterate a patch that comes
before a tag. (a test)
New patches:
[issue174: behave better when we want to obliterate a patch that comes before a tag. (a test)
Mark Stosberg [EMAIL PROTECTED]**20080119053111] {
addfile ./bugs/obliterate_before_a_tag.pl
hunk ./bugs/obliterate_before_a_tag.pl 1
+#!/usr/bin/env perl
+
+# issue174: behave better when we want to obliterate a patch that comes before a tag.
+
+# Also work from the bugs/ directory
+use lib 'lib/perl', '../tests/lib/perl';
+use Test::More 'no_plan';
+use Test::Darcs;
+use Shell::Command;
+use strict;
+
+$ENV{EMAIL} = 'tester';
+cleanup 'temp1';
+mkpath 'temp1';
+chdir 'temp1';
+darcs 'init';
+
+# Setup: Create a patch, a tag and another patch.
+ touch qw/a.txt/;
+ darcs add a.txt;
+ darcs record -am 'adding a' a.txt;
+
+ darcs tag first tag;
+
+ touch qw/b.txt/;
+ darcs add b.txt;
+ darcs record --ignore-time -a -m 'adding b' b.txt;
+
+ unlike(darcs('obliterate -p adding a'),qr/no patch/i, avoid no patch error);
+
+
+chdir '../';
+rm_rf 'temp1';
+ok((!-d 'temp1'), 'temp1 directory was deleted');
}
Context:
[issue549 - Pekka Pessi's rollback test.
Eric Kow [EMAIL PROTECTED]**20080117205705]
[Add test for issue194.
Eric Kow [EMAIL PROTECTED]**20080117204147
Prior to darcs2, this triggered a bug in function reconcile_unwindings.
]
[fix issue381, send allows --edit-description with --output.
David Roundy [EMAIL PROTECTED]**20080117210250]
[fix bug in pull.pl test.
David Roundy [EMAIL PROTECTED]**20080117205042]
[make progress messages print with debugMessage.
David Roundy [EMAIL PROTECTED]**20080117203354]
[Tell user when we are checking for conflicts.
Eric Kow [EMAIL PROTECTED]**20080117201208
Otherwise we mislead the user into thinking the slow part is the
'diffing dir...'
]
[Actually run perl tests.
Eric Kow [EMAIL PROTECTED]**20080117200149
Fix my harness refactor.
]
[tiny cleanup in Send.
David Roundy [EMAIL PROTECTED]**20080117191703]
[move debugMessage to Darcs.Utils.
David Roundy [EMAIL PROTECTED]**20080117190043]
[fix bug in running of test suite with hashed repos and add test for bug.
David Roundy [EMAIL PROTECTED]**20080117185403]
[add a couple more debug messages.
David Roundy [EMAIL PROTECTED]**20080117185059]
[clean up debug output in record.
David Roundy [EMAIL PROTECTED]**20080117183922]
[fix bug where record --look-for-adds left patches in pending.
David Roundy [EMAIL PROTECTED]**20080117182618]
[Canonize Andrew J. Kroll and Erik Schnetter.
Eric Kow [EMAIL PROTECTED]**20080117162329
Wrong email address for Erik. Googled name for Andrew.
]
[Fix cannot stat `../tests/{lib,perl_harness}' in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117172215]
[Refactor test/bug harness calls in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117171706]
[Move issue381 test to bugs directory.
Eric Kow [EMAIL PROTECTED]**20080117161704]
[Added test for issue381.
Marnix Klooster [EMAIL PROTECTED]**20070109210835]
[mark look_for_add.sh as buggy.
David Roundy [EMAIL PROTECTED]**20080117160348]
[Check that using 'record --look-for-add --all' left an empty pending patch.
[EMAIL PROTECTED]
[update docs on rollback.
David Roundy [EMAIL PROTECTED]**20080117152948]
[libwww: do not fail when server reports Content-Encoding.
Dmitry Kurochkin [EMAIL PROTECTED]**20080117121621]
[libwww: use waitNextUrl instead of libwww_wait_next_url in copyUrl.
Dmitry Kurochkin [EMAIL PROTECTED]**20080117121544]
[add changelog entry for rollback.
David Roundy [EMAIL PROTECTED]**20080116212037]
[rollback my simplification of conflict options for pull and apply.
David Roundy [EMAIL PROTECTED]**20080116211650]
[eliminate apply_conflict_options and pull_[same] in favor of unified conflict_options.
David Roundy [EMAIL PROTECTED]**20080116205623]
[reimplement rollback.
David Roundy [EMAIL PROTECTED]**20080116203644]
[fix pull.pl test to show off rollback error.
David Roundy [EMAIL PROTECTED]**20080110230904]
[Use http://darcs.net/repos/stable instead of http://abridgegame.org/darcs.
[EMAIL PROTECTED]
[Add --{allow,dont-allow,mark}-conflicts to darcs pull.
[EMAIL PROTECTED]
This patch also merge the --external option to pull_conflicts_options
like with apply.
]
[fix bug where get could produce a darcs-2 repository from a darcs-1 repo incorrectly.
David Roundy [EMAIL PROTECTED]**20080116194547]
[fix replacePristine to work regardless of current working directory.
David Roundy [EMAIL PROTECTED]**20080116162528
This is intended to be a property of all Repository functions except those
that explicitly mention the current directory in their name.
]
[treat errors in reading current pristine cache as corruption in darcs repair.
David Roundy [EMAIL PROTECTED]**20080116162427]
[make withCurrentDirectory succeed even if old directory has been removed.
David Roundy [EMAIL PROTECTED]**20080116162358]
[fixed bug triggered by conflict-doppleganger
[darcs-devel] Roundup bug tracker at bugs.darcs.net switched to PostgreSQL backend
Last night I switched the bug tracking system from using the slow anydbms backend to a faster PostreSQL backend. This morning I noticed some e-mail communications to the bug tracker were appearing in duplicate (but not others): http://bugs.darcs.net/issue590 http://bugs.darcs.net/issue589 If someone who has server access has a minute to take a look soon, that would be great. Otherwise I can poke around tonight. As far as I'm aware, I didn't change anything related to e-mail settings. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: Issue395: avoid single letter patch name... (and 2 more)
Thu Jan 17 21:06:34 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Issue395: avoid single letter patch names in the test suite.
Thu Jan 17 22:02:41 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* use --ignore-time in tests instead of sleep, for faster, more reliable
results
Thu Jan 17 22:16:06 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue578: steve and monica test for rolling back a rollback
New patches:
[Issue395: avoid single letter patch names in the test suite.
Mark Stosberg [EMAIL PROTECTED]**20080118020634] {
hunk ./tests/pull.pl 97
-darcs 'record -lam A --author [EMAIL PROTECTED]';
+darcs 'record -lam AA --author [EMAIL PROTECTED]';
hunk ./tests/pull.pl 99
-darcs 'record --ignore-times -lam B --author [EMAIL PROTECTED]';
+darcs 'record --ignore-times -lam BB --author [EMAIL PROTECTED]';
hunk ./tests/pull.pl 101
-darcs 'record --ignore-times -lam C --author [EMAIL PROTECTED]';
-like(echo_to_darcs(, rollback -p C -a -m unC -A me), qr/Finished rolling back/);
+darcs 'record --ignore-times -lam CC --author [EMAIL PROTECTED]';
+like(echo_to_darcs(, rollback -p CC -a -m unC -A me), qr/Finished rolling back/);
hunk ./tests/pull.pl 108
-like(echo_to_darcs(, rollback -p B -a -m unB -A me), qr/Finished rolling back/);
+like(echo_to_darcs(, rollback -p BB -a -m unB -A me), qr/Finished rolling back/);
}
[use --ignore-time in tests instead of sleep, for faster, more reliable results
Mark Stosberg [EMAIL PROTECTED]**20080118030241] {
hunk ./tests/changes.pl 37
-sleep 1; # helps make sure we detect changes.
hunk ./tests/changes.pl 38
-my $out = darcs(qq(record -A x -a -m foo record num $i date.t));
+my $out = darcs(qq(record --ignore-time -A x -a -m foo record num $i date.t));
hunk ./tests/conflict-doppleganger.pl 50
-my $out = darcs record -A base -am 'adding a.txt';
+my $out = darcs record --ignore-time -A base -am 'adding a.txt';
hunk ./tests/conflict-doppleganger.pl 67
-my $out = darcs record -A $repo -am 'recording an identical change';
+my $out = darcs record --ignore-time -A $repo -am 'recording an identical change';
}
[issue578: steve and monica test for rolling back a rollback
Mark Stosberg [EMAIL PROTECTED]**20080118031606] {
addfile ./tests/steve_and_monica_rollback.sh
hunk ./tests/steve_and_monica_rollback.sh 1
+#!/bin/bash
+
+# Issue578: A conflict rollback case for Darcs2
+
+darcs --version
+
+export EMAIL=tester
+
+rm -rf tmp_steve tmp_monica
+
+mkdir tmp_steve
+mkdir tmp_monica
+
+cd tmp_steve
+darcs init --darcs-2
+echo A foo
+darcs add foo
+darcs record -Asteve -am 'Anote'
+
+# Should this be necessary?
+sleep 1;
+echo B foo
+darcs record -Asteve -am 'Bnote'
+
+# Show the history as Steve sees it.
+darcs changes -s
+echo ##
+
+cd ../tmp_monica
+darcs init --darcs-2
+echo Afoo
+darcs add foo
+echo Zbar
+darcs add bar
+darcs record -Amonica -am 'AZnote'
+darcs pull -a ../tmp_steve
+darcs changes
+echo ##
+yes | darcs rollback -a -m newpatch -A me --match 'exact Anote'
+
+# previous failure result: darcs failed: cannot roll back a 'rollback' patch.
+
}
Context:
[issue549 - Pekka Pessi's rollback test.
Eric Kow [EMAIL PROTECTED]**20080117205705]
[Add test for issue194.
Eric Kow [EMAIL PROTECTED]**20080117204147
Prior to darcs2, this triggered a bug in function reconcile_unwindings.
]
[fix issue381, send allows --edit-description with --output.
David Roundy [EMAIL PROTECTED]**20080117210250]
[fix bug in pull.pl test.
David Roundy [EMAIL PROTECTED]**20080117205042]
[make progress messages print with debugMessage.
David Roundy [EMAIL PROTECTED]**20080117203354]
[Tell user when we are checking for conflicts.
Eric Kow [EMAIL PROTECTED]**20080117201208
Otherwise we mislead the user into thinking the slow part is the
'diffing dir...'
]
[Actually run perl tests.
Eric Kow [EMAIL PROTECTED]**20080117200149
Fix my harness refactor.
]
[tiny cleanup in Send.
David Roundy [EMAIL PROTECTED]**20080117191703]
[move debugMessage to Darcs.Utils.
David Roundy [EMAIL PROTECTED]**20080117190043]
[fix bug in running of test suite with hashed repos and add test for bug.
David Roundy [EMAIL PROTECTED]**20080117185403]
[add a couple more debug messages.
David Roundy [EMAIL PROTECTED]**20080117185059]
[clean up debug output in record.
David Roundy [EMAIL PROTECTED]**20080117183922]
[fix bug where record --look-for-adds left patches in pending.
David Roundy [EMAIL PROTECTED]**20080117182618]
[Canonize Andrew J. Kroll and Erik Schnetter.
Eric Kow [EMAIL PROTECTED]**20080117162329
Wrong email address for Erik. Googled name for Andrew.
]
[Fix cannot stat `../tests/{lib,perl_harness}' in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117172215]
[Refactor test/bug harness calls in Makefile.
Eric Kow [EMAIL PROTECTED]**20080117171706]
[Move issue381 test to bugs directory.
Eric Kow [EMAIL PROTECTED]**20080117161704]
[Added test for issue381.
Marnix Klooster [EMAIL PROTECTED]**20070109210835]
[mark
[darcs-devel] new bugs.darcs.net home page
I have now updated the homepage of http://bugs.darcs.net to be more useful. It now runs a more useful query for the bugs to display by default, eliminating bugs that are in any state of being resolved, wont-fix, etc. This should make it easier to find bugs that actually need attention. Also, the number at the bottom of page is now also a useful indicator of how many bugs are really open and need attention. That number is about 211 instead of over 500, as it was before. This number still encompasses bugs that aren't urgent, are wishlist items, or are stalled. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue592] Testing new PostgreSQL backend for the bug tracker. Please Ignore
New submission from Mark Stosberg [EMAIL PROTECTED]: Just testing. -- messages: 2541 nosy: beschmi, droundy, kowey, markstos, tommy priority: urgent status: unread title: Testing new PostgreSQL backend for the bug tracker. Please Ignore __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue592 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
Re: [darcs-devel] user experience engineering note
On Mon, 14 Jan 2008, zooko wrote: $ darcs pull -v -v -v Did you try darcs pull --debug as alternative? I think that may have the verbose output you are looking for. Our docs say that verbose produces more information, but exactly what that information is defined per sub-command. In the case of pull we document a specific purpose for verbose http://www.darcs.net/doc-unstable/node7.html#SECTION00762000 We do not further document what debug does, and it has a confusingly similar name to me. I would argue that darcs -vv or greater should automatically invoke --debug. Perhaps that --debug should be eliminated in favor in of -vv. Or perhaps the current very-specific behavior of pull -v should have its own switch name, and simply --verbose should provide the detail that --debug does. Anyway, I agree there is room for improvement there. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: A test for unrecording checkpoint tags, inspired by is...
Sat Jan 12 21:55:55 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* A test for unrecording checkpoint tags, inspired by issue517
New patches:
[A test for unrecording checkpoint tags, inspired by issue517
Mark Stosberg [EMAIL PROTECTED]**2008011302] {
addfile ./tests/checkpoint.sh
hunk ./tests/checkpoint.sh 1
+#!/bin/sh
+
+# A test for unrecording checkpoint tags, inspired by issue517
+
+set -ev
+test $DARCS || DARCS=$PWD/../darcs
+
+EMAIL=tester
+export EMAIL;
+
+$DARCS --version
+
+rm -rf temp temp1 temp2
+mkdir temp
+
+# This the last commands would blow up if the --darcs-2 format wasn't used.
+$DARCS init --darcs-2 --repodir temp
+touch temp/x
+$DARCS rec -lam xx --repodir temp
+$DARCS tag -m yy --repodir temp
+touch temp/z
+$DARCS rec -lam zz --repodir temp
+$DARCS optimize --checkpoint --repodir temp
+$DARCS get --partial temp temp1
+echo 'y' | $DARCS unrec -p TAG --repodir temp1
+
+# Now, the real tests. Do they return sensible results?
+$DARCS get --partial temp1 temp2;
+echo 'n' | $DARCS unrec --repodir temp1 -p 'zz'
+
+rm -rf temp temp1 temp2;
}
Context:
[resolve conflict.
David Roundy [EMAIL PROTECTED]**2008060045]
[Conflict backup files are boring.
Trent W. Buck [EMAIL PROTECTED]**20080110163822]
[more boring extensions
[EMAIL PROTECTED]
Added extensions for CLISP, CMUCL, and part files which result in
failed KDE copy operations.
]
[resolve conflict in Libwww.
David Roundy [EMAIL PROTECTED]**20080110234609]
[Some error reporting for libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20080110221921]
[add optional support for using the pure haskell Network.HTTP http implementation
John Meacham [EMAIL PROTECTED]**20080110215859]
[make darcs-2 repositories store patches in more-nicely-formated format
David Roundy [EMAIL PROTECTED]**20080110220413]
[fix filename encoding issue in ShowFiles.
David Roundy [EMAIL PROTECTED]**20080110204120]
[add debug message when grabbing files using libcurl.
David Roundy [EMAIL PROTECTED]**20080110202200]
[make using libwww no longer the default, even if it's present.
David Roundy [EMAIL PROTECTED]**20080110195753
There is a bug in our libwww bindings that I haven't located... if it isn't
fixed, we should definitely remove this binding before the darcs 2.0
release.
]
[make Libwww.copyUrls provide debug output.
David Roundy [EMAIL PROTECTED]**20080110195733]
[test: Exibit a falling test about rollback.
[EMAIL PROTECTED]
Indeed the only test about rollback was br0ken by a prior test that creates a
directory and remove read permissions to it. The rollback test do some
records that silently fail by lack of permissions, finally the rollback is
cancelled since the named patch doesn't exist.
This shows that rollback need some care.
]
[Canonize Gwern Branwen, Nicolas Pouillard, Eric Kow.
Eric Kow [EMAIL PROTECTED]**20080109152727]
[Eliminate configure test for Text.PrettyPrint.
Eric Kow [EMAIL PROTECTED]**20080109152927]
[Use our own Printer instead of Text.PrettyPrint (make_changelog).
Eric Kow [EMAIL PROTECTED]**20080109172910]
[Add parens functionality to the printer code.
Eric Kow [EMAIL PROTECTED]**20080109144956]
[restore behavior where we display conflicts in --summary mode.
David Roundy [EMAIL PROTECTED]**20080110004605]
[regression test for issue406
Mark Stosberg [EMAIL PROTECTED]**20080109044500]
[issue567: regression test for moving a file to the same location as itself
Mark Stosberg [EMAIL PROTECTED]**20080109032346]
[fix latex bug in docs.
David Roundy [EMAIL PROTECTED]**20080108211102]
[fix latex bug in docs.
David Roundy [EMAIL PROTECTED]**20080108205912]
[fix bug in show_tags.sh cleanup.
David Roundy [EMAIL PROTECTED]**20080108204430]
[doc,typo: some s/darcs commit/darcs record/
[EMAIL PROTECTED]
[test: Add a test for darcs show tags.
[EMAIL PROTECTED]
[document the three repo format flags for darcs init
Mark Stosberg [EMAIL PROTECTED]**20080108041024]
[improve the one-paragraph docs for darcs init
Mark Stosberg [EMAIL PROTECTED]**20080108040941]
[Quit defining inventory format options recursively. Provide user-oriented descriptions.
Mark Stosberg [EMAIL PROTECTED]**20080108035256]
[update partial.sh to show off improved darcs-2/partial functionality
Mark Stosberg [EMAIL PROTECTED]**20080108024712]
[typo and bug fix in partial.sh.
Mark Stosberg [EMAIL PROTECTED]**20080108022808
It turned out the call to darcs optimize was silently failing to create a checkpoint
because there was no tag. This caused the remaining tests for --partial to run against
a full repo, not a partial one.
]
[issue55: document that darcs handles some types of binary files automatically.
Mark Stosberg [EMAIL PROTECTED]**20080108010043]
[correct apparent typo in test.
Mark Stosberg [EMAIL PROTECTED]**20080108005710
The fix made more sense than the former behavior of comparing a file to itself.
]
[prevent warning in test script and remove mysterious exit(1) call.
Mark Stosberg [EMAIL PROTECTED]**20080106052622
[darcs-devel] darcs patch: fix potentially troublesome 'rm -rf temp... (and 3 more)
Wed Jan 9 20:02:18 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* fix potentially troublesome 'rm -rf temp*' commands in test scripts, which
could have deleted more than intended.
Wed Jan 9 21:30:44 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* clean up test script header...no functional changes.
Wed Jan 9 22:04:00 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue31, issue187: Update date matching so we test for an actual match in
some cases, not just date parsing.
This revealed some bugs which have yet to be fixed, so the test is still
failing.
Wed Jan 9 22:09:55 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* more test script clean-ups, modernization
New patches:
[fix potentially troublesome 'rm -rf temp*' commands in test scripts, which could have deleted more than intended.
Mark Stosberg [EMAIL PROTECTED]**20080110010218] {
hunk ./tests/invalid_pending_after_mv_to_self.sh 32
-rm -rf temp*
+rm -rf temp
hunk ./tests/no_pristine.sh 38
-rm -rf temp*
+rm -rf temp1
hunk ./tests/pending.sh 47
-rm -rf temp*
+rm -rf temp temp0
hunk ./tests/pull_binary.sh 33
-rm -rf temp*
+rm -rf temp1 temp2
hunk ./tests/push.sh 27
-rm -rf temp*
+rm -rf temp temp_0
}
[clean up test script header...no functional changes.
Mark Stosberg [EMAIL PROTECTED]**20080110023044] {
hunk ./tests/match.pl 5
-use lib qw(lib/perl);
-
-use Test::More qw/no_plan/;
-
+use lib 'lib/perl';
+use Test::More 'no_plan';
hunk ./tests/match.pl 9
-
hunk ./tests/match.pl 10
+use warnings;
hunk ./tests/match.pl 19
-darcs qw( add bar );
-darcs qw( record -a -m bar -A x );
+darcs 'add bar';
+darcs 'record -a -m bar -A tester';
}
[issue31, issue187: Update date matching so we test for an actual match in some cases, not just date parsing.
Mark Stosberg [EMAIL PROTECTED]**20080110030400
This revealed some bugs which have yet to be fixed, so the test is still failing.
] {
hunk ./tests/match.pl 22
-sub try_date {
- my $d = shift;
- # just be happy if it doesn't complain about the date being fancy
- unlike( darcs(changes --match='date $d'), qr(fancy), match on $d );
-}
hunk ./tests/match.pl 23
-# FIXME: for now we only check for recognition, not for a correct parse!
+# parse_date just checks for parsing, while match_date checks for an actual match.
+# It's better if we can use match_date, but we have to be able to construct such a date
+# based on a date dynamically generated by this test script.
+
+my $raw_date = get_first_date_from_changes();
+my ($mon,$mm,$dd,$year,$hhmmss,$tz) = deconstruct_date( $raw_date );
+
+# use Data::Dumper;
+# warn Dumper ($raw_date, $mon,$mm,$dd,$year,$hhmmss,$tz );
+
+# predeclare some subs so we can use them without parens.
+sub match_date;
+sub parse_date;
hunk ./tests/match.pl 45
-try_date '2007-01-01';
-try_date '20070101';
-try_date '2007-01';
-try_date '200701';
-try_date '2007';
+match_date $year-$mm-$dd;
+match_date $year$mm$dd;
+match_date $year-$mm;
+match_date $year$mm;
+match_date $year;
+
hunk ./tests/match.pl 52
-try_date '2007-W01-1';
-try_date '2007W011';
-try_date '2007-W01';
+parse_date '2007-W01-1';
+parse_date '2007W011';
+parse_date '2007-W01';
hunk ./tests/match.pl 56
-try_date '2007-001'; # first day of 2005
-try_date '2007001';
+parse_date '2007-001'; # first day of 2005
+parse_date '2007001';
hunk ./tests/match.pl 60
-try_date '1992-10-14 24:00';
-try_date '1992-10-15 00:00';
+parse_date '1992-10-14 24:00';
+parse_date '1992-10-15 00:00';
hunk ./tests/match.pl 64
-try_date '1992-02-12T22:32:11';
-try_date '1992-02-12 22:32:11';
-try_date '1992-02-12T223211.';
+parse_date '1992-02-12T22:32:11';
+parse_date '1992-02-12 22:32:11';
+parse_date '1992-02-12T223211.';
hunk ./tests/match.pl 69
-try_date 'today';
-try_date 'yesterday';
-try_date 'day before yesterday';
-try_date 'last week';
-try_date 'last month';
+match_date 'today';
+parse_date 'yesterday';
+parse_date 'day before yesterday';
+parse_date 'last week';
+parse_date 'last month';
hunk ./tests/match.pl 76
-try_date 'yesterday at 14:00:00';
-try_date 'last 3 years';
-try_date '2 days ago';
-try_date 'last month 13:00' ;
-try_date '15 minutes after 1992-10-02';
-try_date '3 days before last week';
+parse_date 'yesterday at 14:00:00';
+parse_date 'last 3 years';
+parse_date '2 days ago';
+parse_date 'last month 13:00' ;
+parse_date '15 minutes after 1992-10-02';
+parse_date '3 days before last week';
hunk ./tests/match.pl 84
-try_date 'between last fortnight and yesterday';
-try_date 'in the last 45 seconds';
-try_date 'after 1992';
+parse_date 'between last fortnight and yesterday';
+parse_date 'in the last 45 seconds';
+parse_date 'after 1992';
hunk ./tests/match.pl 89
-try_date '1992-10-15 00:00Z/1992-10-15 00:01Z';
-try_date 'P3YT3M/1992';
-try_date '1992/P3Y3M4DT5H3M2S';
-try_date '1992/P3Y3M';
+parse_date '1992-10-15 00:00Z/1992-10-15 00:01Z';
+parse_date 'P3YT3M/1992';
+parse_date '1992/P3Y3M4DT5H3M2S';
+parse_date '1992/P3Y3M';
hunk ./tests/match.pl 95
-try_date 'between 2004-03-12 and last week';
-try_date 'last
[darcs-devel] darcs patch: Issue81: Add test which shows that old and hashed form...
Sat Jan 12 18:31:51 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Issue81: Add test which shows that old and hashed formats consider
dopplegangers a conflict, but the darcs-2 format doesn't.
New patches:
[Issue81: Add test which shows that old and hashed formats consider dopplegangers a conflict, but the darcs-2 format doesn't.
Mark Stosberg [EMAIL PROTECTED]**20080112233151] {
addfile ./tests/conflict-doppleganger.pl
hunk ./tests/conflict-doppleganger.pl 1
+#!/usr/bin/env perl
+
+# Tests for the doppleganger conflict bug.
+
+# For Zooko, with love
+# Also, for issue81.
+
+# A note about all the 'sleep' statements: When I had less of them in the code to slow
+# it down, some tests would fail intermittently, because darcs would not detect changes
+# had happened. It would be good to remove any that are possible to speed up the test,
+# but test running the script 3 to 5 times if you do that, to confirm the intermittent
+# failure is gone. - MarkStosberg
+
+use lib 'lib/perl';
+
+use Test::More 'no_plan';
+use Test::Darcs;
+use Shell::Command;
+use strict;
+use warnings;
+
+# Set the author.
+$ENV{EMAIL} = 'tester';
+
+ok (dopplegangers_conflict('old-fashioned-inventory'), default repo format views doppleganger as a conflict);
+ok (dopplegangers_conflict('hashed'),hashed repo format views doppleganger as a conflict);
+ok ((not dopplegangers_conflict('darcs-2')), with darcs-2 format, doppleganger's don't conflict! );
+
+sub dopplegangers_conflict {
+my $arg_to_init = shift;
+
+cleanup 'tmp_dopple';
+cleanup 'tmp_ganger';
+mkpath 'tmp_dopple';
+chdir 'tmp_dopple';
+darcs 'init --'.$arg_to_init;
+
+# Map args to formats
+my %fmts = (
+'old-fashioned-inventory' = 'darcs-1.0',
+'darcs-2' = 'darcs-2-experimental',
+'hashed' = 'hashed',
+);
+
+like((darcs 'show repo'), qr/$fmts{$arg_to_init}/, reality check: $fmts{$arg_to_init} is repo format);
+
+touch 'a.txt';
+darcs add a.txt;
+my $out = darcs record -A base -am 'adding a.txt';
+like($out, qr/finished/msxi, $arg_to_init: recorded patch for adding file.);
+
+chdir '../';
+
+sleep 1;
+
+$out = darcs 'get tmp_dopple tmp_ganger';
+#diag $out;
+
+for my $repo (qw(dopple ganger)) {
+ok((chdir tmp_$repo), chdir'ed);
+`echo text which appears in both places at once a.txt`;
+sleep 1; # avoid identical patch names.
+my $out = darcs record -A $repo -am 'recording an identical change';
+like($out, qr/finished/msxi, $arg_to_init: recorded patch);
+#diag in loop: $out;
+chdir '../';
+};
+
+# Now that the conflict has been set up, try pull one patch from the other.
+chdir 'tmp_ganger';
+
+my $pull_out = darcs 'pull -a ../tmp_dopple';
+my $has_a_conflict_p = ($pull_out =~ m/conflict/msxi);
+#diag result: $pull_out;
+
+
+
+chdir '../';
+cleanup 'tmp_ganger';
+ok((!-d 'tmp_ganger'), 'tmp_ganger directory was deleted');
+cleanup 'tmp_dopple';
+ok((!-d 'tmp_dopple'), 'tmp_dopple directory was deleted');
+
+#diag about to to return: $has_a_conflict_p;
+
+return $has_a_conflict_p;
+}
+
+
}
Context:
[resolve conflict.
David Roundy [EMAIL PROTECTED]**2008060045]
[Conflict backup files are boring.
Trent W. Buck [EMAIL PROTECTED]**20080110163822]
[more boring extensions
[EMAIL PROTECTED]
Added extensions for CLISP, CMUCL, and part files which result in
failed KDE copy operations.
]
[resolve conflict in Libwww.
David Roundy [EMAIL PROTECTED]**20080110234609]
[Some error reporting for libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20080110221921]
[add optional support for using the pure haskell Network.HTTP http implementation
John Meacham [EMAIL PROTECTED]**20080110215859]
[make darcs-2 repositories store patches in more-nicely-formated format
David Roundy [EMAIL PROTECTED]**20080110220413]
[fix filename encoding issue in ShowFiles.
David Roundy [EMAIL PROTECTED]**20080110204120]
[add debug message when grabbing files using libcurl.
David Roundy [EMAIL PROTECTED]**20080110202200]
[make using libwww no longer the default, even if it's present.
David Roundy [EMAIL PROTECTED]**20080110195753
There is a bug in our libwww bindings that I haven't located... if it isn't
fixed, we should definitely remove this binding before the darcs 2.0
release.
]
[make Libwww.copyUrls provide debug output.
David Roundy [EMAIL PROTECTED]**20080110195733]
[test: Exibit a falling test about rollback.
[EMAIL PROTECTED]
Indeed the only test about rollback was br0ken by a prior test that creates a
directory and remove read permissions to it. The rollback test do some
records that silently fail by lack of permissions, finally the rollback is
cancelled since the named patch doesn't exist.
This shows that rollback need some care.
]
[Canonize Gwern Branwen, Nicolas Pouillard, Eric Kow.
Eric Kow [EMAIL PROTECTED
[darcs-devel] darcs patch: issue347 - use single quotes in .darcs default
--
http://mark.stosberg.com/
New patches:
[issue347 - document that single quotes should be used in .darcs/defaults
Mark Stosberg [EMAIL PROTECTED]**20080101164428] {
hunk ./src/Darcs/ArgumentDefaults.lhs 46
+If the value has spaces in it, use single quotes, not double quotes, to surround it.
}
Context:
[simplify (and debug) pending handling.
David Roundy [EMAIL PROTECTED]**20071227133618
Note that this change could lead to performance regressions, but I believe
that these regressions would be strongly bounded (never worse than a
whatsnew), and this simplification makes the code much easier to safely
modify.
]
[make updating of pending on pull much more efficient.
David Roundy [EMAIL PROTECTED]**20071224131059]
[simplify a bit of code.
David Roundy [EMAIL PROTECTED]**20071224131023]
[fix type-witness bug in HopefullyPrivate.
David Roundy [EMAIL PROTECTED]**20071223141149]
[simplify Get
David Roundy [EMAIL PROTECTED]**20071223025108]
[simplify tentativelyAddPatch by removing unused return value.
David Roundy [EMAIL PROTECTED]**20071223024400]
[simplify away np2prims and nps2prims.
David Roundy [EMAIL PROTECTED]**20071223022145]
[try to avoid rewriting patches that we've just read.
David Roundy [EMAIL PROTECTED]**20071222190029]
[generalize CommandsAux utility functions.
David Roundy [EMAIL PROTECTED]**20071222162952]
[add new instances for PatchInfoAnd.
David Roundy [EMAIL PROTECTED]**20071222144439]
[change tentativelyAddPatch to accept a PatchInfoAnd p.
David Roundy [EMAIL PROTECTED]**20071222140517]
[internal prepration for optimization saving patch writing.
David Roundy [EMAIL PROTECTED]**20071222134834]
[add changelog entry.
David Roundy [EMAIL PROTECTED]**20071219162646]
[add fixme indicating where the code could be simplified.
David Roundy [EMAIL PROTECTED]**20071221135649]
[make reading of hashed inventories lazier.
David Roundy [EMAIL PROTECTED]**20071221133453]
[resolve conflicts in mv_and_remove_tests.sh.
David Roundy [EMAIL PROTECTED]**20071219144638]
[Fix !(...|...) in mv_and_remove_tests.sh.
Dave Love [EMAIL PROTECTED]**20071218001826
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
]
[[issue571] Redo last HAVE_TERMIO_H fix.
Dave Love [EMAIL PROTECTED]**20071218140508
Not the most direct fix, but simpler.
]
[Fix configure test for gadt type witnesses.
Dave Love [EMAIL PROTECTED]**20071218120139]
[use --ignore-times in all tests.
David Roundy [EMAIL PROTECTED]**20071217225159
This is because the hashed repository is a bit pickier, in that
it no longer checks file lengths when the file modification times
match.
]
[enable modification time checking on hashed repositories.
David Roundy [EMAIL PROTECTED]**20071217220237]
[Pass two args to `cmp' in tests, following POSIX.
Dave Love [EMAIL PROTECTED]**20071216180503
Fixes some failures on Solaris.
]
[resolve silly conflict with myself.
David Roundy [EMAIL PROTECTED]**20071217200855]
[clean up SelectChanges (eliminating Bools)
David Roundy [EMAIL PROTECTED]**20071217191809]
[make a few more files compile with type witnesses.
David Roundy [EMAIL PROTECTED]**20071217183234]
[fix bug in revert (in writing the unrevert file).
David Roundy [EMAIL PROTECTED]**20071216215225]
[make a few more files compile with type witnesses.
David Roundy [EMAIL PROTECTED]**20071217164815]
[remove tabs.
David Roundy [EMAIL PROTECTED]**20071216224617]
[bump version number preemptively to 2.0.0pre3.
David Roundy [EMAIL PROTECTED]**20071216222823]
[fix doc bug in show contents.
David Roundy [EMAIL PROTECTED]**20071216214002]
[TAG 2.0.0pre2
David Roundy [EMAIL PROTECTED]**20071216201647]
Patch bundle hash:
8b1abb67c8ca822e00d43f9191f59475ea162bf4
___
darcs-devel mailing list
darcs-devel@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] current build failure: P is applied to too many type arguments
After just trying to pull the lasted patches and make on Ubuntu Gutsy with GHC 6.6.1, I get this result: src/Darcs/Patch/Patchy.lhs:87:14: Kind error: `p' is applied to too many type arguments In the type `p x y' In the type `p x y - p y x' In the class declaration for `Invert' ## Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue579] Darcs2: changes shows revised history
New submission from Mark Stosberg [EMAIL PROTECTED]: This bug report can be illustrated with the shell script uploaded through issue578. The result is that after going through the Steve and Monica example from DarcsTwo, darcs changes reports that one conflicting patch contains no content at all! That's definitely different than darcs-1, and looks like a bug to me. Example: # $ darcs changes -s Tue Jan 8 21:06:50 EST 2008 steve * Bnote M ./foo -1 +1 Tue Jan 8 21:06:49 EST 2008 steve * Anote Tue Jan 8 21:06:50 EST 2008 monica * AZnote A ./bar A ./foo -- messages: 2374 nosy: beschmi, droundy, kowey, markstos, tommy priority: bug status: unread title: Darcs2: changes shows revised history topic: Darcs2 __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue579 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: add ChangeLog entry for HTTP Pipelining ... (and 1 more)
Sun Jan 6 23:43:16 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* add ChangeLog entry for HTTP Pipelining support
Tue Jan 8 22:23:46 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue567: regression test for moving a file to the same location as itself
New patches:
[add ChangeLog entry for HTTP Pipelining support
Mark Stosberg [EMAIL PROTECTED]**20080107044316] {
addfile ./changelog.in/entries/issue377
hunk ./changelog.in/entries/issue377 1
+
+match: name Initial implementation of HTTP pipelining using libwww
+
+ Fix issue 377, slow performance over HTTP, by adding pipelining support. (Dmitry Kurochkin)
}
[issue567: regression test for moving a file to the same location as itself
Mark Stosberg [EMAIL PROTECTED]**20080109032346] {
addfile ./tests/invalid_pending_after_mv_to_self.sh
hunk ./tests/invalid_pending_after_mv_to_self.sh 1
+#!/bin/sh
+
+# A regression test for issue567
+
+set -ev
+
+test $DARCS || DARCS=$PWD/../darcs
+ACTUAL_DARCS=`which $DARCS`
+DARCSPATH=`dirname $ACTUAL_DARCS`
+PATH=$DARCSPATH:$PATH
+export PATH
+echo $PATH
+
+EMAIL=tester
+export EMAIL
+
+rm -rf temp
+mkdir temp
+cd temp
+$DARCS init
+mkdir dir
+touch dir/t.t
+$DARCS add dir
+$DARCS add dir/t.t
+$DARCS record -am 'initial add'
+
+# grand finale? Can we move the file to itself?
+darcs mv dir/t.t dir/
+
+cd ..
+
+rm -rf temp*
}
Context:
[fix latex bug in docs.
David Roundy [EMAIL PROTECTED]**20080108211102]
[fix latex bug in docs.
David Roundy [EMAIL PROTECTED]**20080108205912]
[fix bug in show_tags.sh cleanup.
David Roundy [EMAIL PROTECTED]**20080108204430]
[doc,typo: some s/darcs commit/darcs record/
[EMAIL PROTECTED]
[test: Add a test for darcs show tags.
[EMAIL PROTECTED]
[document the three repo format flags for darcs init
Mark Stosberg [EMAIL PROTECTED]**20080108041024]
[improve the one-paragraph docs for darcs init
Mark Stosberg [EMAIL PROTECTED]**20080108040941]
[Quit defining inventory format options recursively. Provide user-oriented descriptions.
Mark Stosberg [EMAIL PROTECTED]**20080108035256]
[update partial.sh to show off improved darcs-2/partial functionality
Mark Stosberg [EMAIL PROTECTED]**20080108024712]
[typo and bug fix in partial.sh.
Mark Stosberg [EMAIL PROTECTED]**20080108022808
It turned out the call to darcs optimize was silently failing to create a checkpoint
because there was no tag. This caused the remaining tests for --partial to run against
a full repo, not a partial one.
]
[issue55: document that darcs handles some types of binary files automatically.
Mark Stosberg [EMAIL PROTECTED]**20080108010043]
[correct apparent typo in test.
Mark Stosberg [EMAIL PROTECTED]**20080108005710
The fix made more sense than the former behavior of comparing a file to itself.
]
[prevent warning in test script and remove mysterious exit(1) call.
Mark Stosberg [EMAIL PROTECTED]**20080106052622]
[issue395: eliminate patches with a single character name from shell scripts in the test suite.
Mark Stosberg [EMAIL PROTECTED]**20080106051821]
[issue526: improve Perl test suite.
Mark Stosberg [EMAIL PROTECTED]**20080106045548
- better compatibility when path to darcs includes a space
- better portability by eliminating some system calls
- general style improvements
]
[minor white-space and code style improvements
Mark Stosberg [EMAIL PROTECTED]**20080105183641]
[typo fix on GNUmakefile comment
Mark Stosberg [EMAIL PROTECTED]**20080105183027]
[refactor: improve style and portability of pull.pl test script.
Mark Stosberg [EMAIL PROTECTED]**20080105181751
Many direct system calls were eliminated. No functional changes.
]
[add feature requested in issue576.
David Roundy [EMAIL PROTECTED]**20080105150125]
[fix bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144929]
[add test that triggers bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144812]
[add configure support for libwww.
David Roundy [EMAIL PROTECTED]**20080104201255]
[make bug message more explicit.
David Roundy [EMAIL PROTECTED]**20080104004253]
[Initial implementation of HTTP pipelining using libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20071222144902]
[Make sure we test the 'darcs' we just built and not one in a global path.
Mark Stosberg [EMAIL PROTECTED]**20080102002235
This done by using $DARCS instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does not appear.
]
[issue347 - document that single quotes should be used in .darcs/defaults
Mark Stosberg [EMAIL PROTECTED]**20080101164428]
[make indent slightly more concise using lines and unlines.
David Roundy [EMAIL PROTECTED]**20080104003953]
[refactor: replace recursive indent with more concise find-and-replace syntax
Mark Stosberg [EMAIL PROTECTED]**20080101200447]
[simplify (and debug) pending handling.
David Roundy [EMAIL PROTECTED
[darcs-devel] darcs patch: regression test for issue406
Tue Jan 8 23:45:00 EST 2008 Mark Stosberg [EMAIL PROTECTED] * regression test for issue406 New patches: [regression test for issue406 Mark Stosberg [EMAIL PROTECTED]**20080109044500] hunk ./tests/partial.sh 50 + +# This is a regression test for issue406 +$DARCS tag -A x --checkpoint checkpointing_a_partial + Context: [fix latex bug in docs. David Roundy [EMAIL PROTECTED]**20080108211102] [fix latex bug in docs. David Roundy [EMAIL PROTECTED]**20080108205912] [fix bug in show_tags.sh cleanup. David Roundy [EMAIL PROTECTED]**20080108204430] [doc,typo: some s/darcs commit/darcs record/ [EMAIL PROTECTED] [test: Add a test for darcs show tags. [EMAIL PROTECTED] [document the three repo format flags for darcs init Mark Stosberg [EMAIL PROTECTED]**20080108041024] [improve the one-paragraph docs for darcs init Mark Stosberg [EMAIL PROTECTED]**20080108040941] [Quit defining inventory format options recursively. Provide user-oriented descriptions. Mark Stosberg [EMAIL PROTECTED]**20080108035256] [update partial.sh to show off improved darcs-2/partial functionality Mark Stosberg [EMAIL PROTECTED]**20080108024712] [typo and bug fix in partial.sh. Mark Stosberg [EMAIL PROTECTED]**20080108022808 It turned out the call to darcs optimize was silently failing to create a checkpoint because there was no tag. This caused the remaining tests for --partial to run against a full repo, not a partial one. ] [issue55: document that darcs handles some types of binary files automatically. Mark Stosberg [EMAIL PROTECTED]**20080108010043] [correct apparent typo in test. Mark Stosberg [EMAIL PROTECTED]**20080108005710 The fix made more sense than the former behavior of comparing a file to itself. ] [prevent warning in test script and remove mysterious exit(1) call. Mark Stosberg [EMAIL PROTECTED]**20080106052622] [issue395: eliminate patches with a single character name from shell scripts in the test suite. Mark Stosberg [EMAIL PROTECTED]**20080106051821] [issue526: improve Perl test suite. Mark Stosberg [EMAIL PROTECTED]**20080106045548 - better compatibility when path to darcs includes a space - better portability by eliminating some system calls - general style improvements ] [minor white-space and code style improvements Mark Stosberg [EMAIL PROTECTED]**20080105183641] [typo fix on GNUmakefile comment Mark Stosberg [EMAIL PROTECTED]**20080105183027] [refactor: improve style and portability of pull.pl test script. Mark Stosberg [EMAIL PROTECTED]**20080105181751 Many direct system calls were eliminated. No functional changes. ] [add feature requested in issue576. David Roundy [EMAIL PROTECTED]**20080105150125] [fix bug in issue576. David Roundy [EMAIL PROTECTED]**20080105144929] [add test that triggers bug in issue576. David Roundy [EMAIL PROTECTED]**20080105144812] [add configure support for libwww. David Roundy [EMAIL PROTECTED]**20080104201255] [make bug message more explicit. David Roundy [EMAIL PROTECTED]**20080104004253] [Initial implementation of HTTP pipelining using libwww. Dmitry Kurochkin [EMAIL PROTECTED]**20071222144902] [Make sure we test the 'darcs' we just built and not one in a global path. Mark Stosberg [EMAIL PROTECTED]**20080102002235 This done by using $DARCS instead of 'darcs'. However, in my case the updated test FAILS unexplainably with 2.0.0pre3, by failing to detect that a file has changed. If I follow along in a shell and run the same commands with Darcs 2, the problem does not appear. ] [issue347 - document that single quotes should be used in .darcs/defaults Mark Stosberg [EMAIL PROTECTED]**20080101164428] [make indent slightly more concise using lines and unlines. David Roundy [EMAIL PROTECTED]**20080104003953] [refactor: replace recursive indent with more concise find-and-replace syntax Mark Stosberg [EMAIL PROTECTED]**20080101200447] [simplify (and debug) pending handling. David Roundy [EMAIL PROTECTED]**20071227133618 Note that this change could lead to performance regressions, but I believe that these regressions would be strongly bounded (never worse than a whatsnew), and this simplification makes the code much easier to safely modify. ] [make updating of pending on pull much more efficient. David Roundy [EMAIL PROTECTED]**20071224131059] [simplify a bit of code. David Roundy [EMAIL PROTECTED]**20071224131023] [fix type-witness bug in HopefullyPrivate. David Roundy [EMAIL PROTECTED]**20071223141149] [simplify Get David Roundy [EMAIL PROTECTED]**20071223025108] [simplify tentativelyAddPatch by removing unused return value. David Roundy [EMAIL PROTECTED]**20071223024400] [simplify away np2prims and nps2prims. David Roundy [EMAIL PROTECTED]**20071223022145] [try to avoid rewriting patches that we've just read. David Roundy [EMAIL PROTECTED]**20071222190029] [generalize CommandsAux utility functions. David Roundy [EMAIL PROTECTED]**20071222162952] [add new instances for PatchInfoAnd. David
[darcs-devel] darcs patch: correct apparent typo in test. (and 6 more)
Mon Jan 7 19:57:10 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* correct apparent typo in test.
The fix made more sense than the former behavior of comparing a file to
itself.
Mon Jan 7 20:00:43 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue55: document that darcs handles some types of binary files
automatically.
Mon Jan 7 21:28:08 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* typo and bug fix in partial.sh.
It turned out the call to darcs optimize was silently failing to create a
checkpoint
because there was no tag. This caused the remaining tests for --partial to
run against
a full repo, not a partial one.
Mon Jan 7 21:47:12 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* update partial.sh to show off improved darcs-2/partial functionality
Mon Jan 7 22:52:56 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* Quit defining inventory format options recursively. Provide user-oriented
descriptions.
Mon Jan 7 23:09:41 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* improve the one-paragraph docs for darcs init
Mon Jan 7 23:10:24 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* document the three repo format flags for darcs init
New patches:
[correct apparent typo in test.
Mark Stosberg [EMAIL PROTECTED]**20080108005710
The fix made more sense than the former behavior of comparing a file to itself.
] {
hunk ./tests/send_apply.sh 25
-cmp temp2/bar temp2/bar
+cmp temp1/bar temp2/bar
hunk ./tests/send_apply.sh 33
-cmp temp2/bar temp2/bar
+cmp temp1/bar temp2/bar
}
[issue55: document that darcs handles some types of binary files automatically.
Mark Stosberg [EMAIL PROTECTED]**20080108010043] {
hunk ./src/Darcs/Repository/Prefs.lhs 231
-than text files. You probably will want to have the binaries file under
+than text files. Darcs automatically treats files containing ^Z or '\0' as binary.
+You probably will want to have the binaries file under
}
[typo and bug fix in partial.sh.
Mark Stosberg [EMAIL PROTECTED]**20080108022808
It turned out the call to darcs optimize was silently failing to create a checkpoint
because there was no tag. This caused the remaining tests for --partial to run against
a full repo, not a partial one.
] {
hunk ./tests/partial.sh 12
-# Create a developement repo, do some work
+# Create a development repo, do some work
hunk ./tests/partial.sh 41
-$DARCS optimize --checkpoint
+$DARCS tag -A x --checkpoint first_checkpoint
}
[update partial.sh to show off improved darcs-2/partial functionality
Mark Stosberg [EMAIL PROTECTED]**20080108024712] {
hunk ./tests/partial.sh 14
-$DARCS initialize
+$DARCS initialize --darcs-2
hunk ./tests/partial.sh 27
-$DARCS initialize
+$DARCS initialize --darcs-2
hunk ./tests/partial.sh 52
+# With the darcs-2 format, doing a get on a partial repo succeeds.
+# With the darcs-1 format it would be required to add the --partial flag, or darcs would give an error.
+$DARCS get _partial _second_partial
+
}
[Quit defining inventory format options recursively. Provide user-oriented descriptions.
Mark Stosberg [EMAIL PROTECTED]**20080108035256] {
hunk ./src/Darcs/Arguments.lhs 680
- use the hashed format,
+ Some new features. Compatible with older repos,
hunk ./src/Darcs/Arguments.lhs 682
- use (experimental!) darcs-2 format,
+ All features. Related repos must use same format [EXPERIMENTAL],
hunk ./src/Darcs/Arguments.lhs 684
- use old fashioned inventory]
+ Minimal features. What older repos use. [DEFAULT]]
}
[improve the one-paragraph docs for darcs init
Mark Stosberg [EMAIL PROTECTED]**20080108040941] {
hunk ./src/Darcs/Commands/Init.lhs 49
-Generally you will only call initialize once for each project you work on,
-and calling it is just about the first thing you do. Just make sure you
-are in the main directory of the project, and initialize will set up all the
-directories and files darcs needs in order to start keeping track of
-revisions for your project.
+Call \verb|initialize| once for each project you work on. Run it from the top
+level directory of the project, with the project files already there.
+\verb|initialize| will set up all the directories and files darcs needs in order to
+start keeping track of revisions for your project.
hunk ./src/Darcs/Commands/Init.lhs 57
- Generally you will only call initialize once for each project you work on, \n++
- and calling it is just about the first thing you do. Just make sure \n++
- you are in the main directory of the project, and initialize will set up all \n++
- the directories and files darcs needs in order to start keeping track of \n++
- revisions for your project.\n
+ Call 'initialize' once for each project you work on. Run it from the top \n++
+ level directory of the project, with the project files already there. \n++
+ 'initialize' will set up all the directories and files darcs needs in order
[darcs-devel] darcs patch: add ChangeLog entry for HTTP Pipelining support
Sun Jan 6 23:43:16 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* add ChangeLog entry for HTTP Pipelining support
New patches:
[add ChangeLog entry for HTTP Pipelining support
Mark Stosberg [EMAIL PROTECTED]**20080107044316] {
addfile ./changelog.in/entries/issue377
hunk ./changelog.in/entries/issue377 1
+
+match: name Initial implementation of HTTP pipelining using libwww
+
+ Fix issue 377, slow performance over HTTP, by adding pipelining support. (Dmitry Kurochkin)
}
Context:
[prevent warning in test script and remove mysterious exit(1) call.
Mark Stosberg [EMAIL PROTECTED]**20080106052622]
[issue395: eliminate patches with a single character name from shell scripts in the test suite.
Mark Stosberg [EMAIL PROTECTED]**20080106051821]
[issue526: improve Perl test suite.
Mark Stosberg [EMAIL PROTECTED]**20080106045548
- better compatibility when path to darcs includes a space
- better portability by eliminating some system calls
- general style improvements
]
[minor white-space and code style improvements
Mark Stosberg [EMAIL PROTECTED]**20080105183641]
[typo fix on GNUmakefile comment
Mark Stosberg [EMAIL PROTECTED]**20080105183027]
[refactor: improve style and portability of pull.pl test script.
Mark Stosberg [EMAIL PROTECTED]**20080105181751
Many direct system calls were eliminated. No functional changes.
]
[add feature requested in issue576.
David Roundy [EMAIL PROTECTED]**20080105150125]
[fix bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144929]
[add test that triggers bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144812]
[add configure support for libwww.
David Roundy [EMAIL PROTECTED]**20080104201255]
[make bug message more explicit.
David Roundy [EMAIL PROTECTED]**20080104004253]
[Initial implementation of HTTP pipelining using libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20071222144902]
[make indent slightly more concise using lines and unlines.
David Roundy [EMAIL PROTECTED]**20080104003953]
[Make sure we test the 'darcs' we just built and not one in a global path.
Mark Stosberg [EMAIL PROTECTED]**20080102002235
This done by using $DARCS instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does not appear.
]
[refactor: replace recursive indent with more concise find-and-replace syntax
Mark Stosberg [EMAIL PROTECTED]**20080101200447]
[issue347 - document that single quotes should be used in .darcs/defaults
Mark Stosberg [EMAIL PROTECTED]**20080101164428]
[simplify (and debug) pending handling.
David Roundy [EMAIL PROTECTED]**20071227133618
Note that this change could lead to performance regressions, but I believe
that these regressions would be strongly bounded (never worse than a
whatsnew), and this simplification makes the code much easier to safely
modify.
]
[make updating of pending on pull much more efficient.
David Roundy [EMAIL PROTECTED]**20071224131059]
[simplify a bit of code.
David Roundy [EMAIL PROTECTED]**20071224131023]
[fix type-witness bug in HopefullyPrivate.
David Roundy [EMAIL PROTECTED]**20071223141149]
[simplify Get
David Roundy [EMAIL PROTECTED]**20071223025108]
[simplify tentativelyAddPatch by removing unused return value.
David Roundy [EMAIL PROTECTED]**20071223024400]
[simplify away np2prims and nps2prims.
David Roundy [EMAIL PROTECTED]**20071223022145]
[try to avoid rewriting patches that we've just read.
David Roundy [EMAIL PROTECTED]**20071222190029]
[generalize CommandsAux utility functions.
David Roundy [EMAIL PROTECTED]**20071222162952]
[add new instances for PatchInfoAnd.
David Roundy [EMAIL PROTECTED]**20071222144439]
[change tentativelyAddPatch to accept a PatchInfoAnd p.
David Roundy [EMAIL PROTECTED]**20071222140517]
[internal prepration for optimization saving patch writing.
David Roundy [EMAIL PROTECTED]**20071222134834]
[add changelog entry.
David Roundy [EMAIL PROTECTED]**20071219162646]
[add fixme indicating where the code could be simplified.
David Roundy [EMAIL PROTECTED]**20071221135649]
[make reading of hashed inventories lazier.
David Roundy [EMAIL PROTECTED]**20071221133453]
[resolve conflicts in mv_and_remove_tests.sh.
David Roundy [EMAIL PROTECTED]**20071219144638]
[Fix !(...|...) in mv_and_remove_tests.sh.
Dave Love [EMAIL PROTECTED]**20071218001826
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
]
[[issue571] Redo last HAVE_TERMIO_H fix.
Dave Love [EMAIL PROTECTED]**20071218140508
Not the most direct fix, but simpler.
]
[Fix configure test for gadt type witnesses.
Dave Love [EMAIL PROTECTED]**20071218120139]
[use --ignore-times in all tests.
David Roundy [EMAIL PROTECTED]**20071217225159
This is because the hashed repository is a bit pickier, in that
it no longer checks file lengths when the file modification
[darcs-devel] [issue555] Possibility to return to a previous version without loosing the changes
Mark Stosberg [EMAIL PROTECTED] added the comment: I recommend resolving this as wont-fix. I believe darcs get --to-patch is a fine solution to the stated problem, and is much like the SVN solution. SVN solution also uses two copies of the tree (one in the server and one in the client.) -- nosy: +markstos __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue555 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: issue347 - document that single quotes should be used ...
Tue Jan 1 11:44:28 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue347 - document that single quotes should be used in .darcs/defaults
New patches:
[issue347 - document that single quotes should be used in .darcs/defaults
Mark Stosberg [EMAIL PROTECTED]**20080101164428] {
hunk ./src/Darcs/ArgumentDefaults.lhs 46
+If the value has spaces in it, use single quotes, not double quotes, to surround it.
}
Context:
[add feature requested in issue576.
David Roundy [EMAIL PROTECTED]**20080105150125]
[fix bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144929]
[add test that triggers bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144812]
[add configure support for libwww.
David Roundy [EMAIL PROTECTED]**20080104201255]
[make bug message more explicit.
David Roundy [EMAIL PROTECTED]**20080104004253]
[Initial implementation of HTTP pipelining using libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20071222144902]
[make indent slightly more concise using lines and unlines.
David Roundy [EMAIL PROTECTED]**20080104003953]
[Make sure we test the 'darcs' we just built and not one in a global path.
Mark Stosberg [EMAIL PROTECTED]**20080102002235
This done by using $DARCS instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does not appear.
]
[refactor: replace recursive indent with more concise find-and-replace syntax
Mark Stosberg [EMAIL PROTECTED]**20080101200447]
[simplify (and debug) pending handling.
David Roundy [EMAIL PROTECTED]**20071227133618
Note that this change could lead to performance regressions, but I believe
that these regressions would be strongly bounded (never worse than a
whatsnew), and this simplification makes the code much easier to safely
modify.
]
[make updating of pending on pull much more efficient.
David Roundy [EMAIL PROTECTED]**20071224131059]
[simplify a bit of code.
David Roundy [EMAIL PROTECTED]**20071224131023]
[fix type-witness bug in HopefullyPrivate.
David Roundy [EMAIL PROTECTED]**20071223141149]
[simplify Get
David Roundy [EMAIL PROTECTED]**20071223025108]
[simplify tentativelyAddPatch by removing unused return value.
David Roundy [EMAIL PROTECTED]**20071223024400]
[simplify away np2prims and nps2prims.
David Roundy [EMAIL PROTECTED]**20071223022145]
[try to avoid rewriting patches that we've just read.
David Roundy [EMAIL PROTECTED]**20071222190029]
[generalize CommandsAux utility functions.
David Roundy [EMAIL PROTECTED]**20071222162952]
[add new instances for PatchInfoAnd.
David Roundy [EMAIL PROTECTED]**20071222144439]
[change tentativelyAddPatch to accept a PatchInfoAnd p.
David Roundy [EMAIL PROTECTED]**20071222140517]
[internal prepration for optimization saving patch writing.
David Roundy [EMAIL PROTECTED]**20071222134834]
[add changelog entry.
David Roundy [EMAIL PROTECTED]**20071219162646]
[add fixme indicating where the code could be simplified.
David Roundy [EMAIL PROTECTED]**20071221135649]
[make reading of hashed inventories lazier.
David Roundy [EMAIL PROTECTED]**20071221133453]
[resolve conflicts in mv_and_remove_tests.sh.
David Roundy [EMAIL PROTECTED]**20071219144638]
[Fix !(...|...) in mv_and_remove_tests.sh.
Dave Love [EMAIL PROTECTED]**20071218001826
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
]
[[issue571] Redo last HAVE_TERMIO_H fix.
Dave Love [EMAIL PROTECTED]**20071218140508
Not the most direct fix, but simpler.
]
[Fix configure test for gadt type witnesses.
Dave Love [EMAIL PROTECTED]**20071218120139]
[use --ignore-times in all tests.
David Roundy [EMAIL PROTECTED]**20071217225159
This is because the hashed repository is a bit pickier, in that
it no longer checks file lengths when the file modification times
match.
]
[enable modification time checking on hashed repositories.
David Roundy [EMAIL PROTECTED]**20071217220237]
[Pass two args to `cmp' in tests, following POSIX.
Dave Love [EMAIL PROTECTED]**20071216180503
Fixes some failures on Solaris.
]
[resolve silly conflict with myself.
David Roundy [EMAIL PROTECTED]**20071217200855]
[clean up SelectChanges (eliminating Bools)
David Roundy [EMAIL PROTECTED]**20071217191809]
[make a few more files compile with type witnesses.
David Roundy [EMAIL PROTECTED]**20071217183234]
[fix bug in revert (in writing the unrevert file).
David Roundy [EMAIL PROTECTED]**20071216215225]
[make a few more files compile with type witnesses.
David Roundy [EMAIL PROTECTED]**20071217164815]
[remove tabs.
David Roundy [EMAIL PROTECTED]**20071216224617]
[bump version number preemptively to 2.0.0pre3.
David Roundy [EMAIL PROTECTED]**20071216222823]
[fix doc bug in show contents.
David Roundy [EMAIL PROTECTED]**20071216214002]
[TAG 2.0.0pre2
David Roundy [EMAIL PROTECTED]**20071216201647]
Patch bundle hash
[darcs-devel] darcs patch: refactor: improve style and portability of pull.pl tes...
Sat Jan 5 13:17:51 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* refactor: improve style and portability of pull.pl test script.
Many direct system calls were eliminated. No functional changes.
New patches:
[refactor: improve style and portability of pull.pl test script.
Mark Stosberg [EMAIL PROTECTED]**20080105181751
Many direct system calls were eliminated. No functional changes.
] {
hunk ./tests/pull.pl 5
-use Test::More qw/no_plan/;
-use lib ('lib/perl');
+use Test::More 'no_plan';
+use lib 'lib/perl';
hunk ./tests/pull.pl 9
+use warnings;
hunk ./tests/pull.pl 11
-use vars qw/$DARCS/;
-use POSIX qw/getuid/;
-
-die 'darcs not found' unless $ENV{DARCS} || (-x $ENV{PWD}/../darcs);
-$DARCS = $ENV{DARCS} || $ENV{PWD}/../darcs;
+use POSIX 'getuid';
hunk ./tests/pull.pl 15
-`mkdir -p temp1 temp2/one/two`;
-chdir 'temp1';
-`$DARCS init`;
-chdir '../temp2';
-`$DARCS init`;
-chdir 'one/two';
+ok(mkpath('temp1'), temp1 created);
+ok(mkpath('temp2/one/two'), temp2/one/two created);
+ok(chdir('temp1'), chdir temp1);
+darcs 'init';
+ok(chdir('../temp2'), chdir ../temp2);
+darcs 'init';
+ok(chdir('one/two'), chdir one/two);
hunk ./tests/pull.pl 25
-my $pull_out = `$DARCS pull -a ../../../temp1 21`;
+my $pull_out = darcs 'pull -a ../../../temp1';
hunk ./tests/pull.pl 29
-my $test_name = 'darcs pull should pull into repo specified with --repo';
-chdir '../../'; # now in temp2
-`$DARCS add one`;
-`$DARCS record --patch-name 'uno' --all --author [EMAIL PROTECTED];
-chdir '../'; # now outside of any repo
-like(`$DARCS pull --repodir temp1 --all ../temp2`, # temp2 is relative to temp1
- qr/Finished pulling./i, $test_name);
+{
+my $test_name = 'darcs pull should pull into repo specified with --repo';
+chdir '../../'; # now in temp2
+darcs 'add one';
+darcs q(record --patch-name 'uno' --all --author [EMAIL PROTECTED]);
+chdir '../'; # now outside of any repo
+like(darcs('pull --repodir temp1 --all ../temp2'), # temp2 is relative to temp1
+qr/Finished pulling./i, $test_name);
+}
hunk ./tests/pull.pl 42
-`$DARCS add --repodir ./temp2 one/date.t`;
-`$DARCS record --repodir ./temp2 --author [EMAIL PROTECTED] -a -m 'foo'`;
+darcs 'add --repodir ./temp2 one/date.t';
+darcs q(record --repodir ./temp2 --author [EMAIL PROTECTED] -a -m 'foo');
hunk ./tests/pull.pl 46
-`chmod -w ./temp1/one/`;
-my $out = `$DARCS pull --repodir ./temp1 -a 21`;
+ chmod '0555','./temp1/one/'; # remove read permissions
+my $out = darcs 'pull --repodir ./temp1 -a 21';
hunk ./tests/pull.pl 73
-like(`$DARCS pull -a $abs_path 21`, qr/Can.t pull from current repository!/i, $test_name);
-like(`$DARCS pull -a . 21`, qr/Can.t pull from current repository!/i, $test_name);
+like(darcs(qq(pull -a $abs_path)), qr/Can.t pull from current repository!/i, $test_name);
+like(darcs('pull -a .'), qr/Can.t pull from current repository!/i, $test_name);
hunk ./tests/pull.pl 84
-like(`$DARCS pull 21`, qr/please specify one/i, $test_name);
+like(darcs('pull'), qr/please specify one/i, $test_name);
hunk ./tests/pull.pl 86
-like(`$DARCS pull 21`, qr/Can.t pull from current repository!/i, '[issue358] '.$test_name);
-unlike(`$DARCS pull ../* 21`, qr/Can.t pull from current repository!/i, '[issue427] '.$test_name);
+like(darcs('pull'), qr/Can.t pull from current repository!/i, '[issue358] '.$test_name);
+unlike(darcs('pull ../*'), qr/Can.t pull from current repository!/i, '[issue427] '.$test_name);
hunk ./tests/pull.pl 103
-rmtree('temp2/');
+rmtree 'temp2/';
hunk ./tests/pull.pl 105
-chdir('temp2');
+chdir 'temp2';
hunk ./tests/pull.pl 108
-`$DARCS revert -a`;
-my $pull_out = `$DARCS pull -a ../temp1 21`;
+darcs 'revert -a';
+my $pull_out = darcs 'pull -a ../temp1';
hunk ./tests/pull.pl 150
-rmtree('temp1');
+rmtree 'temp1';
hunk ./tests/pull.pl 154
-rmtree('temp2');
+rmtree 'temp2';
}
Context:
[add feature requested in issue576.
David Roundy [EMAIL PROTECTED]**20080105150125]
[fix bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144929]
[add test that triggers bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144812]
[add configure support for libwww.
David Roundy [EMAIL PROTECTED]**20080104201255]
[make bug message more explicit.
David Roundy [EMAIL PROTECTED]**20080104004253]
[Initial implementation of HTTP pipelining using libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20071222144902]
[make indent slightly more concise using lines and unlines.
David Roundy [EMAIL PROTECTED]**20080104003953]
[Make sure we test the 'darcs' we just built and not one in a global path.
Mark Stosberg [EMAIL PROTECTED]**20080102002235
This done by using $DARCS instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does
[darcs-devel] darcs patch: typo fix on GNUmakefile comment (and 1 more)
Sat Jan 5 13:30:27 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* typo fix on GNUmakefile comment
Sat Jan 5 13:36:41 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* minor white-space and code style improvements
New patches:
[typo fix on GNUmakefile comment
Mark Stosberg [EMAIL PROTECTED]**20080105183027] {
hunk ./GNUmakefile 324
- @echo Running sh tests on old-fashioned reositories...
+ @echo Running sh tests on old-fashioned repositories...
}
[minor white-space and code style improvements
Mark Stosberg [EMAIL PROTECTED]**20080105183641] {
hunk ./tests/shell_harness 35
-foreach my $test (@ARGV) {
+for my $test (@ARGV) {
hunk ./tests/shell_harness 43
- print passed.\n;
+print passed.\n;
hunk ./tests/shell_harness 46
- $OK = 0;
- push @Failures, $test;
+$OK = 0;
+push @Failures, $test;
hunk ./tests/shell_harness 49
- print FAILED!\n;
- print Output from failed $test:\n$output;
+print FAILED!\n;
+print Output from failed $test:\n$output;
hunk ./tests/shell_harness 54
-if( $OK ) {
+if ($OK) {
}
Context:
[add feature requested in issue576.
David Roundy [EMAIL PROTECTED]**20080105150125]
[fix bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144929]
[add test that triggers bug in issue576.
David Roundy [EMAIL PROTECTED]**20080105144812]
[add configure support for libwww.
David Roundy [EMAIL PROTECTED]**20080104201255]
[make bug message more explicit.
David Roundy [EMAIL PROTECTED]**20080104004253]
[Initial implementation of HTTP pipelining using libwww.
Dmitry Kurochkin [EMAIL PROTECTED]**20071222144902]
[make indent slightly more concise using lines and unlines.
David Roundy [EMAIL PROTECTED]**20080104003953]
[Make sure we test the 'darcs' we just built and not one in a global path.
Mark Stosberg [EMAIL PROTECTED]**20080102002235
This done by using $DARCS instead of 'darcs'.
However, in my case the updated test FAILS unexplainably with 2.0.0pre3,
by failing to detect that a file has changed.
If I follow along in a shell and run the same commands with Darcs 2,
the problem does not appear.
]
[refactor: replace recursive indent with more concise find-and-replace syntax
Mark Stosberg [EMAIL PROTECTED]**20080101200447]
[issue347 - document that single quotes should be used in .darcs/defaults
Mark Stosberg [EMAIL PROTECTED]**20080101164428]
[simplify (and debug) pending handling.
David Roundy [EMAIL PROTECTED]**20071227133618
Note that this change could lead to performance regressions, but I believe
that these regressions would be strongly bounded (never worse than a
whatsnew), and this simplification makes the code much easier to safely
modify.
]
[make updating of pending on pull much more efficient.
David Roundy [EMAIL PROTECTED]**20071224131059]
[simplify a bit of code.
David Roundy [EMAIL PROTECTED]**20071224131023]
[fix type-witness bug in HopefullyPrivate.
David Roundy [EMAIL PROTECTED]**20071223141149]
[simplify Get
David Roundy [EMAIL PROTECTED]**20071223025108]
[simplify tentativelyAddPatch by removing unused return value.
David Roundy [EMAIL PROTECTED]**20071223024400]
[simplify away np2prims and nps2prims.
David Roundy [EMAIL PROTECTED]**20071223022145]
[try to avoid rewriting patches that we've just read.
David Roundy [EMAIL PROTECTED]**20071222190029]
[generalize CommandsAux utility functions.
David Roundy [EMAIL PROTECTED]**20071222162952]
[add new instances for PatchInfoAnd.
David Roundy [EMAIL PROTECTED]**20071222144439]
[change tentativelyAddPatch to accept a PatchInfoAnd p.
David Roundy [EMAIL PROTECTED]**20071222140517]
[internal prepration for optimization saving patch writing.
David Roundy [EMAIL PROTECTED]**20071222134834]
[add changelog entry.
David Roundy [EMAIL PROTECTED]**20071219162646]
[add fixme indicating where the code could be simplified.
David Roundy [EMAIL PROTECTED]**20071221135649]
[make reading of hashed inventories lazier.
David Roundy [EMAIL PROTECTED]**20071221133453]
[resolve conflicts in mv_and_remove_tests.sh.
David Roundy [EMAIL PROTECTED]**20071219144638]
[Fix !(...|...) in mv_and_remove_tests.sh.
Dave Love [EMAIL PROTECTED]**20071218001826
Assume the original construct should have been `! ... | ...' and
replace with a portable version of that.
]
[[issue571] Redo last HAVE_TERMIO_H fix.
Dave Love [EMAIL PROTECTED]**20071218140508
Not the most direct fix, but simpler.
]
[Fix configure test for gadt type witnesses.
Dave Love [EMAIL PROTECTED]**20071218120139]
[use --ignore-times in all tests.
David Roundy [EMAIL PROTECTED]**20071217225159
This is because the hashed repository is a bit pickier, in that
it no longer checks file lengths when the file modification times
match.
]
[enable modification time checking on hashed repositories.
David Roundy [EMAIL PROTECTED]**20071217220237]
[Pass two args to `cmp' in tests, following POSIX.
Dave Love [EMAIL PROTECTED]**20071216180503
Fixes some failures on Solaris.
]
[resolve silly conflict with myself.
David
[darcs-devel] darcs patch: issue526: improve Perl test suite.
Sat Jan 5 23:55:48 EST 2008 Mark Stosberg [EMAIL PROTECTED]
* issue526: improve Perl test suite.
- better compatibility when path to darcs includes a space
- better portability by eliminating some system calls
- general style improvements
New patches:
[issue526: improve Perl test suite.
Mark Stosberg [EMAIL PROTECTED]**20080106045548
- better compatibility when path to darcs includes a space
- better portability by eliminating some system calls
- general style improvements
] {
hunk ./tests/annotate.pl 5
+use Test::More 'no_plan';
hunk ./tests/annotate.pl 7
+use Shell::Command;
hunk ./tests/annotate.pl 9
-use Test::More qw/no_plan/;
-use strict;
-use vars qw/$DARCS/;
-
-die 'darcs not found' unless $ENV{DARCS} || (-x $ENV{PWD}/../darcs);
-$DARCS = $ENV{DARCS} || $ENV{PWD}/../darcs;
+use strict;
+use warnings;
hunk ./tests/annotate.pl 13
-`mkdir temp1`;
-chdir 'temp1';
-`$DARCS init`;
+ok( mkpath('temp1'), temp1 created);
+mkpath('temp1');
+ok(chdir('temp1'), chdir temp1);
+darcs 'init';
hunk ./tests/annotate.pl 23
-`$DARCS add date.t`;
+darcs 'add date.t';
hunk ./tests/annotate.pl 25
-like(`$DARCS record -A 'Mark Stosberg [EMAIL PROTECTED]' -a -m foo date.t 21`, qr/finished recording/i, $test_name);
+like(darcs(q(record -A 'Mark Stosberg [EMAIL PROTECTED]' -a -m foo date.t)), qr/finished recording/i, $test_name);
hunk ./tests/annotate.pl 29
-like(`$DARCS annotate --xml date.t `,qr/lt;[EMAIL PROTECTED]gt;/,'annotate --xml encodes and ');
+like(darcs(q(annotate --xml date.t)),qr/lt;[EMAIL PROTECTED]gt;/,'annotate --xml encodes and ');
hunk ./tests/annotate.pl 32
-`rm -rf temp1`;
+cleanup 'temp1';
hunk ./tests/changes.pl 5
+use Test::More 'no_plan';
hunk ./tests/changes.pl 8
-use Test::More qw/no_plan/;
+use Shell::Command;
hunk ./tests/changes.pl 10
-use vars qw/$DARCS/;
-
-die 'darcs not found' unless $ENV{DARCS} || (-x $ENV{PWD}/../darcs);
-$DARCS = $ENV{DARCS} || $ENV{PWD}/../darcs;
hunk ./tests/changes.pl 12
-`mkdir temp1`;
-chdir 'temp1';
-`$DARCS init`;
+ok(mkpath('temp1'), temp1 created);
+ok(chdir('temp1'), chdir temp1);
+darcs 'init';
+
hunk ./tests/changes.pl 22
-`$DARCS add date.t`;
+darcs 'add date.t';
hunk ./tests/changes.pl 24
-like(`$DARCS record -A 'Mark Stosberg [EMAIL PROTECTED]' -a -m foo date.t 21`, qr/finished recording/i, $test_name);
+like(darcs(q(record -A 'Mark Stosberg [EMAIL PROTECTED]' -a -m foo date.t)), qr/finished recording/i, $test_name);
hunk ./tests/changes.pl 28
-like(`$DARCS changes date.t`,qr/foo/,'changes file.txt: trivial case works');
-like(`$DARCS changes --last=1 date.t`,qr/foo/,'changes --last=1 file.txt');
-like(`$DARCS changes --last=1 --summary date.t`,qr/foo/,'changes --last=1 --summary file.txt');
-
-like(`$DARCS changes --last=1 --xml `,qr/lt;[EMAIL PROTECTED]gt;/,'changes --last=1 --xml encodes and ');
+like(darcs(q(changes date.t)), qr/foo/,'changes file.txt: trivial case works');
+like(darcs(q(changes --last=1 date.t)), qr/foo/,'changes --last=1 file.txt');
+like(darcs(q(changes --last=1 --summary date.t)),qr/foo/,'changes --last=1 --summary file.txt');
+like(darcs(q(changes --last=1 --xml )), qr/lt;[EMAIL PROTECTED]gt;/,'changes --last=1 --xml encodes and ');
hunk ./tests/changes.pl 36
-for (my $i = 0; $i = 49; $i++) {
+for (my $i = 0; $i = 5; $i++) {
+sleep 1; # helps make sure we detect changes.
hunk ./tests/changes.pl 39
-`$DARCS record -A x -a -m foo record num $i date.t 21`;
+my $out = darcs(qq(record -A x -a -m foo record num $i date.t));
+like( $out, qr/Finished record/i, foo record num $i: success);
hunk ./tests/changes.pl 43
-like(`$DARCS changes date.t`,qr/foo/,'after 50 records: changes file.txt: trivial case works');
-like(`$DARCS changes --last=1 date.t`,qr/foo/,'after 50 records: changes --last=1 file.txt');
-like(`$DARCS changes --last=1 --summary date.t`,qr/foo/,'after 50 records: changes --last=1 --summary file.txt');
+like(darcs(q(changes date.t)), qr/foo/,'after 50 records: changes file.txt: trivial case works');
+like(darcs(q(changes --last=1 date.t)), qr/foo/,'after 50 records: changes --last=1 file.txt');
+like(darcs(q(changes --last=1 --summary date.t)),qr/foo/,'after 50 records: changes --last=1 --summary file.txt');
hunk ./tests/changes.pl 49
-like(`$DARCS changes --context --from-patch=num 1\$ --to-patch=num 4\$`,
+
+like(darcs(q(changes --context --from-patch='num 1' --to-patch='num 4')),
hunk ./tests/changes.pl 57
-`darcs add second_file.t`;
-like(`darcs record -A x -a -m adding_second_file second_file.t 21`, qr/finished recording/i, 'recorded second file');
+darcs 'add second_file.t';
+like(darcs(q(record -A x -a -m adding_second_file second_file.t)), qr/finished recording/i, 'recorded second file');
hunk ./tests/changes.pl 63
-like(`darcs changes --last=1 date.t`,qr/foo/,$test_name);
+like(darcs(q(changes --last=1 date.t)),qr/foo/,$test_name);
hunk ./tests/changes.pl 68
-`rm -rf temp1`;
+cleanup
[darcs-devel] [issue558] singular rather than plural on do you wish to revert these changes
Mark Stosberg [EMAIL PROTECTED] added the comment: Where is this place where this occurs? Just running darcs revert with 1.0.9 looks like this: $ darcs revert hunk ./1.t 1 +b Shall I revert this change? (1/?) [ynWsfqadjkc], or ? for help: ### ...it is already singular. -- nosy: +markstos __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue558 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue540] wish: darcs remove -r to complement darcs add -r
New submission from Mark Stosberg [EMAIL PROTECTED]: Darcs should have 'darcs remove -r' to complement 'darcs add -r' The use case: I ran darcs add -r only to find that it added many files I intended to be boring. I wanted to undo that action and try again. darcs remove -r would do that, but doesn't exist. I used 'darcs revert -a' instead, but darcs surprised me by not using remove as the 'revert' of 'add', but instead completely deleted all the files without further warning! I'm not sure whether that's just my own confusion about 'revert', or a separate bug or just a case where an extra prompt would be helpful. -- messages: 2135 nosy: beschmi, droundy, kowey, markstos, tommy priority: wishlist status: unread title: wish: darcs remove -r to complement darcs add -r __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue540 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] [issue520] short docs for --checkpoint could be more helpful
New submission from Mark Stosberg [EMAIL PROTECTED]: When I do darcs optimize --help, the docs for --checkpoint say simply: create a checkpoint file Defining a checkpoint in terms of itself is not so helpful. I suggest instead: prepare repo for use with darcs get --partial -- messages: 2077 nosy: beschmi, droundy, kowey, markstos, tommy priority: wishlist status: unread title: short docs for --checkpoint could be more helpful __ Darcs bug tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue520 __ ___ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
[darcs-devel] performance of darcs with ghc 6.6 vs 6.4?
Following the Perl 6 project, I see reports that pugs is noticeably faster when compiled with GHC 6.6 vs. 6.4. I was wondering if some of the slower operations of darcs might also be faster when compiled with a newer GHC or if the issues are primarily algorithmic, making this difference insignificant. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: darcs patch: overhaul the darcs.net front page.
Thomas Counsell wrote: Hello On 21 Aug 2006, at 05:33, Eric Y. Kow wrote: Should we maybe tone down the Smart bit? Maybe something like Flexible Flexible when applied to software can mean needs lots of configuration or Simple... Isn't that what we're trying to get at? Simple can mean Has little functionality...intentionally! Perhaps spontaneous? That is the key word used in the paragraph, and certainly one of the aspects of darcs that I enjoy most. Spontaneous Branches evokes branches that spring into existence on their own. But just Spontaneous on its own sounds almost like unpredictable. I think a lot good words have been tainted by their prior use in marketing. Sometimes I see the word Intelligent to describe software, but I prefer the more casual Smart. I didn't see the old Hi... phrasing as pretentious, I found it more personal and friendly. I think it's going to be hard to please everyone with the marketing. If we are too introverted about it, we undersell ourselves and miss out on users. tangent I was surprised about some of the pro-subversion things I found on the wiki over the weekend on the darcs-vs-subversion page. (I've changed them now.) It wasn't that they were malicious or false, it was just that the same thing could be expressed as a positive for darcs instead of a positive for subversion. For example, Subversion is more similar to CVS. I think from the darcs perspective, this is actually an /advantage/ for darcs, but it was portrayed the other way around. It's a fine opinion to prefer to Subversion and see that is an advantage, but on our wiki, it's certainly fair to present things from a perspective that promotes darcs! /tangent On the other hand, if we too over-confident and pushy about our image, it can appear to be false or at least unappealing. What I felt was missing from the front page was really getting a sense of darcs at a glance. I thought Distributed. Interactive. Smart. helped with that. If you read further, we do back up this marketing with detail about all of these, including eventual links to papers and talks about the patch algebra, which look very smart to me, and it's not something I see happening with the other SCMs, so it seemed fair to me. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: overhaul the darcs.net front page.
Sun Aug 20 15:14:15 EDT 2006 Mark Stosberg [EMAIL PROTECTED]
* overhaul the darcs.net front page.
The themes to this change are:
- Focus on the key benefits of darcs:
Distributed. Interactive. Smart.
- Recognize that the wiki is the central resource,
and remove some information that is duplicated here
and reference the wik instead.
I can post a demo of this HTML for easy comparison if you'd like.
Mark
New patches:
[overhaul the darcs.net front page.
Mark Stosberg [EMAIL PROTECTED]**20060820191415
The themes to this change are:
- Focus on the key benefits of darcs:
Distributed. Interactive. Smart.
- Recognize that the wiki is the central resource,
and remove some information that is duplicated here
and reference the wik instead.
I can post a demo of this HTML for easy comparison if you'd like.
Mark
]
{
hunk ./index.html.in 7
titledarcs/title
meta http-equiv=Content-Type content=text/html; charset=ISO-8859-1
meta name=description content=darcs is an advanced revision control system.
-meta name=keywords content=darcs revision control system free software gpl linux debian
+meta name=keywords content=darcs scm subversion alternative CVS free software gpl linux debian
link rel=stylesheet type=text/css href=darcs.css/
/head
hunk ./index.html.in 14
body
div align=center
-img src=http://www.darcs.net/logos/logo.png; border=0 width=242 height79
+ img src=http://www.darcs.net/logos/logo.png; border=0 width=242 height79br/
+ strongDistributed. Interactive. Smart./strong
/div
table align=center
hunk ./index.html.in 33
/td
td width=15/td
td width=450
- p Hello, I'm David Roundy, the author of darcs. /p
hunk ./index.html.in 34
- a name=introDarcs is a revision control system/a. Darcs is simple
- to learn and use, with a powerful new approach to meet the needs
- of today's distributed software projects. Darcs is
- decentralized, based on a theory of patches with roots
- in quantum mechanics. Darcs is free software, licensed under the
- a href=http://www.gnu.org/copyleft/gpl.html;GPL/a.
+p a name=introDarcs is a free, open source source code management system./a /p
hunk ./index.html.in 36
- p
- Written in Haskell, darcs is used on many operating systems including
- Linux, MacOS X, FreeBSD, and Windows. Darcs includes a a
- href=http://abridgegame.org/cgi-bin/darcs.cgi/darcs/;CGI
- script/a to browse your repository from the web./p
+ h2Distributed/h2
hunk ./index.html.in 38
- pba href=http://darcs.net/DarcsWiki;Learn more at the wiki/a/b, the community-maintained site for all things darcs./p
+p Every user has access to the full command set, removing
+ boundaries between server and client or committer and non-committers./p
hunk ./index.html.in 41
+ h2Interactive/h2
hunk ./index.html.in 43
- h2Download/h2
-ul
-lia href=http://darcs.net/DarcsWiki/CategoryBinaries;Precompiled binaries/a of the latest stable release of darcs for various platforms including Windows, Mac OS X, FreeBSD and its siblings, Solaris, and AIX, a dozen flavors of Linux, and Cygwin.br
-/ul
-
- h2Documentation/h2
-ul
-lia href=manual/The manual/abr
-span style=font-size:smaller
-(Also available as a href=darcs.psPostscript/a, and in one a href=manual/bigpage.htmllarge HTML file/a. )
-/span
+p Darcs is easy to learn and efficient to use because it asks
+ you questions in response to simple commands, giving you choices
+ in your work flow. You can choose to record one
+ one change in a file, while ignoring another. As you update
+ from upstream, you can review each patch name, even the full diff
+ for interesting patches. /p
hunk ./index.html.in 50
-/li
-/ul
+ h2Smart/h2
+
+p Originally developed by physicist David Roundy, darcs is
+ based on a unique algebra of patches. /p
+
+p This smartness lets you respond to changing demands
+ in ways that would otherwise not be possible. Learn
+ more about a href=http://darcs.net/DarcsWiki/SpontaneousBranches;spontaneous branches/a with darcs./p
+
+hr
hunk ./index.html.in 61
- h2Code/h2
- pDarcs is written in Haskell, not in C, so a Haskell compiler is required to compile darcs. In addition, the Haskell compiler is written in Haskell, not in C, so you may experience a bootstrapping problem if a precompiled binary of the Haskell compiler is not available for your machine. For most users, it is not necessary to build darcs from source, and instead one of the precompiled binary packages linked above will suffice./p
hunk ./index.html.in 62
[darcs-devel] Re: darcs patch: overhaul the darcs.net front page.
Mark Stosberg wrote: Sun Aug 20 15:14:15 EDT 2006 Mark Stosberg [EMAIL PROTECTED] * overhaul the darcs.net front page. The themes to this change are: - Focus on the key benefits of darcs: Distributed. Interactive. Smart. - Recognize that the wiki is the central resource, and remove some information that is duplicated here and reference the wik instead. I can post a demo of this HTML for easy comparison if you'd like. Here's a demo of the new front page: http://mark.stosberg.com/Tech/darcs/front.html Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: [issue165] Add --[no-]check-patch option (too much like test/no-test)
Here's the description of what the proposed new option does: +To scrutinize each patch before recording it in the local repository, +supply a command with \verb!--check-patch!. It sounds rather similar to what --test does, although I can see the intent is different. The docs referenced the use case of making sure the log message had a particular format. Before this goes in, I'd like to see more explanation of when this option would work when --test would be a poor choice. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: [darcs-conflicts] new approach to conflicts
David Roundy wrote: I've put up a draft of some of the new conflict-handling ideas at http://darcs.net/conflicts/paper/paper.pdf From the sidelines it seems promising. I'm glad that it seems like there's been a significant breakthrough with the conflicts issue. I'm slightly concerned about the efficiency issue, but it seems solvable. I'll be happy to beta test if this work progresses further! Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] [issue184] darcs record handling of new directories is inconsistent with 'darcs add'
New submission from Mark Stosberg [EMAIL PROTECTED]: 'darcs add' will automatically add a new directory when adding a file, but 'darcs record' doesn't recognize the file: $ darcs addnew/dir/file.txt $ darcs record new/dir/file.txt darcs record new/dir/file.txt Recording changes in new/dir/file.txt: Ok, if you don't want to record anything, that's fine! Using darcs record new/dir would work, though. I think darcs record should recognize the file in the case above. This behavior exists with 1.0.6, and the ChangeLog indicates it hasn't been addressed for 1.0.7. Mark -- messages: 695 nosy: droundy, markstos, tommy status: unread title: darcs record handling of new directories is inconsistent with 'darcs add' Darcs issue tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue184 ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] darcs 1.0.8 builds and tests succesfully on FreeBSD
Hello, I just want to report a successful build and make test of darcs in my environment: darcs 1.0.8pre1 ghc 6.2.2 FreeBSD 4.10 Perl 5.8.0 Thanks for your continued work on this project. It's become hard to imagine developing without it! Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: some TODO tests for darcs --commands [Issue9]
Wed Nov 23 19:59:29 EST 2005 Mark Stosberg [EMAIL PROTECTED]
* some TODO tests for darcs --commands [Issue9]
These tests expose two bugs:
- cd /; darcs --commands doesn't work
- darcs --commands outside of repos reports too many commands, like get.
New patches:
[some TODO tests for darcs --commands [Issue9]
Mark Stosberg [EMAIL PROTECTED]**20051124005929
These tests expose two bugs:
- cd /; darcs --commands doesn't work
- darcs --commands outside of repos reports too many commands, like get.
]
{
addfile ./tests/commands.pl
hunk ./tests/commands.pl 1
+#!/usr/bin/env perl
+
+# Some tests for 'darcs --commands'
+
+use Test::More qw/no_plan/;
+use lib ('lib/perl');
+use Test::Darcs;
+use strict;
+use Cwd;
+use vars qw/$DARCS/;
+
+die 'darcs not found' unless $ENV{DARCS} || (-x $ENV{PWD}/../darcs);
+$DARCS = $ENV{DARCS} || $ENV{PWD}/../darcs;
+
+OUTSIDE_REPO_REALITY_CHECK: {
+local $TODO = 'Needs Haskell coder to fix';
+my $test_name = reality check --commands outside repo;
+chdir '/';
+SKIP: {
+skip can't get out darcs repo space, 2 if (-d '_darcs');
+my $out = darcs(--commands);
+like($out , qr/get/, get is listed as valid command outside of a repo);
+unlike($out , qr/get/, $test_name);
+print $out;
+}
+}
}
Context:
[TAG 1.0.7
Tommy Pettersson [EMAIL PROTECTED]**20060513171438]
Patch bundle hash:
17c6d31e75038bebd4ecaba44d2ff8ee9ac8800b
___
darcs-devel mailing list
darcs-devel@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] [issue180] add darcs dist --manifest to solve Catch 22
New submission from Mark Stosberg [EMAIL PROTECTED]: I would like to include a MANIFEST file automatically when doing 'darcs dist' This doesn't work, because the _darcs directory is not present at predist time: darcs setpref predist darcs query manifestMANIFEST Since I can't think of a good workaround, I request the following: darcs dist --manifest=FILE Adds current manifest to FILE, defaulting to the name MANIFEST Then we can set this behavior as a default preference if we always want it. Mark -- messages: 681 nosy: droundy, markstos, tommy status: unread title: add darcs dist --manifest to solve Catch 22 Darcs issue tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue180 ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] [issue157] Pulling rollbacks messes up dependencies
New submission from Mark Stosberg [EMAIL PROTECTED]: ( This is an import of bug #165 from the old system. There is still a TODO test for it in pull.pl, indicating it is still present. ) There is a workaround: Create a temp repo with 'darcs get --to-patch roll_me_back' and rollback the patch there, which will obviously succeed. Then pull the rollback patch back. If there were any real dependency problems, the pull will cause some conflicts. Just resolve the conflicts and be happy. Ick! This triggers a more severe bug. Darcs applies the inverse patches in the wrong order (B^-1 then C^-1), causing those parts of B which are modified by C to be mysteriously resurrected. #!/bin/sh mkdir r1 cd r1 darcs init echo a foo darcs record -lam A echo b foo darcs record --ignore-times -lam B echo c foo darcs record --ignore-times -lam C echo -n y | darcs rollback -p C cd .. darcs get --to-patch B r1 r2 cd r2 echo -n y | darcs rollback -p B echo y | darcs revert -a darcs pull -a ../r1 cat foo # foo contains 'b' rather than 'a' Download (untitled) 861b # Wed Mar 09 21:57:56 2005markjugg - Reference to ticket #251 added # Wed Mar 09 22:20:11 2005markjugg - AdminCc markjugg added # Wed Mar 09 22:20:31 2005markjugg - Severity Normal changed to Important # Wed Mar 09 22:22:59 2005markjugg - Correspondence added [Reply] [Comment] RT-Send-CC: droundy [guest - Thu Jan 06 08:15:23 2005]: There is a workaround: Create a temp repo with 'darcs get --to-patch roll_me_back' and rollback the patch there, which will obviously succeed. Then pull the rollback patch back. If there were any real dependency problems, the pull will cause some conflicts. Just resolve the conflicts and be happy. Ick! This triggers a more severe bug. Darcs applies the inverse patches in the wrong order (B^-1 then C^-1), causing those parts of B which are modified by C to be mysteriously resurrected. I just confirmed this bug still exists in the current darcs, thanks to the handy test script. I have added a TODO test for this now to the test suite for better tracking of it. The patch includes RT#165 in the name. I also bumped up the priority to Important. Mark -- messages: 613 nosy: droundy, markstos, tommy status: unread title: Pulling rollbacks messes up dependencies Darcs issue tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue157 ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: darcs patch: make dangers and recommended use of Amend clearer in...
On Wed, Dec 14, 2005 at 11:48:54PM +0100, Juliusz Chroboczek wrote: + single repository! Also, running amend-record while another user is pulling\n++ + from the same repo may cause repository corruption.\n Is that true? Why? I didn't write that sentence, I only moved it from one part of the documentation to another. I think the answer is that it's like getting caught trying to alter past. If there is no record of the history, did it really happen? But whoa be the person caught in the act of revising the truth. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: make dangers and recommended use of Amend clearer in...
Tue Dec 13 09:05:23 EST 2005 Mark Stosberg [EMAIL PROTECTED]
* make dangers and recommended use of Amend clearer in the docs.
I think it's important to be clearer about when it's appropriate to use
'amend',
so I moved some notes into the short and mid-length help texts.
New patches:
[make dangers and recommended use of Amend clearer in the docs.
Mark Stosberg [EMAIL PROTECTED]**20051213140523
I think it's important to be clearer about when it's appropriate to use 'amend',
so I moved some notes into the short and mid-length help texts.
]
{
hunk ./AmendRecord.lhs 58
\begin{code}
amendrecord_description :: String
amendrecord_description =
- Replace a recorded patch with a better version.
+ Replace a patch with a better version before it leaves your repo.
\end{code}
\options{amend-record}
hunk ./AmendRecord.lhs 73
fixing the changes and recording a new patch with the same name and
description.
-\verb!amend-record! will modify the date of the recorded patch. \textbf{WARNINGS:} You
-should \emph{ONLY} use \verb!amend-record! on patches which only exist in a single
-repository! Also, running amend-record while another user is pulling from the same
-repo may cause repository corruption.
-
+\verb!amend-record! will modify the date of the recorded patch.
\begin{code}
amendrecord_help :: String
amendrecord_help =
hunk ./AmendRecord.lhs 78
Amend-record is used to replace a patch with a newer version with additional\n++
- changes.\n
+ changes.\n\n++
+ WARNINGS: You should ONLY use amend-record on patches which only exist in a\n++
+ single repository! Also, running amend-record while another user is pulling\n++
+ from the same repo may cause repository corruption.\n
\end{code}
\begin{code}
amendrecord :: DarcsCommand
}
Context:
[fix handling of absolute paths containing drive letters
Will [EMAIL PROTECTED]**20051208054737
This fixes issue 47 where paths containing drive letters (i.e. on windows)
are not treated as absolute paths.
]
[bump version to 1.0.6pre1
Tommy Pettersson [EMAIL PROTECTED]**20051208092839]
[TAG 1.0.5
Tommy Pettersson [EMAIL PROTECTED]**20051207112730]
Patch bundle hash:
776b8f69439dff32b26ba46cc367f73c8cce504d
___
darcs-devel mailing list
darcs-devel@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] [issue19] directory conflict error should report path involved
New submission from Mark Stosberg [EMAIL PROTECTED]: I got this error today with Darcs 1.0.4: darcs failed: user error (Error applying patch to working dir: createDirectory: already exists (File exists)) This may have left your working directory an inconsistent but recoverable state. If you had no un-recorded changes by using 'darcs revert' you should be able to make your working directory consistent again. I understand why it's happening--- I already had a local directory that a patch added. It would be ideal to proceed despite this, since it's not really a problem from my perspective. However, as long as there is an error, it should let me know /which/ directory has the problem, since there may be several potential ones. In a minute I'll send a patch to darcs-devel that includes a test case this and includes this issue number in the patch name. -- messages: 75 nosy: droundy, markstos, tommy priority: wishlist status: unread title: directory conflict error should report path involved Darcs issue tracker [EMAIL PROTECTED] http://bugs.darcs.net/issue19 ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: add files starting with .* to default ... (and 5 more)
Wed Oct 12 15:43:04 EST 2005 Mark Stosberg [EMAIL PROTECTED]
* add files starting with .* to default boring list. Dreamweaver uses these.
Wed Nov 23 19:11:49 EST 2005 me
* newdir
Wed Nov 23 19:13:27 EST 2005 me
* newdir
Wed Nov 23 19:18:19 EST 2005 me
* newdir
Wed Nov 23 19:20:13 EST 2005 me
* newdir
Wed Nov 23 19:36:20 EST 2005 Mark Stosberg [EMAIL PROTECTED]
* new TODO test for better message on directory conflict when pulling
New patches:
[add files starting with .* to default boring list. Dreamweaver uses these.
Mark Stosberg [EMAIL PROTECTED]**20051012204304]
{
hunk ./RepoPrefs.lhs 117
# be Korean translations rather than kernel modules.,
# \\.ko$,
\\.ko\\.cmd$,\\.mod\\.c$,
+ (^|/)\\._,
(^|/)\\.tmp_versions($|/),(^|/)CVS($|/),(^|/)RCS($|/),~$,
#(^|/)\\.[^/],(^|/)_darcs($|/),
\\.bak$,\\.BAK$,\\.orig$,(^|/)vssver\\.scc$,
}
[newdir
me**20051124001149]
{
addfile ./t.tmp
hunk ./tests/pull.pl 129
ok(!(system diff baz correct_baz), 'pull was right');
chdir '..';
}
+
+CREATE_DIR_ERROR: {
+ my $test_name = when a patch creating a directory is attempted to be applied
+ when an existing directory, exists, an error is reported.;
+ mkdir 'temp1/newdir';
+ chdir 'templ';
+ darcs 'add newdir';
+ darcs 'record --ignore-times -am newdir --author me';
+ chdir '../temp2';
+ mkdir 'newdir';
+ my $out = darcs('pull -a');
+ like($out, qr/fail/i, $test_name);
+ like($out, qr/newdir/i, ...and report the name if the directory involved);
+ chdir '..';
+}
ok(-d 'temp1', temp1 exists here);
`rm -rf temp1`;
}
[newdir
me**20051124001327]
{
adddir ./tests/newdir
hunk ./tests/pull.pl 142
my $out = darcs('pull -a');
like($out, qr/fail/i, $test_name);
like($out, qr/newdir/i, ...and report the name if the directory involved);
- chdir '..';
+ chdir '../';
}
ok(-d 'temp1', temp1 exists here);
hunk ./tests/pull.pl 146
-`rm -rf temp1`;
+rmtree('temp1');
ok((!-d 'temp1'), 'temp1 directory was deleted');
ok(-d 'temp2', temp1 exists here);
hunk ./tests/pull.pl 150
-`rm -rf temp2`;
+rmtree('temp2');
ok((!-d 'temp2'), 'temp1 directory was deleted');
}
[newdir
me**20051124001819]
{
hunk ./tests/pull.pl 137
chdir 'templ';
darcs 'add newdir';
darcs 'record --ignore-times -am newdir --author me';
- chdir '../temp2';
+ ok((chdir '../temp2'), chdir succeeds);;
mkdir 'newdir';
my $out = darcs('pull -a');
like($out, qr/fail/i, $test_name);
hunk ./tests/pull.pl 142
like($out, qr/newdir/i, ...and report the name if the directory involved);
- chdir '../';
+ ok((chdir '../'), chdir succeeds);;
}
ok(-d 'temp1', temp1 exists here);
}
[newdir
me**20051124002013]
{
hunk ./tests/pull.pl 145
ok((chdir '../'), chdir succeeds);;
}
-ok(-d 'temp1', temp1 exists here);
+ok(-d 'temp1', temp1 exists here) || `ls -l`;
rmtree('temp1');
ok((!-d 'temp1'), 'temp1 directory was deleted');
hunk ./tests/pull.pl 149
-ok(-d 'temp2', temp1 exists here);
+ok(-d 'temp2', temp2 exists here);
rmtree('temp2');
hunk ./tests/pull.pl 151
-ok((!-d 'temp2'), 'temp1 directory was deleted');
+ok((!-d 'temp2'), 'temp2 directory was deleted');
}
[new TODO test for better message on directory conflict when pulling
Mark Stosberg [EMAIL PROTECTED]**20051124003620]
{
hunk ./tests/pull.pl 131
}
CREATE_DIR_ERROR: {
+ local $TODO = 'awaiting attention from a Haskell coder.';
my $test_name = when a patch creating a directory is attempted to be applied
when an existing directory, exists, an error is reported.;
mkdir 'temp1/newdir';
hunk ./tests/pull.pl 135
- chdir 'templ';
+ chdir 'templ/';
+ ok((chdir 'temp1/'), chdir succeeds);;
darcs 'add newdir';
darcs 'record --ignore-times -am newdir --author me';
ok((chdir '../temp2'), chdir succeeds);;
hunk ./tests/pull.pl 141
mkdir 'newdir';
- my $out = darcs('pull -a');
+ my $out = darcs('pull -a ../temp1');
like($out, qr/fail/i, $test_name);
like($out, qr/newdir/i, ...and report the name if the directory involved);
ok((chdir '../'), chdir succeeds);;
}
Context:
[remove tabs from darcs source file
Tommy Pettersson [EMAIL PROTECTED]**2005112022]
[Added a test for changes --context patch selection.
Daniel Bünzli [EMAIL PROTECTED]**20051120170157]
[Emacs ediff-merge example and explanation of --external-merge.
Dave Love [EMAIL PROTECTED]**20051117154924]
[Fix patch selection for command changes --context
Daniel Bünzli [EMAIL PROTECTED]**20051117145112]
[fix bug in amInRepository.
David Roundy [EMAIL PROTECTED]**20051117131208
This is the bug that causes issue9. I'm a bit uncertain about this
patch--it looks obvious, but this is pretty subtle code.
]
[fix bug where darcs tries to delete open tempfile on win32
Will [EMAIL PROTECTED]**20051117023516]
[bump version to 1.0.5rc1
Tommy
[darcs-devel] Re: 1.04rc2 silent data corruption bug: duplicate lines added to files
On 2005-10-21, Mark Stosberg [EMAIL PROTECTED] wrote: Hello, I just tried a pull with darcs 1.0.3, and it failed it some way that produced a ton of patch data dumped to the screen. (So much in fact that I couldn't scroll back to see what the actual error was). I switched to a 1.0.4rc2 binary, and it completed the pull without an error. However, Several files had duplicate lines them, effectively corrupting the result. Thankfully, I was able to unpull back to my pre-launch tag. ( Actually, I could only unpull with 1.0.4rc2, the 1.0.3 binary complained it couldn't apply the inverse patch. ) I have saved copies of the two repos just before the pull, and could possibly share that with developers. I just wanted to give you a heads-up as a new release is planned soon, and am also curious if there are initial guesses what would cause the duplicate line issue. As a workaround, I'm going to try re-recording several of the patches into one larger patch, and see if that helps. Just for some closure on this: It was later discovered we had corrupted our repo with an overreaching find and replace. David Roundy did the analysis, and later patched darcs so it would detected this corruption promptly, instead of later, which is what happened above. Mark -- http://mark.stosberg.com/ ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] 1.04rc2 silent data corruption bug: duplicate lines added to files
Hello, I just tried a pull with darcs 1.0.3, and it failed it some way that produced a ton of patch data dumped to the screen. (So much in fact that I couldn't scroll back to see what the actual error was). I switched to a 1.0.4rc2 binary, and it completed the pull without an error. However, Several files had duplicate lines them, effectively corrupting the result. Thankfully, I was able to unpull back to my pre-launch tag. ( Actually, I could only unpull with 1.0.4rc2, the 1.0.3 binary complained it couldn't apply the inverse patch. ) I have saved copies of the two repos just before the pull, and could possibly share that with developers. I just wanted to give you a heads-up as a new release is planned soon, and am also curious if there are initial guesses what would cause the duplicate line issue. As a workaround, I'm going to try re-recording several of the patches into one larger patch, and see if that helps. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: attempt to unrecord patch in darcs table branch results in get_extra failure
On 2005-10-13, Juliusz Chroboczek [EMAIL PROTECTED] wrote: I had a typo in my patch name, so I tried to unrecord it and got this message: Fail: failed to read patch in get_extra: Fri Feb 4 07:37:49 EST 2005 David Roundy [EMAIL PROTECTED] * bump version number to 1.0.2 (at last!) Perhaps this is a 'partial' repository? Perhaps it is a partial repository. Shouldn't darcs be able to know for sure if that was the case instead of guessing? Partial and full repositories use the same format. The only difference is that some patches are missing in a partial repository. So when Darcs fails to read a patch file which it expected to find, there's no saying why -- it may be because the repository is partial, or it could be because of some other problem. (In other words: in order to create a partial repository by hand, just make a checkpoint and delete random files under _darcs/patches; but don't try that at home, kids!) Even so, it's not clear why a partial repo would prevent me from unrecording a simple patch. It looks like either your repository is corrupt, or a bug in Darcs. What does check say? I should have mentioned that 'darcs check' reported that things were ok. I used the 1.0.4rc2 binary for that: Applying patch 674 of 674... done. The repo is consistent! The new feedback for darcs check is very nice! ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] darcs patch: simplify docs-- why CVS is in the boring file is sel...
Tue Sep 27 08:18:47 EST 2005 Mark Stosberg [EMAIL PROTECTED]
* simplify docs-- why CVS is in the boring file is self-evident.
New patches:
[simplify docs-- why CVS is in the boring file is self-evident.
Mark Stosberg [EMAIL PROTECTED]**20050927131847]
{
hunk ./RepoPrefs.lhs 86
~$
(^|/)CVS($|/)
\end{verbatim}
-The last line is actually irrelevant because I don't use CVS, but if I did
-it would be handy. A newly created repository has a longer boring file that
+A newly created repository has a longer boring file that
includes many common source control, backup, temporary, and compiled files.
You may want to have the boring file under version
}
Context:
[-add test script for --set-scripts-executable
Mark Stosberg [EMAIL PROTECTED]**20050901015046
It's currently failing because darcs is currently broken in this regard. I commented
out a TODO test in case you want to make to this a TODO test until
someone gets to it.
]
[clean up docs on flags directly to darcs (not to a darcs command).
David Roundy [EMAIL PROTECTED]**20050903124050]
[bump version to 1.0.4rc1.
David Roundy [EMAIL PROTECTED]**20050903114002]
[update the web page to direct new users first to the precompiled binaries rather than first to the source
[EMAIL PROTECTED]
[add test script that displays --no-pristine test-related bug.
David Roundy [EMAIL PROTECTED]**20050903132906]
[fix bug triggered by --no-pristine-tree and running test.
David Roundy [EMAIL PROTECTED]**20050903132055
The trouble was that the NoPristine version of createPristineDirectoryTree
would fail if the directory already exists, which isn't the intended
behavior. I also took this opportunity to remove the stubbornly function
and replace some stubborn directory creation with
createDirectoryIfMissing.
]
[don't create test directory if we don't want to actually run test.
David Roundy [EMAIL PROTECTED]**20050903130722]
[Change an rm_rf to a cleanup in tests/disable.pl
Ian Lynagh [EMAIL PROTECTED]**20050902024711]
[TAG 1.0.4pre4
David Roundy [EMAIL PROTECTED]**20050901110418]
[add changelog entry for makefile fix.
David Roundy [EMAIL PROTECTED]**20050901110353]
[bump version to 1.0.4pre4.
David Roundy [EMAIL PROTECTED]**20050901110210]
[fix DESTDIR syntax errors in makefile
Andres Loeh [EMAIL PROTECTED]**20050831192410]
[fix No root path(s) specified at ... testsuite problem.
David Roundy [EMAIL PROTECTED]**20050830121603]
[add test that triggers too many open files bug.
David Roundy [EMAIL PROTECTED]**20050827192215
We just need to pull over 1024 patches at once to trigger this bug on my
linux system.
]
[TAG 1.0.4pre3
David Roundy [EMAIL PROTECTED]**20050831115448]
[add two changelog entries.
David Roundy [EMAIL PROTECTED]**20050831113335]
[only create directories on install if they don't exist (bug #494)
David Roundy [EMAIL PROTECTED]**20050831113142]
[fix bug in whatsnew -l -l (rt#501).
David Roundy [EMAIL PROTECTED]**20050831110552]
[fix typo in docs.
David Roundy [EMAIL PROTECTED]**20050831002520]
[fix --posthook code to pass tests.
David Roundy [EMAIL PROTECTED]**20050830132225]
[add test for --disable.
David Roundy [EMAIL PROTECTED]**20050830132122]
[add changelog entry for --posthook.
David Roundy [EMAIL PROTECTED]**20050830132110]
[add skeleton posthook test.
David Roundy [EMAIL PROTECTED]**20050827123744]
[posthook documentation
Jason Dagit [EMAIL PROTECTED]**20050825045706]
[changed from --posthook-command to posthook
Jason Dagit [EMAIL PROTECTED]**20050825043414]
[now the posthook options appear for each command
Jason Dagit [EMAIL PROTECTED]**20050825043305]
[posthook for apply
Jason Dagit [EMAIL PROTECTED]**20050803070343
With this patch it is now possible to specify a command to run after every
successful apply.
]
[added run_posthook for actually running posthooks
Jason Dagit [EMAIL PROTECTED]**20050803070156
This adds the function run_posthook which should be used to run posthooks.
The code was added to Test.lhs, but there may be a better place for this code.
]
[added posthook command line switches
Jason Dagit [EMAIL PROTECTED]**20050803065956
Added generic posthook command line switches. This patch does not add any
posthooks to any command.
]
[Rewrite gcau, add explanatory comment from David and some TODO notes
Ian Lynagh [EMAIL PROTECTED]**20050830020943]
[update building darcs section of manual.
David Roundy [EMAIL PROTECTED]**20050829120152]
[add bench directory with a single script in it.
David Roundy [EMAIL PROTECTED]**20050828114118
See bench/README for discussion of the idea behind this.
]
[New implementation of comparePS, based on memcmp. 1/5 space usage, 96% faster
[EMAIL PROTECTED]
[Use substrPS-less versions of initPS and tailPS
[EMAIL PROTECTED]
[remove hideous malloc hack.
David Roundy [EMAIL PROTECTED]**20050818161411]
[change my AUTHORS email to [EMAIL PROTECTED]
David Roundy [EMAIL PROTECTED]**20050808124703]
[fix mkstemp implementation for win32
Peter Strand [EMAIL PROTECTED
[darcs-devel] Re: test results for 1.04pre4 on FreeBSD 4.10
On 2005-09-09, Tommy Pettersson [EMAIL PROTECTED] wrote: On Fri, Sep 09, 2005 at 03:17:47AM +, Mark Stosberg wrote: I tried this and got the same result: DARCS_DONT_ESCAPE_ISPRINT=0 DARCS_DONT_ESCAPE_8BIT=0 DARCS_DONT_ESCAPE_EXTRA=0 DARCS_DONT_ESCAPE_TRAILING_SPACNT_ESCAPE_ANYTHING=0 prove printer.pl O, I'm sorry, I forgot to mention the most important one: LC_ALL=C (could you please try with that too?) Still the same result. Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[darcs-devel] Re: [darcs #480] query language for darcs changes et al.
On 2005-08-02, via RT [EMAIL PROTECTED] wrote: The current interface of darcs changes and darcs annotate includes various options that affect the criteria of patch selection and the form of output. These options seem insufficient for most people's needs of querying patches, and should probably be replaced by a proper query language. The query language should have at least three separate parts: - a way to specify which patches we want information on (possibly something complicated like every patch that touched line 6 of foo.txt after March) As David says, matches accomplishes a fair bit of this. I'm not sure about the usefulness of line 6 as a pattern match, since lines move around with revisions, creating the question of which line 6?. - a way to specify which information we want about those patches (name? author? date? hash? summary? contents?) This is least important in my option. For simple fields that fit on a line, it's easy to drill down further with grep. Other unix reporting tools take this approach. Also, with an XML output, there are already existing ways to mine that. - a way to specify the output format of the information (xml / darcs native / patch-per-line) We already have XML, verbose and summary options for several commands. Perhaps you could be more specific about what you are looking for? Mark ___ darcs-devel mailing list darcs-devel@darcs.net http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
