Skip to content

Instantly share code, notes, and snippets.

Notational tricks:
* iff a merger has mergers as both children, break them up with a newline
* use L/R for "left" and "right" repo
* use capital letters for the hunk patches
* normalise m(R L) to m(L R)
* normalise m(m(...) X) to m(X m(...))
* normalise m(m(R..) m(L..)) to m(m(L..) m(R..))
* normalise m(.. t) to m(t ..)
* save repeated trees as tN
#!/bin/bash
BUNDLE=$1
cd $HOME/darcs-project
rm -rf k-review
darcs get --lazy http://darcs.net k-review
cd k-review
cabal configure
if [ ! -z "$BUNDLE" ]; then
// transliteration of http://gate.ac.uk/sale/tao/splitch12.html#sec:development:newpr
// note that I no longer remember how to program in Java
// and this is the first thing I've written in Scala after hello world
// so it may be very wrong
package example
import gate._
import gate.creole._
import gate.creole.metadata._
class RelTriple(subj:String,pred:String,obj:String)
object RelTriple {
def fromJson(j:Any):Option[RelTriple] = {
return j match {
case m:Map[String,Any] =>
// FIXME: how do I avoid all those coercions
// or somehow move theme to a better place?
(m get "subject") flatMap ((s:Any) =>
(m get "object") flatMap ((o:Any) =>
@kowey
kowey / n-way-conflict-0
Created November 5, 2010 01:16
hairy-ish conflict
v v v v v v v
if os(windows)
hs-source-dirs: src/win32
include-dirs: src/win32
other-modules: CtrlC
System.Posix
System.Posix.Files
System.Posix.IO
cpp-options: -DWIN32
c-sources: src/win32/send_email.c
@kowey
kowey / net.johnmacfarlane.gitit.plist
Created December 2, 2010 18:29
Edit and save in ~/Library/LaunchAgents
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>WorkingDirectory</key>
<string>/Users/kowey/kowey-wiki</string>
<key>KeepAlive</key>
<true/>
<key>EnvironmentVariables</key>
<dict>
@kowey
kowey / informal-darcs-version
Created December 7, 2010 18:04
Not secure...
#!/bin/bash
HASH=`darcs changes | md5sum | sed -e 's/\(....\).*/\1/'`
AUTHOR=`darcs changes --last=1 | head -n 1 | cut -d ' ' -f 8-`
COUNT=`darcs changes --count`
echo $COUNT $HASH $AUTHOR
Building gitit-0.7.3.8...
[ 1 of 19] Compiling Paths_gitit ( dist/build/autogen/Paths_gitit.hs, dist/build/Paths_gitit.o )
[ 2 of 19] Compiling Network.Gitit.Feed ( Network/Gitit/Feed.hs, dist/build/Network/Gitit/Feed.o )
[ 3 of 19] Compiling Network.Gitit.Server ( Network/Gitit/Server.hs, dist/build/Network/Gitit/Server.o )
[ 4 of 19] Compiling Network.Gitit.Types ( Network/Gitit/Types.hs, dist/build/Network/Gitit/Types.o )
Network/Gitit/Types.hs:315:66:
Couldn't match expected type `Either FilePath L.ByteString'
against inferred type `L.ByteString'
In the first argument of `return', namely `L.empty'
[ 12] @darcs turn on BTS email censoring and test roundup bug again :issue1667 ::infrastructure
[ 17] @darcs investigate cause of encoding issues in ::infrastructure :issue1803 https://sourceforge.net/mailarchive/forum.php?thread_name=20100621201605.GE5814%40brighton.ac.uk&forum_name=roundup-users
[ 18] @darcs think about user interface for attaching a message to a bug (for splitting) ::infrastructure
[ 20] @darcs why do we get an error copying msgs from patch to issue ::infrastructure
[ 25] @darcs :dvcs_bench :OUTCOME reliable inter-dvcs (automated?) benchmarking ::infrastructure ::infrastructure
[ 32] @darcs change darcs-benchmark to store timings in CWD ::infrastructure
[ 33] @darcs :issue331 play with licensecheck(1) ::infrastructure
[ 36] @darcs :darcs-copyright draft discussion on CLAs and copyrights ::infrastructure
[ 37] @darcs :darcs-copyright research advantages of license consolidation ::infrastructure
[ 39] @darcs :darcs-hardware :OUTCOME dedicated Mac for darcs benchmarking ::infrastructure
Sun Jun 13 01:02:34 BST 2004 [email protected]
* Avoid unpacking PackedStrings in the printer.
Darcs reads file data into PackedStrings, but unpacks them when
printing out a patch.
The fix is to make the printer able to grok streams of arbitrary
tokens, not just Haskell strings (streams of Char). See the type
class Printer.Printable and the instance Printer.PChar. See also the
type synonim PrintPatch.PrinterType, which is what gets actually used.