diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+             GNU GENERAL PUBLIC LICENSE
+                Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                     Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+             GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                     NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+              END OF TERMS AND CONDITIONS
+
+     How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhaskell
+import Distribution.Simple
+main = defaultMain
diff --git a/ipatch.cabal b/ipatch.cabal
new file mode 100644
--- /dev/null
+++ b/ipatch.cabal
@@ -0,0 +1,34 @@
+Name:                ipatch
+Version:             0.1
+Synopsis:            interactive patch editor
+Description:
+ ipatch brings the power and convenience of selecting and editing patches in
+ Darcs to those who are not using the Darcs version control system. 
+ .
+ It allows the user to interactively split a patch file into several patch
+ file, as well as applying a patch interactively and possibly partially.
+Homepage:            http://darcs.nomeata.de/ipatch
+License:             GPL-2
+License-file:        LICENSE
+Author:              Joachim Breitner
+Maintainer:          mail@joachim-breitner.de
+Copyright:           2010 Joachim Breitner 
+Stability:           Experimental
+Category:            Development
+Build-type:          Simple
+Cabal-version:       >=1.8
+
+
+Executable ipatch
+  Hs-Source-Dirs:    src/
+  Main-is:           ipatch.hs
+  Build-depends:     darcs-beta (>= 2.4.98.3) 
+                     , base >=3 && <5
+                     , unix, bytestring, filepath, directory
+  Other-modules:     IPatch.Apply
+                     IPatch.DiffFile
+                     IPatch.Split
+                     IPatch.Version
+                     IPatch.Common
+                     IPatch.Help
+                     IPatch.TheCommands 
diff --git a/src/IPatch/Apply.hs b/src/IPatch/Apply.hs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/Apply.hs
@@ -0,0 +1,148 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+{-# LANGUAGE Rank2Types #-}
+module IPatch.Apply where
+
+import Control.Monad ( when )
+import System.Exit ( exitWith, ExitCode(ExitSuccess) )
+
+import Darcs.Commands
+    ( DarcsCommand(DarcsCommand, commandAdvancedOptions,
+                   commandArgdefaults, commandBasicOptions, commandCommand,
+                   commandDescription, commandExtraArgHelp, commandExtraArgs,
+                   commandGetArgPossibilities, commandHelp, commandName,
+                   commandPrereq) )
+import Darcs.Arguments ( DarcsFlag, fixFilePathOrStd, listFiles )
+import Darcs.Repository
+    ( amNotInRepository, applyToWorking, withRepoLock )
+import Darcs.RepoPath ( FilePathLike(..) )
+import Darcs.Patch ( Effect(effect) )
+import Workaround ( getCurrentDirectory )
+import Darcs.Global ( debugMessage )
+import Darcs.Utils ( promptYorn )
+import Darcs.SelectChanges
+    ( WhichChanges(First),
+      runSelection,
+      selectChanges,
+      selectionContextPrim )
+import Darcs.Patch.Split ( primSplitter )
+import Darcs.Witnesses.Ordered ( (:>)(..), nullFL )
+
+import IPatch.Common
+    ( diffToPrims,
+      initializeBaseState,
+      withTempRepository,
+      stdindefault,
+      clonePathsWithDeletion )
+import IPatch.DiffFile ( filesTouchedByDiff, readDiffFile )
+
+applyHelp :: String
+applyHelp =
+    "The `ipatch apply file.patch' command works similar to a `patch file.patch' command.\n" ++
+    "It will, however, prompt the user about each part of the patch, whether it should\n" ++
+    "be applied or not. Using the integrated hunk editor, the user has full control over\n" ++
+    "the chosen changes.\n"++
+    "\n"++
+    "No files are touched until the end, when the user is asked for a final confirmation.\n"
+
+applyDescription :: String
+applyDescription = "Apply a diff file interactively."
+
+apply :: DarcsCommand
+apply = DarcsCommand {commandName = "apply",
+                      commandHelp = applyHelp,
+                      commandDescription = applyDescription,
+                      commandExtraArgs = 1,
+                      commandExtraArgHelp = ["<PATCHFILE>"],
+                      commandCommand = applyCmd,
+                      commandPrereq = amNotInRepository,
+                      commandGetArgPossibilities = listFiles,
+                      commandArgdefaults = const stdindefault,
+                      commandAdvancedOptions = [],
+                      commandBasicOptions = []}
+
+applyCmd :: [DarcsFlag] -> [String] -> IO ()
+applyCmd _ [""] = fail "Empty filename argument given to apply!"
+applyCmd opts [unfixed_patchesfile] = do
+    maindir <- getCurrentDirectory
+    patchesfile <- fixFilePathOrStd opts unfixed_patchesfile
+    diffPS <- readDiffFile patchesfile
+    files <- filesTouchedByDiff diffPS
+    if null files
+      then putStrLn "Patch seems to be empty"
+      else withTempRepository "work" $ \rdir -> do
+        initializeBaseState rdir maindir files
+
+        patch_ps <- diffToPrims diffPS
+
+        -- Ask the user which parts of the patch to apply
+        let context = selectionContextPrim "apply" [] (Just primSplitter) []
+        let selector = selectChanges First patch_ps
+        (wanted_ps :> _) <- runSelection selector context
+
+        when (nullFL patch_ps) $ do
+            putStrLn "You selected nothing, so I'm exiting!"
+            exitWith ExitSuccess
+        debugMessage $ "Applying selected patches"
+        withRepoLock [] $ \repo -> do
+            {- wanted_patch <- namepatch "NODATE" "Chosen Patch" "NOAUTHOR" [] (fromPrims wanted_ps)
+            tentativelyAddPatch repo [] $ n2pia wanted_patch
+            invalidateIndex repo
+            withGutsOf repo (finalizeRepositoryChanges repo)
+                        `clarifyErrors` "Failed to apply inital patch"
+            -}
+            applyToWorking repo opts (effect wanted_ps) `catch` \e ->
+                    fail ("Error applying patch to working dir:\n" ++ show e)
+      
+            yorn <- promptYorn "Really apply the selected changes?"
+            when (yorn == 'y') $ do
+                clonePathsWithDeletion (toFilePath rdir) maindir files
+
+        {-
+        debugMessage $ "Printing selected parts"
+        withTempDir "ipatch-repo-old" $ \opath -> do
+          withTempDir "ipatch-repo-new" $ \npath -> do
+            setCurrentDirectory (toFilePath rdir)
+
+            debugMessage $ "Write out patched state"
+            withRepoLock (testByDefault []) $ \repo -> do
+                n <- slurp_recorded repo
+                withCurrentDirectory npath $ writeSlurpy n "."
+
+            withRepoLock (testByDefault []) $ \repo -> do
+                debugMessage $ "Return to unpatched state"
+                withGutsOf repo $ do
+                    -- How to wrap wanted_patch in FL wanted_patch?
+                    (_ :> top_patch) <- splitAtFL 1 . patchSetToPatches  <$> read_repo repo
+                    tentativelyRemovePatches repo [] top_patch
+                    tentativelyAddToPending repo [] $ invert $ effect top_patch
+                    finalizeRepositoryChanges repo
+                    applyToWorking repo [] (invert wanted_ps) `catch`
+                        \e -> fail ("Couldn't undo patch in working dir.\n" ++ show e)
+
+            debugMessage $ "Write out unpatched state"
+            withRepoLock (testByDefault []) $ \repo -> do
+                o <- slurp_recorded repo
+                withCurrentDirectory opath $ writeSlurpy o "."
+
+            output <- execPipeIgnoreError "diff" ["-u","-r",toFilePath opath,toFilePath npath] empty
+            putDoc output
+        -}
+
+        return ()
diff --git a/src/IPatch/Common.hs b/src/IPatch/Common.hs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/Common.hs
@@ -0,0 +1,115 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+{-# LANGUAGE Rank2Types #-}
+module IPatch.Common where
+
+import Control.Applicative ( (<$>) )
+import Control.Monad (when)
+import System.Posix.Files ( getSymbolicLinkStatus, isRegularFile, isDirectory )
+import System.Directory ( createDirectoryIfMissing, doesFileExist, removeFile )
+import System.FilePath.Posix ( (</>), takeDirectory, normalise )
+
+import Darcs.Arguments ( DarcsFlag(LookForAdds) )
+import Darcs.Repository
+    ( createRepository,
+      applyToWorking,
+      finalizeRepositoryChanges,
+      tentativelyAddPatch,
+      withGutsOf,
+      withRepoLock,
+      invalidateIndex,
+      unrecordedChanges )
+import Darcs.Flags ( Compression(..) )
+import Darcs.RepoPath ( AbsolutePath, FilePathLike(..) )
+import Darcs.External ( cloneFile )
+import Darcs.Lock ( withTempDir )
+import Darcs.Patch ( invert, fromPrims, namepatch )
+import Darcs.Global ( debugMessage )
+import Darcs.Hopefully ( n2pia )
+import Darcs.Utils ( clarifyErrors )
+
+import IPatch.DiffFile ( applyDiff )
+
+clonePathWithDeletion :: FilePath -> FilePath -> FilePath -> IO ()
+clonePathWithDeletion source dest path = do
+    let source' = source </> path
+        dest' = dest </> path
+    ex <- doesFileExist source'
+    if ex
+     then do
+        fs <- getSymbolicLinkStatus source'
+        if isDirectory fs
+         then do
+            createDirectoryIfMissing True dest'
+         else
+            if isRegularFile fs
+             then do
+                createDirectoryIfMissing True (dest </> takeDirectory path)
+                cloneFile source' dest'
+             else
+                fail ("clonePathWithDeletion: Bad file " ++ source')
+     else do
+        exT <- doesFileExist dest'
+        when exT $ removeFile dest'
+   `catch` fail ("clonePathWithDeletion: Bad file " ++ source </> path)
+
+clonePathsWithDeletion source dest = mapM_ (clonePathWithDeletion source dest)
+
+
+withTempRepository :: String -> (AbsolutePath -> IO a) -> IO a
+withTempRepository name job =
+    withTempDir ("ipatch-repo-" ++ name) $ \rdir -> do
+        debugMessage $ "Creating temporary repository in directory " ++ show rdir
+        createRepository []
+        job rdir
+
+initializeBaseState rdir sdir files = do
+    debugMessage $ "Copying " ++ show (length files) ++ " files to temporary repository."  
+    clonePathsWithDeletion sdir (toFilePath rdir) files
+    -- Create a patch from the newly added files
+    debugMessage $ "Creating initial check  in patch"
+    withRepoLock [LookForAdds] $ \repo -> do
+        init_ps <- unrecordedChanges [LookForAdds] repo [] -- Correct flags?
+        init_patch <- n2pia <$> namepatch "NODATE" "Initial state" "NOAUTHOR" [] (fromPrims init_ps)
+        tentativelyAddPatch repo [] init_patch
+        invalidateIndex repo
+        withGutsOf repo (finalizeRepositoryChanges repo)
+            `clarifyErrors` "Failed to apply inital patch"
+        return init_ps
+
+
+diffToPrims diff = do
+    debugMessage $ "Applying the user provided diff"
+    -- Now apply the patch
+    applyDiff diff
+
+    debugMessage $ "Creating a patch from the user changes"
+    withRepoLock [LookForAdds] $ \repo -> do
+        -- Create another patch from the changed files
+        patch_ps <- unrecordedChanges [LookForAdds] repo []
+        -- patch_patch <- n2pia <$> namepatch date "Patch effect" author [] (fromPrims patch_ps)
+        -- tentativelyAddPatch repo [] patch_patch
+        -- Now we obliterate the patch, undoing its effects
+        applyToWorking repo [] (invert patch_ps) `catch` \e ->
+            fail ("Couldn't undo diff effect in working dir.\n" ++ show e)
+        return patch_ps
+      
+stdindefault :: a -> [String] -> IO [String]
+stdindefault _ [] = return ["-"]
+stdindefault _ x = return x
diff --git a/src/IPatch/DiffFile.hs b/src/IPatch/DiffFile.hs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/DiffFile.hs
@@ -0,0 +1,46 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+{-# LANGUAGE Rank2Types #-}
+module IPatch.DiffFile where
+
+
+import qualified Data.ByteString as B
+    ( ByteString, null, hGetContents, readFile )
+import qualified Data.ByteString.Char8 as BC ( unpack )
+import System.IO ( stdin )
+import Control.Applicative ( (<$>) )
+import Darcs.RepoPath ( FilePathLike(..), useAbsoluteOrStd )
+import Darcs.External ( execDocPipe )
+import Printer ( packedString, renderPS )
+import ByteStringUtils ( linesPS )
+
+newtype DiffFile = DiffFile B.ByteString
+
+readDiffFile = fmap DiffFile . useAbsoluteOrStd (B.readFile . toFilePath) (B.hGetContents stdin) 
+
+filesTouchedByDiff (DiffFile bs) = map BC.unpack . filter (not . B.null) . linesPS <$> execPSPipe "diffstat" ["-l","-p1"] bs
+
+applyDiff (DiffFile bs) = execPSPipe "patch" ["-r","-","-p1"] bs
+
+
+execPSPipe :: String -> [String] -> B.ByteString -> IO B.ByteString
+execPSPipe c args ps = fmap renderPS
+                     $ execDocPipe c args
+                     $ packedString ps
+
diff --git a/src/IPatch/Help.lhs b/src/IPatch/Help.lhs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/Help.lhs
@@ -0,0 +1,307 @@
+%  Copyright (C) 2002-2004 David Roundy
+%  Copyright (C) 2010 Joachim Breitner
+%
+%  This program is free software; you can redistribute it and/or modify
+%  it under the terms of the GNU General Public License as published by
+%  the Free Software Foundation; either version 2, or (at your option)
+%  any later version.
+%
+%  This program is distributed in the hope that it will be useful,
+%  but WITHOUT ANY WARRANTY; without even the implied warranty of
+%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%  GNU General Public License for more details.
+%
+%  You should have received a copy of the GNU General Public License
+%  along with this program; see the file COPYING.  If not, write to
+%  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+%  Boston, MA 02110-1301, USA.
+
+\darcsCommand{help}
+\begin{code}
+module IPatch.Help (
+ helpCmd,
+ commandControlList, environmentHelp,          -- these are for preproc.hs
+ printVersion,
+ listAvailableCommands ) where
+
+import Darcs.Arguments
+    ( DarcsFlag(..), environmentHelpEmail, environmentHelpSendmail )
+import Darcs.Commands
+    ( CommandArgs(..),
+      CommandControl(..),
+      DarcsCommand(..),
+      disambiguateCommands,
+      extractCommands,
+      getCommandHelp, -- This still prints "darcs", need to revise API here.
+      nodefaults,
+      usageHelper )
+import Darcs.External ( viewDoc )
+import Darcs.Lock
+    ( environmentHelpTmpdir, environmentHelpKeepTmpdir )
+import Darcs.Repository.Prefs
+    ( binariesFileHelp, environmentHelpHome )
+import Darcs.Utils
+    ( withCurrentDirectory,
+      environmentHelpEditor,
+      environmentHelpPager )
+import Data.Char ( isAlphaNum, toLower )
+import Data.List ( groupBy )
+import English ( andClauses )
+import Printer ( text )
+import Ssh
+    ( environmentHelpSsh, environmentHelpScp, environmentHelpSshPort )
+import System.Exit ( ExitCode(..), exitWith )
+import URL ( environmentHelpProxy, environmentHelpProxyPassword )
+import Workaround ( getCurrentDirectory )
+
+import IPatch.Version ( version )
+import qualified IPatch.TheCommands as TheCommands ( commandControlList )
+
+helpDescription :: String
+helpDescription = "Display help about ipatch and ipatch commands."
+
+helpHelp :: String
+helpHelp =
+ "Without arguments, `ipatch help' prints a categorized list of ipatch\n" ++
+ "commands and a short description of each one.  With an extra argument,\n" ++
+ "`ipatch help foo' prints detailed help about the ipatch command foo.\n"
+
+help :: DarcsCommand
+help = DarcsCommand {commandName = "help",
+                     commandHelp = helpHelp,
+                     commandDescription = helpDescription,
+                     commandExtraArgs = -1,
+                     --commandExtraArgHelp = ["[<DARCS_COMMAND> [DARCS_SUBCOMMAND]]  "],
+                     commandExtraArgHelp = ["[<IPATCH_COMMAND>]  "],
+                     commandCommand = \ x y -> helpCmd x y >> exitWith ExitSuccess,
+                     commandPrereq = \_ -> return $ Right (),
+                     commandGetArgPossibilities = return [],
+                     commandArgdefaults = nodefaults,
+                     commandAdvancedOptions = [],
+                     commandBasicOptions = []}
+
+usage :: [CommandControl] -> String
+usage cs = "Usage: ipatch COMMAND ...\n\nCommands:\n" ++
+           usageHelper cs ++ "\n" ++
+           "Use 'ipatch COMMAND --help' for help on a single command.\n" ++
+           "Use 'ipatch --version' to see the ipatch version number.\n"
+           -- "Use 'ipatch --exact-version' to get the exact version of this ipatch instance.\n"
+           -- "Use 'ipatch help environment' for help on environment variables.\n" ++
+           --"\n" ++
+           --"Check bug reports at http://bugs.darcs.net/\n"
+
+
+helpCmd :: [DarcsFlag] -> [String] -> IO ()
+helpCmd _ ["manpage"] = putStr $ unlines manpageLines
+-- helpCmd _ ["environment"] = viewDoc $ text $ helpOnEnvironment
+helpCmd _ [] = viewDoc $ text $ usage commandControlList
+
+helpCmd _ (cmd:args) =
+    let disambiguated = disambiguateCommands commandControlList cmd args
+    in case disambiguated of
+         Left err -> fail err
+         Right (cmds,_) ->
+             let msg = case cmds of
+                         CommandOnly c       -> getCommandHelp Nothing  c
+                         SuperCommandOnly c  -> getCommandHelp Nothing  c
+                         SuperCommandSub c s -> getCommandHelp (Just c) s
+             in viewDoc $ text msg
+
+listAvailableCommands :: IO ()
+listAvailableCommands =
+    do here <- getCurrentDirectory
+       is_valid <- mapM
+                   (\c-> withCurrentDirectory here $ (commandPrereq c) [])
+                   (extractCommands commandControlList)
+       putStr $ unlines $ map (commandName . fst) $
+                filter (isRight.snd) $
+                zip (extractCommands commandControlList) is_valid
+       putStrLn "--help"
+       putStrLn "--version"
+       -- putStrLn "--exact-version"
+       -- putStrLn "--overview"
+    where isRight (Right _) = True
+          isRight _ = False
+
+printVersion :: IO ()
+printVersion = putStrLn $ "ipatch version " ++ version
+
+-- avoiding a module import cycle between Help and TheCommands
+commandControlList :: [CommandControl]
+commandControlList =
+  CommandData help : TheCommands.commandControlList
+
+-- FIXME: the "grouping" comments below should made subsections in the
+-- manpage, as we already do for DarcsCommand groups. --twb, 2009
+
+-- | Help on each environment variable in which Darcs is interested.
+environmentHelp :: [([String], [String])]
+environmentHelp = []
+{-
+ -- General-purpose
+ environmentHelpHome,
+ environmentHelpEditor,
+ environmentHelpPager,
+ environmentHelpTmpdir,
+ environmentHelpKeepTmpdir,
+ environmentHelpEmail,
+ environmentHelpSendmail,
+ -- Remote Repositories
+ environmentHelpSsh,
+ environmentHelpScp,
+ environmentHelpSshPort,
+ environmentHelpProxy,
+ environmentHelpProxyPassword]
+-}
+
+-- | The rendered form of the data in 'environment_help'.
+helpOnEnvironment :: String
+helpOnEnvironment =
+    "Environment Variables\n" ++
+    "=====================\n\n" ++
+    unlines [andClauses ks ++ ":\n" ++
+                     (unlines $ map ("  " ++) ds)
+                     | (ks, ds) <- environmentHelp]
+
+-- | This module is responsible for emitting a ipatch "man-page", a
+-- reference document used widely on Unix-like systems.  Manpages are
+-- primarily used as a quick reference, or "memory jogger", so the
+-- output should be terser than the user manual.
+--
+-- Before modifying the output, please be sure to read the man(7) and
+-- man-pages(7) manpages, as these respectively describe the relevant
+-- syntax and conventions.
+
+-- | The lines of the manpage to be printed.
+manpageLines :: [String]
+manpageLines = [
+ ".TH DARCS 1 \"" ++ version ++ "\"",
+ ".SH NAME",
+ "ipatch \\- an advanced revision control system",
+ ".SH SYNOPSIS",
+ ".B ipatch", ".I command", ".RI < arguments |[ options ]>...",
+ "",
+ "Where the", ".I commands", "and their respective", ".I arguments", "are",
+ "",
+ unlines synopsis,
+ ".SH DESCRIPTION",
+ -- FIXME: this is copy-and-pasted from ipatch.cabal, so
+ -- it'll get out of date as people forget to maintain
+ -- both in sync.
+ "ipatch is a free, open source revision control",
+ "system. It is:",
+ ".TP 3", "\\(bu",
+ "Distributed: Every user has access to the full",
+ "command set, removing boundaries between server and",
+ "client or committer and non\\(hycommitters.",
+ ".TP", "\\(bu",
+ "Interactive: ipatch 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 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.",
+ ".TP", "\\(bu",
+ "Smart: ipatch is based on a unique algebra of patches, ",
+ "Originally developed by physicist David Roundy",
+ ".SH OPTIONS",
+ "Different options are accepted by different ipatch commands.",
+ "Each command's most important options are listed in the",
+ ".B COMMANDS",
+ "section.  For a full list of all options accepted by",
+ "a particular command, run `ipatch", ".I command", "\\-\\-help'.",
+ ".SH COMMANDS",
+ unlines commands,
+ unlines environment,
+ {-
+ ".SH BUGS",
+ "At http://bugs.darcs.net/ you can find a list of known",
+ "bugs in ipatch.  Unknown bugs can be reported at that",
+ "site (after creating an account) or by emailing the",
+ "report to bugs@darcs.net.",
+ -}
+ -- ".SH EXAMPLE",
+ -- FIXME:
+ -- new project: init, rec -la;
+ -- track upstream project: get, pull -a;
+ -- contribute to project: add, rec, push/send.
+ ".SH SEE ALSO"
+ {-"A user manual is included with ipatch, in PDF and HTML",
+ "form.  It can also be found at http://darcs.net/manual/."
+ -}
+ ]
+    where
+      -- | A synopsis line for each command.  Uses 'foldl' because it is
+      -- necessary to avoid blank lines from Hidden_commands, as groff
+      -- translates them into annoying vertical padding (unlike TeX).
+      synopsis :: [String]
+      synopsis = foldl iter [] commandControlList
+          where iter :: [String] -> CommandControl -> [String]
+                iter acc (GroupName _) = acc
+                iter acc (HiddenCommand _) = acc
+                iter acc (CommandData c@SuperCommand {}) =
+                    acc ++ concatMap
+                            (render (commandName c ++ " "))
+                            (extractCommands (commandSubCommands c))
+                iter acc (CommandData c) = acc ++ render "" c
+                render :: String -> DarcsCommand -> [String]
+                render prefix c =
+                    [".B ipatch " ++ prefix ++ commandName c] ++
+                    (map mangle_args $ commandExtraArgHelp c) ++
+                    -- In the output, we want each command to be on its own
+                    -- line, but we don't want blank lines between them.
+                    -- AFAICT this can only be achieved with the .br
+                    -- directive, which is probably a GNUism.
+                    [".br"]
+
+      -- | As 'synopsis', but make each group a subsection (.SS), and
+      -- include the help text for each command.
+      commands :: [String]
+      commands = foldl iter [] commandControlList
+          where iter :: [String] -> CommandControl -> [String]
+                iter acc (GroupName x) = acc ++ [".SS \"" ++ x ++ "\""]
+                iter acc (HiddenCommand _) = acc
+                iter acc (CommandData c@SuperCommand {}) =
+                    acc ++ concatMap
+                            (render (commandName c ++ " "))
+                            (extractCommands (commandSubCommands c))
+                iter acc (CommandData c) = acc ++ render "" c
+                render :: String -> DarcsCommand -> [String]
+                render prefix c =
+                    [".B ipatch " ++ prefix ++ commandName c] ++
+                    (map mangle_args $ commandExtraArgHelp c) ++
+                    [".RS 4", escape $ commandHelp c, ".RE"]
+
+      -- | Now I'm showing off: mangle the extra arguments of Darcs commands
+      -- so as to use the ideal format for manpages, italic words and roman
+      -- punctuation.
+      mangle_args :: String -> String
+      mangle_args s =
+          ".RI " ++ (unwords $ map show (groupBy cmp $ map toLower $ gank s))
+              where cmp x y = not $ xor (isAlphaNum x) (isAlphaNum y)
+                    xor x y = (x && not y) || (y && not x)
+                    gank (' ':'o':'r':' ':xs) = '|' : gank xs
+                    gank (x:xs) = x : gank xs
+                    gank [] = []
+
+      environment :: [String]
+      environment = ".SH ENVIRONMENT" : concat
+                    [(".SS \"" ++ andClauses ks ++ "\"") : map escape ds
+                     | (ks, ds) <- environmentHelp]
+
+      -- | Copied from Preproc.escape_latex_specials.
+      escape :: String -> String
+      escape = minus . bs       -- Order is important
+        where
+          minus      = replace "-"     "\\-"
+          bs         = replace "\\"    "\\\\"
+
+          replace :: Eq a => [a] -> [a] -> [a] -> [a]
+          replace _ _ [] = []
+          replace find repl s =
+              if take (length find) s == find
+                  then repl ++ (replace find repl (drop (length find) s))
+                  else [head s] ++ replace find repl (tail s)
+
+\end{code}
diff --git a/src/IPatch/Split.hs b/src/IPatch/Split.hs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/Split.hs
@@ -0,0 +1,150 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+{-# LANGUAGE Rank2Types #-}
+module IPatch.Split where
+
+import qualified Data.ByteString as B ( writeFile )
+import Control.Applicative ( (<$>) )
+import System.Directory ( createDirectory )
+import Control.Monad ( when )
+import Control.Monad.Fix ( fix )
+import System.Exit ( exitWith, ExitCode(ExitSuccess) )
+import System.FilePath ( (</>) )
+
+import Darcs.Commands
+    ( DarcsCommand(DarcsCommand, commandAdvancedOptions,
+                   commandArgdefaults, commandBasicOptions, commandCommand,
+                   commandDescription, commandExtraArgHelp, commandExtraArgs,
+                   commandGetArgPossibilities, commandHelp, commandName,
+                   commandPrereq) )
+import Darcs.Arguments ( DarcsFlag, fixFilePathOrStd, listFiles )
+import Darcs.Repository ( amNotInRepository )
+import Darcs.External ( execPipeIgnoreError )
+import Darcs.Lock ( withTempDir )
+import Darcs.Patch ( Prim, apply )
+import Printer ( empty, renderPS )
+import Workaround ( getCurrentDirectory )
+import Darcs.Global ( debugMessage )
+import Darcs.Utils ( askUser, promptYorn )
+import Darcs.Utils ( withCurrentDirectory )
+import Darcs.SelectChanges
+    ( WhichChanges(First),
+      runSelection,
+      selectChanges,
+      selectionContextPrim )
+import Darcs.Patch.Split ( primSplitter )
+import Darcs.Witnesses.Ordered ( FL, (:>)(..), nullFL )
+
+import IPatch.Common
+    ( withTempRepository,
+      initializeBaseState,
+      diffToPrims,
+      stdindefault )
+import IPatch.DiffFile ( readDiffFile, filesTouchedByDiff )
+
+splitHelp :: String
+splitHelp =
+    "The `ipatch split file.patch' lets the user select different parts (hunks) of the\n" ++
+    "given patch file. After making a choice for each hunk, the user has to provide a\n" ++
+    "file name where the selected changes are stored. This procedure is repeated until\n" ++
+    "each change in the original file has been selected for one output file.\n" ++
+    "\n"++
+    "No files are modified by this command. The output patch files are all written at the\n" ++
+    "of the process.\n"
+
+
+splitDescription :: String
+splitDescription = "Split a diff file interactively."
+
+split :: DarcsCommand
+split = DarcsCommand {commandName = "split",
+                      commandHelp = splitHelp,
+                      commandDescription = splitDescription,
+                      commandExtraArgs = 1,
+                      commandExtraArgHelp = ["<PATCHFILE>"],
+                      commandCommand = splitCmd,
+                      commandPrereq = amNotInRepository,
+                      commandGetArgPossibilities = listFiles,
+                      commandArgdefaults = const stdindefault,
+                      commandAdvancedOptions = [],
+                      commandBasicOptions = []}
+
+splitCmd :: [DarcsFlag] -> [String] -> IO ()
+splitCmd _ [""] = fail "Empty filename argument given to split!"
+splitCmd opts [unfixed_patchesfile] = do
+    maindir <- getCurrentDirectory
+    patchesfile <- fixFilePathOrStd opts unfixed_patchesfile
+    diffPS <- readDiffFile patchesfile
+    files <- filesTouchedByDiff diffPS
+    if null files
+      then putStrLn "Patch seems to be empty"
+      else withTempRepository "work" $ \rdir -> do
+        init_ps <- initializeBaseState rdir maindir files
+        patch_ps <- diffToPrims diffPS
+
+        let run :: (FL Prim -> Int -> IO [(FL Prim,String)]) ->
+                   (FL Prim -> Int -> IO [(FL Prim,String)])
+            run repeat remaining_ps n = if nullFL remaining_ps then return [] else do
+                putStrLn $ "Please select the changes for the " ++ ordinal n ++ " patch"
+                --putStrLn $ "To choose " ++ show remaining_ps
+                let context = selectionContextPrim "split" [] (Just primSplitter) []
+                let selector = selectChanges First remaining_ps
+                (chosen_ps :> remaining_ps') <- runSelection selector context
+                {- we need to force chosen_ps before accessing remaining_ps',
+                 - see pull_only_firsts in ./Darcs/Patch/Choices.hs. There is a reason
+                 - why unsafeReadIO is called unsafe...-}
+                --length (show chosen_ps) `seq` return ()
+                --length (show remaining_ps') `seq` return ()
+                if (nullFL chosen_ps) 
+                  then do
+                    yorn <- promptYorn "You selected nothing. Do you want to abort?"
+                    when (yorn == 'y') $ do
+                        exitWith ExitSuccess
+                    repeat remaining_ps n
+                  else do
+                    filename <- askUser $ "Please enter filename for the " ++ ordinal n ++ " patch: "
+                    --putStrLn $ "Chosen " ++ show chosen_ps
+                    --putStrLn $ "Left " ++ show remaining_ps'
+                    ((chosen_ps,filename) :) <$> repeat remaining_ps' (succ n)
+
+        chunks <- fix run patch_ps 1
+
+        when (null chunks) $ do
+            putStrLn "No patched splitted, exiting."
+            exitWith ExitSuccess
+
+        withTempDir "ipatch-diff-area" $ \bpath -> do
+            debugMessage "Setting up old and new staging areas"
+            createDirectory "old" -- Find nicer names based on original directory name
+            createDirectory "new"
+
+            withCurrentDirectory "new" $ apply [] init_ps 
+            let applyAndDiff last next name = do
+                withCurrentDirectory "old" $ apply [] last
+                withCurrentDirectory "new" $ apply [] next
+                output <- renderPS <$> execPipeIgnoreError "diff" ["-Nur","old","new"] empty
+                putStrLn $ "Writing File " ++ name ++ " .."
+                B.writeFile (maindir </> name) output
+            sequence_ $ zipWith3 applyAndDiff (init_ps : map fst chunks) (map fst chunks) (map snd chunks)
+
+
+ordinal 1 = "first"
+ordinal 2 = "second"
+ordinal 3 = "third"
+ordinal n = show n ++ "th"
diff --git a/src/IPatch/TheCommands.hs b/src/IPatch/TheCommands.hs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/TheCommands.hs
@@ -0,0 +1,33 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+module IPatch.TheCommands where
+
+import Darcs.Commands ( CommandControl(CommandData, GroupName) )
+
+import IPatch.Apply ( apply )
+import IPatch.Split ( split )
+
+commandControlList :: [CommandControl]
+commandControlList =
+    [ GroupName "Changing files"
+    , CommandData apply
+    , GroupName "Changing patches"
+    , CommandData split
+    ]
+
diff --git a/src/IPatch/Version.hs b/src/IPatch/Version.hs
new file mode 100644
--- /dev/null
+++ b/src/IPatch/Version.hs
@@ -0,0 +1,25 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+module IPatch.Version (version) where
+
+import Data.Version
+
+import qualified Paths_ipatch
+
+version = showVersion Paths_ipatch.version
diff --git a/src/ipatch.hs b/src/ipatch.hs
new file mode 100644
--- /dev/null
+++ b/src/ipatch.hs
@@ -0,0 +1,46 @@
+{-
+ - Copyright (C) 2010 Joachim Breitner
+ - 
+ - This program is free software; you can redistribute it and/or modify
+ - it under the terms of the GNU General Public License as published by
+ - the Free Software Foundation; either version 2, or (at your option)
+ - any later version.
+ - 
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU General Public License for more details.
+ - 
+ - You should have received a copy of the GNU General Public License
+ - along with this program; see the file COPYING.  If not, write to
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+
+import System.Environment ( getArgs )
+import System.IO ( hSetBinaryMode, stdin, stdout )
+
+import Darcs.Flags ( DarcsFlag(Verbose) )
+import Darcs.RunCommand ( runTheCommand )
+
+import IPatch.Version ( version )
+import IPatch.Help
+    ( commandControlList,
+      helpCmd,
+      listAvailableCommands,
+      printVersion )
+
+main = do
+  argv <- getArgs
+  case argv of
+    []                  -> printVersion >> helpCmd [] []
+    ["-h"]              -> helpCmd [] []
+    ["--help"]          -> helpCmd [] []
+    ["--overview"]      -> helpCmd [Verbose] []
+    ["--commands"]      -> listAvailableCommands
+    ["-v"]              -> putStrLn version
+    ["--version"]       -> putStrLn version
+    _ -> do
+      hSetBinaryMode stdin True
+      hSetBinaryMode stdout True
+      runTheCommand commandControlList (head argv) (tail argv)
