Hi Tommy,
Here are the patches as requested. Note that I didn't actually put the mental
effort into trying to do this automatically, so you might want to have a look
just to make sure. The patches are slightly different.
Sat Mar 10 07:11:24 CET 2007 Eric Kow <[EMAIL PROTECTED]>
* Rename --disable-ssh-cm to --no-ssh-cm.
This appears to be more consistent with other darcs flags.
Sat Mar 10 07:31:32 CET 2007 Eric Kow <[EMAIL PROTECTED]>
* Add a --ssh-cm flag with --no-ssh-cm as the default.
Previously, darcs would launch the ControlMaster by default, but it seems to
hang on some large repositories and cause pain. The user can always add
--ssh-cm if s/he wants it on.
Sat Mar 10 07:33:27 CET 2007 Eric Kow <[EMAIL PROTECTED]>
* Flip ssh test to accept a --ssh-cm argument.
New patches:
[Rename --disable-ssh-cm to --no-ssh-cm.
Eric Kow <[EMAIL PROTECTED]>**20070310061124
This appears to be more consistent with other darcs flags.
]
<
> {
hunk ./DarcsArguments.lhs 1086
\end{code}
\begin{options}
---disable-ssh-cm
+--no-ssh-cm
\end{options}
For commands which invoke ssh, darcs will normally multiplex ssh
replace ./DarcsArguments.lhs [A-Za-z_0-9] DisableSSHControlMaster NoSSHControlMaster
replace ./DarcsArguments.lhs [A-Za-z_0-9\-\.] disable-ssh-cm no-ssh-cm
replace ./DarcsCommands.lhs [A-Za-z_0-9] DisableSSHControlMaster NoSSHControlMaster
replace ./DarcsFlags.lhs [A-Za-z_0-9] DisableSSHControlMaster NoSSHControlMaster
}
[Add a --ssh-cm flag with --no-ssh-cm as the default.
Eric Kow <[EMAIL PROTECTED]>**20070310063132
Previously, darcs would launch the ControlMaster by default, but it seems to
hang on some large repositories and cause pain. The user can always add
--ssh-cm if s/he wants it on.
]
<
> {
replace ./Changes.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
hunk ./DarcsArguments.lhs 1086
\end{code}
\begin{options}
---no-ssh-cm
+--ssh-cm, --no-ssh-cm
\end{options}
For commands which invoke ssh, darcs will normally multiplex ssh
hunk ./DarcsArguments.lhs 1096
supports it.
\begin{code}
disable_ssh_cm :: DarcsOption
-disable_ssh_cm = DarcsNoArgOption [] ["no-ssh-cm"] NoSSHControlMaster
- "Disable use of SSH ControlMaster feature"
+disable_ssh_cm = DarcsMultipleChoiceOption
+ [DarcsNoArgOption [] ["no-ssh-cm"] NoSSHControlMaster
+ "Do not use SSH ControlMaster feature. [DEFAULT]",
+ DarcsNoArgOption [] ["ssh-cm"] SSHControlMaster
+ "Use SSH ControlMaster feature."]
\end{code}
\begin{options}
--umask
replace ./DarcsArguments.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
hunk ./DarcsCommands.lhs 37
loggers,
) where
import System.Console.GetOpt
-import Monad ( liftM, when )
+import Monad ( liftM, when, unless )
import List ( sort )
import Control.Exception ( catch, throwIO, Exception ( ExitException ) )
import System.Exit ( ExitCode ( ExitSuccess ), exitWith )
hunk ./DarcsCommands.lhs 322
runWithPostHook os ex =
do here <- getCurrentDirectory
-- set any global variables
- when (NoSSHControlMaster `elem` os) setSshControlMasterDisabled
+ unless (SSHControlMaster `elem` os) setSshControlMasterDisabled
-- actually run the command and its posthooks
(command_command cmd) (FixFilePath fix_path : os) ex
`Control.Exception.catch`
hunk ./DarcsFlags.lhs 45
| Sign | SignAs String | NoSign | SignSSL String
| HappyForwarding
| Verify String | VerifySSL String
- | NoSSHControlMaster
+ | SSHControlMaster | NoSSHControlMaster
| EditDescription | NoEditDescription
| Toks String
| EditLongComment | NoEditLongComment | PromptLongComment
replace ./Get.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
replace ./Pull.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
replace ./Push.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
replace ./Put.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
replace ./Send.lhs [A-Za-z_0-9] disable_ssh_cm ssh_cm
}
[Flip ssh test to accept a --ssh-cm argument.
Eric Kow <[EMAIL PROTECTED]>**20070310063327]
<
> {
hunk ./tests/ssh.sh 16
export DARCS_SFTP=psftp
fi
-if [ x"${NO_CONTROL_MASTER}" != x ]; then
- export DARCS_SSH_FLAGS="--disable-ssh-cm"
+if [ x"${USE_CONTROL_MASTER}" != x ]; then
+ DARCS_SSH_FLAGS="--ssh-cm"
+ export DARCS_SSH_FLAGS
fi
if [ x"${DARCS_SSH}" = x ]; then
}
Context:
[Use LaTeX for ISO 8601 hyperlink.
Eric Kow <[EMAIL PROTECTED]>**20070217071601]
[Documentation only: add link for ISO 8601 format
Kirsten Chevalier <[EMAIL PROTECTED]>**20070216004007
In the documentation, make "ISO 8601 format" a link to the official
W3C page describing the format (for those who don't know it by heart).
]
[fix bugs in replace.sh script--running wrong darcs.
David Roundy <[EMAIL PROTECTED]>**20070128001826]
[add documentation for DARCS_PAGER
Benedikt Schmidt <[EMAIL PROTECTED]>**20070126142649]
[Fix issue383 - allow --disable-ssh-cm for 'darcs changes'.
Georg Neis <[EMAIL PROTECTED]>**20070121224417]
[Canonize Marco Túlio Gontijo e Silva.
Eric Kow <[EMAIL PROTECTED]>**20070113231736
Sorry for stripping off the accent.
]
[Redundant noncomments
[EMAIL PROTECTED]
noncomments was already called by get_preffile via get_lines.
]
[Fix issue376 - inconsistent punctuation in darcs get.
Eric Kow <[EMAIL PROTECTED]>**20061231180024
]
[Fix issue367 - pull help message.
Eric Kow <[EMAIL PROTECTED]>**20061231174322]
[fix some changelog entries
Tommy Pettersson <[EMAIL PROTECTED]>**20061231210024]
[allow commented tests in tests_to_run.
David Roundy <[EMAIL PROTECTED]>**20061211000322]
[use variable TEST_FILTER_FILE in makefile.
David Roundy <[EMAIL PROTECTED]>**20061204151217]
[add test target for testing hashed inventories.
David Roundy <[EMAIL PROTECTED]>**20060927020127]
[update web page for new mailing list server.
David Roundy <[EMAIL PROTECTED]>**20070116162930]
[fix spelling errors in comments
Benedikt Schmidt <[EMAIL PROTECTED]>**20061222020037]
[Fix ssh.sh test.
Dave Love <[EMAIL PROTECTED]>**20061218223442]
[add warning about ALL and obliterate --all to documentation
Tommy Pettersson <[EMAIL PROTECTED]>**20061219180302]
[Fix includes in External.hs.
Dave Love <[EMAIL PROTECTED]>**20061218224158
You can't put comments before {-# INCLUDE ...
]
[add test for reverting removed directory
Tommy Pettersson <[EMAIL PROTECTED]>**20061108202344]
[Improve error messages in push_cmd
[EMAIL PROTECTED]
I ran into this because MSYS was munging my repository directory in a
horrible way. This resulted in a bad repo directory getting passed into
darcs, which resulted in a fromJust error, which we all know makes the
baby Jesus cry. So, I at least refactored the code to give a better
error message, though there may well be a better solution.
]
[Implement prettyException.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20061218025440]
[Simplify common libcurl errors.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20061218025419]
[fix issue369 by failing if quickcheck isn't available
David Roundy <[EMAIL PROTECTED]>**20061218021545]
[Don't QP-encode bundles when pushing locally.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20061218002533]
[Make darcs push QP-encode the bundle before transferring.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20061217234635
This should hopefully fix issues with scp/sftp corrupting bundles in transit.
]
[Adapt callers to new calling convention for make_email.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20061217234608
Use Just at the right places.
]
[Make arguments to make_email optional.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20061217234501
Makes contents and filename optional. If they are omitted, we still
generate a conforming MIME message.
]
[add test for get --tag and pending
Tommy Pettersson <[EMAIL PROTECTED]>**20061211192821]
[add new test related to issue262.
David Roundy <[EMAIL PROTECTED]>**20061217221041
This issue seems to already have been fixed.
]
[Added test for reverting an unrecorded add
[EMAIL PROTECTED]
[add test that sigPIPE doesn't make darcs fail.
David Roundy <[EMAIL PROTECTED]>**20061209230155]
[make it an error to "put" into a preexisting directory.
David Roundy <[EMAIL PROTECTED]>**20061203205826
This changes darcs' behavior I believe for the better. Often one could be
tempted to try to put into a directory, expecting to have the repository
created as a subdirectory there, and it seems confusing (confused me) to
have instead the repository contents mingled with whatever was already in
that directory. Put should behave like get in this regard, in that it
shouldn't mix the new repo with a preexisting directory.
]
[adapt test sametwice to new obliterate --all feature
Tommy Pettersson <[EMAIL PROTECTED]>**20061130132058]
[Adapt test perms.sh to obliterate --all feature.
Eric Kow <[EMAIL PROTECTED]>**20061209200625]
[use impossible to document impossible case in Repair.
David Roundy <[EMAIL PROTECTED]>**20061204152854]
[fix for Issue111, obliterate --all
David Roundy <[EMAIL PROTECTED]>**20061129164016
This is a patch to implement the wishless item Issue111,
which asks for an --all option to obliterate. The idea is
that you might use the --patches flag to select a bunch of
patches and not want to have to say yess to all of them.
For good measure, I also added it to unpull and unrecord.
]
[catch exceptions in stdout_is_a_pipe
Simon Marlow <[EMAIL PROTECTED]>**20061129160620]
[hFlush after "waiting for lock" message
Simon Marlow <[EMAIL PROTECTED]>**20061129160342
On Windows, stdout isn't always in line-buffered mode, but we really
want to see the message about waiting for a lock quickly. Mostly
because ^C isn't always caught properly on Windows and lock files are
often left behind, but that's another storey...
]
[add explicit import list
Simon Marlow <[EMAIL PROTECTED]>**20061129160144]
[ignore failure from hSetBuffering
Tommy Pettersson <[EMAIL PROTECTED]>**20061117221424
This affects:
issue41 Doesn't like pasted text.
issue94 Crash on bogus input
issue146 hSetBuffering: invalid argument
issue318 buffering error of darcs record under bash/cmd.exe
It doesn't necessarily "fix" anything. It prevents darcs from quiting,
instead continuing with perhaps an undesirable buffering mode, which may or
may not be better ... or worse.
]
[Hard link support on Windows
Simon Marlow <[EMAIL PROTECTED]>*-20061204162040
This works only on NTFS filesystems. Also it requires Windows 2000 or
later; this may or may not be acceptable, I'll leave that up to the
darcs maintainers to decide.
]
[Hard link support on Windows
Simon Marlow <[EMAIL PROTECTED]>**20061204162040
This works only on NTFS filesystems. Also it requires Windows 2000 or
later; this may or may not be acceptable, I'll leave that up to the
darcs maintainers to decide.
]
[Canonize Kirsten Chevalier.
Kirsten Chevalier <[EMAIL PROTECTED]>**20061217025004
Added my name to the list of authors who originally only submitted an email
address.
]
[Documentation only - clarify meaning of --from and --author
Kirsten Chevalier <[EMAIL PROTECTED]>**20061217024927
Clarified the meaning of --from and --author. I had assumed that these
options also set the From: address on the email sent by "darcs sent". Of
course they don't, but it's better to make this clear.
]
[Do _not_ allow escaped quotes in `quoted'.
Eric Kow <[EMAIL PROTECTED]>**20061030064531
This undoes the patch by Dave Love: Allow escaped quotes in `quoted'.
The immediate problem is that it breaks make_changelog (because one of
Tommy's entries matches on a backslash). This feature might need more
discussion before we include it (or not).
]
[Replace tabs with spaces (escaped quotes in PatchMatch).
Eric Kow <[EMAIL PROTECTED]>**20061023192003]
[Allow escaped quotes in `quoted'.
Dave Love <[EMAIL PROTECTED]>**20060716193940]
[Rename ssh_test to ssh.sh (for shell harness).
Eric Kow <[EMAIL PROTECTED]>**20061121141101
Note that you must set environment variables for it do anything
useful (namely [EMAIL PROTECTED]); something like the following
should work:
[EMAIL PROTECTED] make test
You need to be using public key authentication to have a fully
automated test.
]
[Overhaul and improve automation of ssh_test.
Eric Kow <[EMAIL PROTECTED]>**20061121141802
* Now quits if you don't supply REMOTE; does not have any
silly default values
* Options now passed in through environment variables, so:
NO_CONTROL_MASTER=1 [EMAIL PROTECTED] ./ssh_test
* Performs some automated success checks (which means that
it should be possible to use this from the harness if you
have ssh-agent running)
* Performs darcs send test
* Does not try to pass darcs-ssh flags (like --disable-ssh-cm)
to non-ssh-using commands like record
]
[Add a semi-automated test for SSH-related things.
Eric Kow <[EMAIL PROTECTED]>**20061110110801
Testing SSH stuff is tricky in that (1) you need some place to connect
to and (2) you often want to make sure that the user interactions work
out right. But it can't hurt to script away the boring stuff so that
you are naturally encouraged to test things out more thoroughly.
]
[remove link to obsolete mirror of kernel repo.
David Roundy <[EMAIL PROTECTED]>**20061212012644]
[Remove raw_mode functions from atomic_create.h.
Eric Kow <[EMAIL PROTECTED]>**20061008202738
It seems these were once implemented in compat.c and have since been
reimplemented in Haskell by Ian Lynagh on 2005-07-30. These appear to
just be leftover declarations in the C header.
]
[Add make rules for tags files.
Dave Love <[EMAIL PROTECTED]>**20061113213923]
[configure should fail if a required module isn't present.
David Roundy <[EMAIL PROTECTED]>**20061128024557]
[look for --disable-ssh-cm in defaults files (issue351)
Tommy Pettersson <[EMAIL PROTECTED]>**20061117180942]
[Define infodepspatch locally in AmendRecord instead of exporting it from Patch
[EMAIL PROTECTED]
]
[Amending a patch doesn't remove explicit dependencies
[EMAIL PROTECTED]
[Make libcurl use any http authentication.
Tobias Gruetzmacher <[EMAIL PROTECTED]>**20061118230406
This let darcs use repositories protected with digest authentication.
]
[Support darcs send --disable-ssh-cm.
Eric Kow <[EMAIL PROTECTED]>**20061121134158]
[Redirect stderr to Null when exiting SSH control master.
Eric Kow <[EMAIL PROTECTED]>**20061118212115
This suppresses the output
* Pseudo-terminal will not be allocated because stdin is not a terminal.
(result of redirecting stdin from /dev/null)
* Exit request sent.
(seems to be normal output. Seems also that there is no way to suppress
this; -q does not do the job, for example)
]
[Fix curses stuff, especially on Solaris 10.
Dave Love <[EMAIL PROTECTED]>**20061120171211]
[Canonize Edwin Thomson.
Eric Kow <[EMAIL PROTECTED]>**20061118174454]
[Annotate various boring patterns.
Dave Love <[EMAIL PROTECTED]>**20061113225701]
[TAG 1.0.9rc2
Tommy Pettersson <[EMAIL PROTECTED]>**20061116140351]
Patch bundle hash:
622d1ebbc0b4cfc9ecfdd5f2e9a492a1f93ae042
_______________________________________________
darcs-devel mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-devel
