gmane.comp.version-control.darcs.user

darcs patch: tests/*: refactor remaining IFS calls tolib

2008-12-01T15:40:08

Mon Dec 1 10:39:32 EST 2008 gwern0< at >gmail.com * tests/*: refactor remaining IFS calls to lib _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Refactor "darcs dist" help.

Trent W. Buck — 2008-12-01T00:41:00

Eric, congratulations on applying this weekend's work successfully: AFAICT the lastest (most amended) versions were applied in all cases. I think that --in-reply-to made this much easier! Here's the only unapplied patch I have from last weekend, I don't think I've sent it yet. | Create a distribution tarball. | [...] | The `darcs dist' command creates a compressed archive (a `tarball') in | the repository's root directory, containing the recorded state of the | working tree (unrecorded changes and the \_darcs directory are | excluded). | | If a predist command is set (see `darcs setpref'), that command will | be run on the tarball contents prior to archiving. For example, | autotools projects would set it to `autoconf \&\& automake'. | | By default, the tarball (and the top-level directory within the | tarball) has the same name as the repository, but this can be | overridden with the --dist-name option. Sun Nov 30 12:14:14 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs dist" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: tests/*: rm IFS hack from selected subset

2008-11-30T23:48:43

Sun Nov 30 18:48:14 EST 2008 gwern0< at >gmail.com * tests/*: rm IFS hack from selected subset _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

Small wiki with darcs as backend

Alberto Bertogli — 2008-11-30T22:26:25

Hi! I've added darcs support to my small wiki engine (called wikiri), so I thought I should drop a note here. It was very easy, but the wiki backend interface is very simple. I'm curious about the stability of the exit status tho, are those supposed to be set in stone? I've also used "darcs add" returning 2 as an indicator of "the file already exists in the repository", but I'm not sure if 2 is also used for something else that could indicate trouble. If anyone is interested, you can find it at http://blitiri.com.ar/git/?p=wikiri;a=summary (the README is at http://blitiri.com.ar/git/?p=wikiri;a=blob;f=README;hb=HEAD). I've only tested it briefly using darcs 2.0.2 under Linux. I'm not going to use it myself but if anyone has any comments or patches, they'd be welcome. Thanks a lot, Alberto

Some error messages during pushing

Conal Elliott — 2008-11-30T02:55:21

_______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

bug with darcs get --to-match='date.... ?

Thomas Hartman — 2008-11-29T21:36:05

When I pull a repo up to a certain point-in-time commit, I am getting an error. Sometimes the following formulation works -- in a different repo, that is -- but for the repo shown below, it doesn't work. The only difference I see is that in the repo that does work the time zone is CEST instead of CET. (Just a shot in the dark.) darcs --version 2.1.0 (release) Any idea? thomas ************************************** thartman< at >thartman-laptop:~/tmp>darcs get --to-match='date "Fri Nov 28 10:26:41 CET 2008"' /home/thartman/patch-shack/ darcs: Couldn't find patch matching "date "Fri Nov 28 10:26:41 CET 2008"" thartman< at >thartman-laptop:~/tmp>cd /home/thartman/patch-shack/ thartman< at >thartman-laptop:~/patch-shack>darcs changes head Changes to head: thartman< at >thartman-laptop:~/patch-shack>darcs changes | head Fri Nov 28 10:26:41 CET 2008 thomashartman1< at >Gmail.com * using HAppS.Data.User.Password, many changes for a compile Thu Nov 27 16:31:25 CET 2008 thomashartman1< at >Gmail.com * tweak to sync with HSHHelpers tweak .... Thu Nov 27 12:30:32 CET 2008 thomashartman1< at >Gmail.com thartman< at >thartman-laptop:~/patch-shack>darcs get --to-match='date "Thu Nov 27 16:31:25 CET 2008"' /home/thartman/patch-shack/ darcs: Couldn't find patch matching "date "Th

darcs patch: Don't use the terminfo package onWindows (+2 more)

Judah Jacobson — 2008-11-29T16:59:23

OK, attached are patches to reenable terminfo by default except on Windows, and to reenable haskeline by default: Fri Nov 28 09:36:11 PST 2008 Judah Jacobson gmail.com> * Rollback disabling of terminfo by default Fri Nov 28 11:48:21 PST 2008 Judah Jacobson gmail.com> * Don't use the terminfo package on Windows (Cabal). This lets us use terminfo by default while not breaking the Windows build. Sat Nov 29 08:50:47 PST 2008 Judah Jacobson gmail.com> * Enable haskeline by default in the Cabal file. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: resolve issue1238: refactor "darcssetpr... (and 5 more)

Trent W. Buck — 2008-11-29T12:09:02

Here's what I sent before in fits and starts, with amendments suggested by Stephen (on list) and Christian (in IRC). Fri Nov 28 23:53:05 EST 2008 Trent W. Buck gmail.com> * resolve issue1238: refactor "darcs setpref" help. Sat Nov 29 12:54:07 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs mark-conflicts" help. Sat Nov 29 15:57:56 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs whatsnew" help. Sat Nov 29 22:52:19 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs tag" help. Sat Nov 29 22:59:13 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs unrevert" help. Sat Nov 29 23:08:17 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs check" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Refactor "darcs tag" help.

Trent W. Buck — 2008-11-29T10:27:31

I'd like someone on the hacking team to verify the accuracy of my performance paragraph ("Tagging also provides ..."). Before: | Tag the contents of the repository with a version name. | | Tag is used to name a version of this repository (i.e. the whole tree). After: | Name the current repository state for future reference. | [...] | The `darcs tag' command names the current repository state, so that it | can easily be referred to later. Every `important' state should be | tagged; in particular it is common to tag each stable release with a | number or codename. A discussion of release numbering can be found at | http://producingoss.com/en/development-cycle.html. | | To reproduce the state of a repository `R' as at tag `t', use the | command `darcs get --tag t R'. The command `darcs show tags' lists | all tags in the current repository. | | Tagging also provides significant performance benefits: if Darcs sees | that two repositories both have a tag, it can safely assume that both | repositories also have all the patches `in' that tag. When a tag | covers thousands or tens of thousands of patches, this saves a lot of | time. | | Like normal patches, a tag has a name, an author and a timestamp; a | tag cannot have a long description, nor can it make changes to the | working tree. | | A tag can have any name, but it is generally best to pick a naming | scheme and stick to it. You can even have multiple tags with the | *same* name in the repository, but this is not recommended because it | becomes confusing for your co-contributors. | | The `darcs tag' command accepts the --pipe and --checkpoint options, | which behave as described in `darcs record' and `darcs optimize' | respectively. Sat Nov 29 21:16:55 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs tag" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Refactor "darcs whatsnew" help.

Trent W. Buck — 2008-11-29T05:11:45

Before: | Display unrecorded changes in the working copy. |[...] | whatsnew gives you a view of what changes you've made in your working | copy that haven't yet been recorded. The changes are displayed in | darcs patch format. Note that --look-for-adds implies --summary usage. After: | List unrecorded changes in the working tree. | [...] | The `darcs whatsnew' command lists unrecorded changes to the working | tree. If you specify a set of files and directories, only unrecorded | changes to those files and directories are listed. | | With the --summary option, the changes are condensed to one line per | file, with mnemonics to indicate the nature and extent of the change. | The --look-for-adds option causes candidates for `darcs add' to be | included in the summary output. | | By default, `darcs whatsnew' uses Darcs' internal format for changes. | To see some context (unchanged lines) around each change, use the | --unified option. To view changes in conventional `diff' format, use | the `darcs diff' comand; but note that `darcs whatsnew' is faster. | | This command exits unsuccessfully (returns a non-zero exit status) if | there are no unrecorded changes. Sat Nov 29 15:57:56 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs whatsnew" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Refactor "darcs mark-conflicts" help.

Trent W. Buck — 2008-11-29T02:03:53

Before: | Mark any conflicts to the working copy for manual resolution. | [...] | Mark-conflicts is used to mark and resolve any conflicts that may exist in a | repository. Note that this trashes any unrecorded changes in the working | copy. After: | Mark any unresolved conflicts in working copy, for manual resolution. | [...] | Darcs requires human guidance to unify changes to the same part of a | source file. When a conflict first occurs, darcs will add both | choices to the working tree, delimited by markers. | | However, you might revert or manually delete these markers without | actually resolving the conflict. In this case, `darcs mark-conflicts' | is useful to show where any unresolved conflicts. It is also useful | if `darcs apply' is called with --apply-conflicts, where conflicts | aren't marked initially. | | Any unrecorded changes to the working tree *will* be lost forever when | you run this command! You will be prompted for confirmation before | this takes place. | | This command was historically called `resolve', and this deprecated | alias still exists for backwards-compatibility. Sat Nov 29 12:54:07 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs mark-conflicts" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Refactor "darcs unrevert" help.

Trent W. Buck — 2008-11-28T13:28:12

I did this one because it's easy (short). The new output is | Usage: darcs unrevert [OPTION]... | Undo the last revert (may fail if changes after the revert). | | Options: | --ignore-times don't trust the file modification times | -a --all answer yes to all patches | -i --interactive prompt user interactively | --repodir=DIRECTORY specify the repository directory in which to run | --disable disable this command | -h --help shows brief description of command and its arguments | | Advanced options: | --debug give only debug output | --debug-verbose give debug and verbose output | --debug-http give debug output for curl and libwww | -v --verbose give verbose output | -q --quiet suppress informational output | --standard-verbosity neither verbose nor quiet output | --timings provide debugging timings information | --umask=UMASK specify umask to use when writing | --posthook=COMMAND specify command to run after this darcs command | --no-posthook don't run posthook command | --prompt-posthook prompt before running posthook [DEFAULT] | --run-posthook run posthook command without prompting | --prehook=COMMAND specify command to run before this darcs command | --no-prehook don't run prehook command | --prompt-prehook prompt before running prehook [DEFAULT] | --run-prehook run prehook command without prompting | | Unrevert is a rescue command in case you accidentally reverted | something you wanted to keep (for example, accidentally typing `darcs | rev -a' instead of `darcs rec -a'). | | Unreversion may fail if the repository has changed since the revert | took place. Darcs will ask for confirmation before executing an | interactive command that will *definitely* prevent unreversion. Sat Nov 29 00:19:23 EST 2008 Trent W. Buck gmail.com> * Refactor "darcs unrevert" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: issue1238: refactor "darcs setpref" help.

Trent W. Buck — 2008-11-28T12:11:45

This should be self-explanatory, if a little unreadable :-) Here's the new output of "darcs help setpref": | Usage: darcs setpref [OPTION]... | Set the value of a preference (test, predist, boringfile or binariesfile). | | Options: | --repodir=DIRECTORY specify the repository directory in which to run | --disable disable this command | -h --help shows brief description of command and its arguments | | Advanced options: | --debug give only debug output | --debug-verbose give debug and verbose output | --debug-http give debug output for curl and libwww | -v --verbose give verbose output | -q --quiet suppress informational output | --standard-verbosity neither verbose nor quiet output | --timings provide debugging timings information | --umask=UMASK specify umask to use when writing | --posthook=COMMAND specify command to run after this darcs command | --no-posthook don't run posthook command | --prompt-posthook prompt before running posthook [DEFAULT] | --run-posthook run posthook command without prompting | --prehook=COMMAND specify command to run before this darcs command | --no-prehook don't run prehook command | --prompt-prehook prompt before running prehook [DEFAULT] | --run-prehook run prehook command without prompting | | When working on project with multiple repositories and contributors, | it is sometimes desirable for a preference to be set consistently | project-wide. This is achieved by treating a preference set with | `darcs setpref' as an unrecorded change, which can then be recorded | and then treated like any other patch. | | Valid preferences are: | | test -- a shell command that runs regression tests | predist -- a shell command to run before `darcs dist' | boringfile -- the path to a version-controlled boring file | binariesfile -- the path to a version-controlled binaries file | | For example, a project using GNU autotools, with a `make test' target | to perform regression tests, might enable Darcs' integrated regression | testing with the following command: | | darcs setpref test 'autoconf && ./configure && make && make test' | | Note that merging is not currently implemented for preferences: if two | patches attempt to set the same preference, the last patch applied to | the repository will always take precedence. This is considered a | low-priority bug, because preferences are seldom set. Fri Nov 28 23:00:24 EST 2008 Trent W. Buck gmail.com> * issue1238: refactor "darcs setpref" help. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Disable terminfo by default (Cabal)

Eric Kow — 2008-11-28T12:10:21

Fri Nov 28 12:09:51 GMT 2008 Eric Kow darcs.net> * Disable terminfo by default (Cabal) Salvatore points out that the terminfo package does not install on Windows _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs patch: Refactor take/repeat as replicate.

Trent W. Buck — 2008-11-28T12:06:10

I was using this existing code as a reference, and the good folk of #haskell pointed out that `replicate' exists. So I fixed this code while I was at it. Fri Nov 28 22:46:53 EST 2008 Trent W. Buck gmail.com> * Refactor take/repeat as replicate. _______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

darcs feature request --- quick addition to boringfile

Norman Ramsey — 2008-11-27T20:09:03

I use darcs w -sl as a regular part of my workflow. It would speed things up enormously if I could tell darcs on the command line that certain files are boring. E.g., darcs addboring empty umasm echo.txt I don't see anything in the documentation to suggest this is possible. I'm using Debianized darcs 2.0.2. Would this be an easy change? I know a little Haskell... Norman

coping with latency?

Conal Elliott — 2008-11-27T00:12:50

_______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

zlib plans

Ganesh Sittampalam — 2008-11-26T19:01:52

Hi, At Eric's request I chatted to Petr about this, and I now propose the following roadmap for migrating darcs over to the Haskell zlib library and dropping the direct C bindings completely. Please note that I'm not volunteering to do any of this work :-) Much/all of this has been discussed or agreed, I'm really just making the sequencing explicit. (1) ASAP, move the cabal default back to the C zlib, to mitigate the current issues people are experiencing with corrupt checksums in .gz files produced by old versions of darcs. This might make the situation on Windows a bit worse, as the cabal build will become broken by default, but this just sets our plans for "good support" for Windows back a bit, whereas not doing it means a lot of trouble on all platforms. (2) I understand that Haskell zlib 0.5.1 is planned, with an interface that will return the "broken" decompressed data at the same time as reporting CRC errors. When this appears: (a) Make darcs use this interface to accept but warn about broken .gz files. We wouldn't maintain support for zlib 0.5.0 - as with the previous zlib transition, too much pain for too little gain. (b) [probably needs to be simultaneous with (a)] Make darcs repair, or an external program bundled with darcs, fix the corrupt checksums. (c) [optional] At some point switch the handling of broken .gz files from "accept but warn" to "reject". Obviously in both cases the warning/error would be clear about how to fix the problem. (3) Switch the default for everything to the Haskell zlib (4) Drop the C zlib (1) and (2) should happen as soon as possible. The precise timing of (3) and (4) is a matter of judgement; IMO we should have confidence at each step that we won't regret it, and this may mean waiting a few months each time; others I think are more keen to dump cruft as quickly as possible. BTW I haven't heard any suggestion that it's worth keeping the C zlib long term. I'm not aware of anything it can do that the Haskell zlib can't, and there's just no point in maintaining this inside darcs. If you disagree please speak up! Cheers, Ganesh

workarounds for Codec.Compression.Zlib errors in darcs

Eric Kow — 2008-11-26T14:38:33

_______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users

checkpoints in darcs-2 repositories

Trent W. Buck — 2008-11-26T11:32:24

Petr tells me that - get --partial on a darcs-1 repo copies patches since the last checkpoint. - get --lazy on a darcs-2 repo copies *no* patches initially; all patches are copied on demand. - darcs-2 repos don't support --partial semantics, and for darcs-2 repos --partial is probably an alias for --lazy behaviour. Does this mean that checkpoints of a darcs-2 repo are totally useless? If so, can we please make darcs optimize --checkpoint on a darcs-2 repository a no-op? Currently I have checkpoint in my ~/.darcs/defaults and so I'm creating around 20MB of checkpoints that (apparently) are never used.

windows: cabal configure -f external-zlib ?

Eric Kow — 2008-11-26T11:30:28

_______________________________________________ darcs-users mailing list darcs-users< at >darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users