3 patches for repository http://darcs.net/screened:

Fri Mar  9 13:16:20 MST 2012  Michael Hendricks <michael@ndrix.org>
  * Style updates for Darcs.Commands.{Apply,Diff,Pull}
  
  The style guide offers no guidelines for long import lists, so I
  decided to follow the export list style.  I added Haddock where
  it seemed to make sense.
  
  I only organized the parts that I plan to touch with a later
  patch.  This keeps the style changes small while still improving
  the code that I was going to change anyway.
  
  I'm keeping this patch separate from the implementation changes
  so that a future 'trackdown' doesn't have to wade through style
  changes that should have no effect on behavior.
  

Sat Mar  3 08:12:30 MST 2012  Michael Hendricks <michael@ndrix.org>
  * Function for asking the user to press Enter
  
  This is just a cleaner replacement for
  
      _ <- askUser "..."
      return ()

Fri Mar  9 14:25:03 MST 2012  Michael Hendricks <michael@ndrix.org>
  * Resolve issue1228: Add --pause-for-gui to diff, pull and apply
  
  When using an external diff tool via '--diff-command' or an
  external merge tool via '--external-merge', the current behavior
  assumes the tool is a GUI which requires darcs to pause (asking
  the user to press Enter) before deleting any temporary files.
  
  This patch leaves the default behavior as described above, but
  provides an option --no-pause-for-gui which skips the "Press
  Enter" prompt.  This option is particularly helpful for external
  diff tools (such as colordiff or wdiff) which produce output
  before exiting.
  
  Because the desired pause behavior is a function of the
  diff/merge tool, this is implemented as a command line option
  (like --diff-command and --external-merge) instead of an
  environment variable. This lets one specify the pause behavior in
  the same way as one specifies the tool.

Attachments

• patch-preview.txt
• style-updates-for-darcs_commands__apply_diff_pull_.dpatch
• unnamed

Michael, looks like your bundle now conflicts with other changes in the
module Darcs.Utils that have been pushed into screened.
Could you submit a new version of the bundle?

3 patches for repository http://darcs.net/screened:

A rebased version of the previous bundle to avoid conflicts
with recent changes to Darcs.Utils

Sat Mar  3 08:12:30 MST 2012  Michael Hendricks <michael@ndrix.org>
  * Function for asking the user to press Enter
  
  This is just a cleaner replacement for
  
      _ <- askUser "..."
      return ()

Fri Mar  9 13:16:20 MST 2012  Michael Hendricks <michael@ndrix.org>
  * Style updates for Darcs.Commands.{Apply,Diff,Pull}
  
  The style guide offers no guidelines for long import lists, so I
  decided to follow the export list style.  I added Haddock where
  it seemed to make sense.
  
  I only organized the parts that I plan to touch with a later
  patch.  This keeps the style changes small while still improving
  the code that I was going to change anyway.
  
  I'm keeping this patch separate from the implementation changes
  so that a future 'trackdown' doesn't have to wade through style
  changes that should have no effect on behavior.
  

Thu Mar 15 12:19:59 MDT 2012  Michael Hendricks <michael@ndrix.org>
  * Resolve issue1228: Add --pause-for-gui to diff, pull and apply
  
  When using an external diff tool via '--diff-command' or an
  external merge tool via '--external-merge', the current behavior
  assumes the tool is a GUI which requires darcs to pause (asking
  the user to press Enter) before deleting any temporary files.
  
  This patch leaves the default behavior as described above, but
  provides an option --no-pause-for-gui which skips the "Press
  Enter" prompt.  This option is particularly helpful for external
  diff tools (such as colordiff or wdiff) which produce output
  before exiting.
  
  Because the desired pause behavior is a function of the
  diff/merge tool, this is implemented as a command line option
  (like --diff-command and --external-merge) instead of an
  environment variable. This lets one specify the pause behavior in
  the same way as one specifies the tool.

Attachments

• function-for-asking-the-user-to-press-enter.dpatch
• patch-preview.txt
• unnamed

The cleanup patches are welcome and --no-pause-for-gui is convenient (I
only tested it with darcs diff, and the code looks good).

Next time, try to put less text into the long description of patches.
These descriptions should rather belong to the message attached with the
bundle you send.