[darcs-devel] [issue1228] optionally disable 'Hit return to move on' in --diff-command and --external-merge

noreply bugs at darcs.net
Sat Mar 24 16:52:24 UTC 2012


noreply <noreply at darcs.net> added the comment:

The following patch sent by Michael Hendricks <michael at ndrix.org> updated issue issue1228 with
status=resolved;resolvedin=2.8.0 HEAD

* Resolve issue1228: Add --pause-for-gui to diff, pull and apply 
Ignore-this: 7db469b6753ee4b4be0bdefb6702d6d7

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.

----------
resolvedin:  -> 2.8.0 HEAD
status: has-patch -> resolved

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1228>
__________________________________


More information about the darcs-devel mailing list