Tue Oct 21 21:44:53 CEST 2008 Chistian Kellermann <[EMAIL PROTECTED]>
* half-resolve issue628: reuse the long comment code from Darcs.record,
export therefore prompt_long_comment
This patch adds the ability to enter a long comment for the tags
command. For this a couple of helper functions have been isolated
from get_log. The function prompt_long_comment is now exported by
Darcs.record.
The default behavior at the moment is that it asks for the long
comment. I am not sure whether that is desired and want to put
this up for discussion. If it is the desired behavior I have another
patch changing the test cases accordingly.
Remaining issues:
- Haddock documentation is missing (will follow in a separate patch)
- Lockfile issue: When doing a darcs record or darcs tag with this
and the user hits CTL-C the lock is not removed. How should I do
this? I haven't found the place in Darcs.Record where this happens
- adjustment of Testcases.
New patches:
[half-resolve issue628: reuse the long comment code from Darcs.record, export therefore prompt_long_comment
Chistian Kellermann <[EMAIL PROTECTED]>**20081021194453
Ignore-this: ad3e2712fd74e8ea74a60b2936dc3f8f
This patch adds the ability to enter a long comment for the tags
command. For this a couple of helper functions have been isolated
from get_log. The function prompt_long_comment is now exported by
Darcs.record.
The default behavior at the moment is that it asks for the long
comment. I am not sure whether that is desired and want to put
this up for discussion. If it is the desired behavior I have another
patch changing the test cases accordingly.
Remaining issues:
- Haddock documentation is missing (will follow in a separate patch)
- Lockfile issue: When doing a darcs record or darcs tag with this
and the user hits CTL-C the lock is not removed. How should I do
this? I haven't found the place in Darcs.Record where this happens
- adjustment of Testcases.
] hunk ./src/Darcs/Commands/Record.lhs 22
\label{record}
\begin{code}
{-# OPTIONS_GHC -cpp -fglasgow-exts #-}
-module Darcs.Commands.Record ( record, commit, get_date, get_log, file_exists ) where
+module Darcs.Commands.Record ( record, commit, get_date, get_log, file_exists, prompt_long_comment ) where
import Control.Exception ( handleJust, Exception( ExitException ) )
import Control.Monad ( filterM, when )
import System.IO ( hGetContents, stdin )
hunk ./src/Darcs/Commands/Record.lhs 286
(PriorPatchName p, []) -> return p
(NoPatchName, []) -> prompt_patchname True
-- round 2
- append_info f firstname
+ append_info f firstname chs
when (EditLongComment `elem` fs) $ do edit_file f
return ()
(name, thelog, _) <- read_long_comment f firstname
hunk ./src/Darcs/Commands/Record.lhs 294
return (name, thelog, Nothing)
gl (EditLongComment:_) =
case patchname_specified of
- FlagPatchName p -> actually_get_log p
- PriorPatchName p -> actually_get_log p
- NoPatchName -> prompt_patchname True >>= actually_get_log
+ FlagPatchName p -> actually_get_log p default_log make_log chs
+ PriorPatchName p -> actually_get_log p default_log make_log chs
+ NoPatchName -> do p <- prompt_patchname True
+ actually_get_log p default_log make_log chs
gl (NoEditLongComment:_) =
case patchname_specified of
FlagPatchName p
hunk ./src/Darcs/Commands/Record.lhs 309
return (p, [], Nothing)
gl (PromptLongComment:fs) =
case patchname_specified of
- FlagPatchName p -> prompt_long_comment p -- record (or amend) -m
+ FlagPatchName p -> prompt_long_comment p default_log make_log chs -- record (or amend) -m
_ -> gl fs
gl (_:fs) = gl fs
gl [] = case patchname_specified of
hunk ./src/Darcs/Commands/Record.lhs 314
FlagPatchName p -> return (p, [], Nothing) -- record (or amend) -m
- PriorPatchName "" -> prompt_patchname True >>= prompt_long_comment
+ PriorPatchName "" -> do p <- prompt_patchname True
+ prompt_long_comment p default_log make_log chs
PriorPatchName p -> return (p, default_log, Nothing)
hunk ./src/Darcs/Commands/Record.lhs 317
- NoPatchName -> prompt_patchname True >>= prompt_long_comment
+ NoPatchName -> do p <- prompt_patchname True
+ prompt_long_comment p default_log make_log chs
prompt_patchname retry =
do n <- askUser "What is the patch name? "
if n == "" || take 4 n == "TAG "
hunk ./src/Darcs/Commands/Record.lhs 325
then if retry then prompt_patchname retry
else fail "Bad patch name!"
else return n
- prompt_long_comment oldname =
- do yorn <- promptYorn "Do you want to add a long comment?"
- if yorn == 'y' then actually_get_log oldname
- else return (oldname, [], Nothing)
- actually_get_log p = do logf <- make_log
- writeBinFile logf $ unlines $ p : default_log
- append_info logf p
- edit_file logf
- read_long_comment logf p
- read_long_comment :: FilePathLike p => p -> String -> IO (String, [String], Maybe p)
- read_long_comment f oldname =
- do t <- (lines.filter (/='\r')) `fmap` readBinFile f
- case t of [] -> return (oldname, [], Just f)
- (n:ls) -> return (n, takeWhile
- (not.(eod `isPrefixOf`)) ls,
- Just f)
- append_info f oldname =
- do fc <- readBinFile f
- appendToFile f $ \h ->
- do case fc of
- _ | null (lines fc) -> hPutStrLn h oldname
- | last fc /= '\n' -> hPutStrLn h ""
- | otherwise -> return ()
- hPutDocLn h $ text eod
- $$ text ""
- $$ wrap_text 75
- ("Place the long patch description above the "++
- eod++
- " marker. The first line of this file "++
- "will be the patch name.")
- $$ text ""
- $$ text "This patch contains the following changes:"
- $$ text ""
- $$ summary (fromPrims chs :: Patch)
eod :: String
eod = "***END OF DESCRIPTION***"
hunk ./src/Darcs/Commands/Record.lhs 328
+
+prompt_long_comment :: String -> [String] -> IO String -> FL Prim -> IO (String, [String], Maybe String)
+prompt_long_comment oldname default_log make_log chs =
+ do yorn <- promptYorn "Do you want to add a long comment?"
+ if yorn == 'y' then actually_get_log oldname default_log make_log chs
+ else return (oldname, [], Nothing)
+
+actually_get_log :: String -> [String] -> IO String -> FL Prim ->
+ IO (String, [String], Maybe String)
+actually_get_log p default_log make_log chs =
+ do logf <- make_log
+ writeBinFile logf $ unlines $ p : default_log
+ append_info logf p chs
+ edit_file logf
+ read_long_comment logf p
+
+read_long_comment :: FilePathLike p => p -> String -> IO (String, [String], Maybe p)
+read_long_comment f oldname = do t <- (lines.filter (/='\r')) `fmap` readBinFile f
+ case t of
+ [] -> return (oldname, [], Just f)
+ (n:ls) -> return (n, takeWhile
+ (not.(eod `isPrefixOf`)) ls, Just f)
+
+append_info :: FilePathLike p => p -> String -> FL Prim -> IO ()
+append_info f oldname chs =
+ do fc <- readBinFile f
+ appendToFile f $ \h ->
+ do case fc of
+ _ | null (lines fc) -> hPutStrLn h oldname
+ | last fc /= '\n' -> hPutStrLn h ""
+ | otherwise -> return ()
+ hPutDocLn h $ text eod
+ $$ text ""
+ $$ wrap_text 75
+ ("Place the long patch description above the "++
+ eod++
+ " marker. The first line of this file "++
+ "will be the patch name.")
+ $$ text ""
+ $$ text "This patch contains the following changes:"
+ $$ text ""
+ $$ summary (fromPrims chs :: Patch)
\end{code}
\begin{options}
hunk ./src/Darcs/Commands/Tag.lhs 34
import Darcs.Patch
import Darcs.Patch.Info
import Darcs.Patch.Depends
-import Darcs.Commands.Record ( get_date )
+import Darcs.Commands.Record ( get_date, prompt_long_comment )
+import Darcs.Ordered ( FL(..) )
+import Darcs.Lock ( world_readable_temp )
+import Darcs.Flags ( DarcsFlag(..) )
\end{code}
\begin{code}
tag_description :: String
hunk ./src/Darcs/Commands/Tag.lhs 75
command_basic_options = [patchname_option, author,
checkpoint,
pipe_interactive,
+ ask_long_comment,
working_repo_dir]}
\end{code}
\begin{code}
hunk ./src/Darcs/Commands/Tag.lhs 87
name <- if (not . null) args
then return $ "TAG " ++ unwords args
else get_patchname opts
- myinfo <- patchinfo date name the_author []
+ long_comment <- get_long_comment opts name
+ myinfo <- patchinfo date name the_author long_comment
let mypatch = infopatch myinfo identity
in do
tentativelyAddPatch repository opts $ n2pia $ adddeps mypatch deps
hunk ./src/Darcs/Commands/Tag.lhs 96
when (CheckPoint `elem` opts) $ write_recorded_checkpoint repository myinfo
putStrLn $ "Finished tagging patch '"++name++"'"
\end{code}
+In accordance with the record command the user gets the chance to add a long comment
+using the same interface as darcs record.
+\begin{code}
+get_long_comment :: [DarcsFlag] -> String -> IO [String]
+get_long_comment (NoEditLongComment:_) _ = return []
+get_long_comment (_:flags) oldname = get_long_comment flags oldname
+get_long_comment [] oldname = do
+ let make_log = world_readable_temp "darcs-tag"
+ (_, comment, _) <- prompt_long_comment oldname [] make_log NilFL
+ return comment
+\end{code}
Each tagged version has a version name.
\begin{code}
get_patchname :: [DarcsFlag] -> IO String
Context:
[avoid needless work in Setup.hs
David Roundy <[EMAIL PROTECTED]>**20081020200931
Ignore-this: 52f3e0416edfd888d926a01ced7b6714
]
[enable franchise build tests under wine 1.0.
David Roundy <[EMAIL PROTECTED]>**20081020182156
Ignore-this: 2b6ea78bb8ae5e432c4823019ef6e589
]
[enable test of franchise build.
David Roundy <[EMAIL PROTECTED]>**20081020172147
Ignore-this: bf5e21492195919296450851c07789c2
]
[only build ChangeLog if we're in a darcs repository.
David Roundy <[EMAIL PROTECTED]>**20081020143550
Ignore-this: e79c7ca9ca2525ff4489a4c6926cbcaa
]
[remove dependence on haskell98 package from preproc.hs and make_changelog.hs.
David Roundy <[EMAIL PROTECTED]>**20081019220256
Ignore-this: 2bda2dcb172e3c815bd5a2c068a064e2
]
[we don't need to announce we're on windows, just log it.
David Roundy <[EMAIL PROTECTED]>**20081019213320
Ignore-this: 23d4ca75eb60dcf4ef52123a5cb6c4eb
]
[reorganize and comment ./Setup.hs flags.
David Roundy <[EMAIL PROTECTED]>**20081019211118
Ignore-this: 954c53a14e398fc0e037c8a1371bd598
]
[simplify checking for windows using franchise.
David Roundy <[EMAIL PROTECTED]>**20081019211048
Ignore-this: 37e425429c107b80776dc3c28ca7c544
]
[test for endianness using franchise.
David Roundy <[EMAIL PROTECTED]>**20081018213539
Ignore-this: 9c418723de4ae70bc83cd0e6bc9b1dfd
]
[fix test-franchise-build.sh to work with renamed Setup.hs.
David Roundy <[EMAIL PROTECTED]>**20081018183619
Ignore-this: 7b810e0be231c6088e5fc0cde9533192
]
[Capitalise Setup.hs for consistency.
Eric Kow <[EMAIL PROTECTED]>**20081018152001]
[add CURSES test to setup.hs.
David Roundy <[EMAIL PROTECTED]>**20081017164048
Ignore-this: 1262a90b249d39c916e8e36bfdb6b63b
]
[half-resolve issue1138: make it possible in setup.hs to not use -Werror.
David Roundy <[EMAIL PROTECTED]>**20081016201336
Ignore-this: 4f4f31cf24e25774a8217c26813ddbd3
]
[use unlessFlag in setup.hs to simplify haskeline check.
David Roundy <[EMAIL PROTECTED]>**20081016200649
Ignore-this: 5a2b4ced454b56180f4b9422ff03c41f
]
[add haskeline test to setup.hs.
David Roundy <[EMAIL PROTECTED]>**20081014201513
Ignore-this: 1472b07696d83f70bf8ad8f7b3d5cf1
]
[clean up setup.hs by using lookForModule instead of catching exceptions.
David Roundy <[EMAIL PROTECTED]>**20081014160159
Ignore-this: 8f5c7bd5be2ca099fda5bd52d35dc429
]
[add test for siginfo.h (which shows up on SunOS maybe?)
David Roundy <[EMAIL PROTECTED]>**20081014154814
Ignore-this: 72d32ff1b4b57dbf75eab937be5a0e22
]
[clean up test-franchise-build.sh a bit more...
David Roundy <[EMAIL PROTECTED]>**20081013175711
Ignore-this: 619fff6a0be4bc8172cd8c39a5591079
]
[clean up test-franchise-build.sh
David Roundy <[EMAIL PROTECTED]>**20081013162935
Ignore-this: a1bd36f8bb8d3d75519abcc8d8388a99
Among other infelicities, it wasn't using a clean franchise build
except under wine.
]
[clean up setup.hs configure a bit.
David Roundy <[EMAIL PROTECTED]>**20081010154959
Ignore-this: 10855edc3e6fda315e03b6ea1c64b05e
This removes redundant output, and warns when fast http libraries
aren't found (or no http library at all).
]
[Fix curl version in setup.hs.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081012094214
Ignore-this: 5c44008cb7105279c37a2297e668a070
]
[avoid re-checking for windows.
David Roundy <[EMAIL PROTECTED]>**20081011223905
Ignore-this: 93c42ffc6b67c6cca803e1dcb18a9497
]
[setup.hs: don't fail if darcs doesn't yet exist.
David Roundy <[EMAIL PROTECTED]>**20081011223824
Ignore-this: 6d318961490a9343f5e792f2d740fd27
]
[fix spelling error in setup.hs.
David Roundy <[EMAIL PROTECTED]>**20081011205353
Ignore-this: 6d521f633d74aae8705391eff9489b2c
]
[make setup.hs look for libcurl
David Roundy <[EMAIL PROTECTED]>**20081011195923
Ignore-this: c9a267184e89b188f074171f8887b3b4
]
[ratify use of readFile in setup.hs
David Roundy <[EMAIL PROTECTED]>**20081010150105
Ignore-this: 92627010ec07e16d271bcc5e7f325c64
]
[add script for testing the franchise build.
David Roundy <[EMAIL PROTECTED]>**20081010142711
Ignore-this: 5aa40dc14c0827b199b9d23d1c7ef27d
This includes testing the cross-compile to windows using wine. It's
part of my scripts that are run on each push to darcs-unstable.
]
[add franchise setup file.
David Roundy <[EMAIL PROTECTED]>**20081009203410
Ignore-this: f1738c7608e6093aa18e808d3d41d000
]
[on windows, try renameFile before deleting target file.
David Roundy <[EMAIL PROTECTED]>**20081010204009
Ignore-this: 6946caec86d1c7177510baf62e2ed275
The trouble was that if we were renaming a file to itself, we ended up
deleting the file we were renaming (oops!). It's a stupid hack, but
that's what we're forced to do when running on windows. (Note that
it's potentially hard to determine if two paths describe the same
file.)
]
[Simplify Darcs.Lock.withDir.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081011110639
Ignore-this: c01257f9e0fc40c415562448cb52d67d
]
[Do not remove temporary directories if DARCS_KEEP_TMPDIR environment variable is set.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081011105808
Ignore-this: 5ea0e206e45dc9be73c29c3bf89643b9
]
[eliminate autogeneration of Workaround.hs.
David Roundy <[EMAIL PROTECTED]>**20081010134727
Ignore-this: 784a4b08bab1e22c93f54c1c5cd710f1
]
[Add import list for System.Process in Exec.lhs
J. Garrett Morris <[EMAIL PROTECTED]>**20081017195920]
[Use command_control_list directly in run_the_command.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015181141
Ignore-this: 8c4fb4d8602638648ba4afc6d2e9eeb8
]
[Fix imports in Darcs.ArgumentDefaults.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015180629
Ignore-this: e57422b5a224179b7b1431de262bf8ea
]
[Refactor Darcs.ArgumentDefaults to use command_control_list directly.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015175540
Ignore-this: c832abf95dc438a3b71ed2b9a84cc413
]
[Refactor Darcs.Commands, move command run code to Darcs.RunCommand.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015174031
Ignore-this: 3b8c32701f62f3d7b1e0834eaa406dc5
]
[Remove unused extended_usage.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015142503
Ignore-this: 1d86f17d2bc3ec0c004e3cd1016d303
]
[Use help_cmd instead of usage in main.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015134236
Ignore-this: fced70e6714d5294783bbe98f0d81e47
]
[Use help_cmd directly in main.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015132942
Ignore-this: 8ded4d8a8cf51f862794a78eea4ef137
]
[Refactor 'darcs --commands' to list_available_commands.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081015125827
Ignore-this: 114b79a90e6446169dd87ff8591bc6ff
]
[fix Submitting patches to darcs with respect to send -u
Thorkil Naur <[EMAIL PROTECTED]>**20081015073751]
[finished cleanup of default_boring entries
[EMAIL PROTECTED]
Ignore-this: e5ad0567cabe64142bf3876c2d73535e
]
[simplify pull_many_files.sh.
David Roundy <[EMAIL PROTECTED]>**20081014165155
Ignore-this: 9f7a7cc5b02a9d51810149a8875e987f
]
[Use fgrep in printer.sh test (more portable than grep -F)
Eric Kow <[EMAIL PROTECTED]>**20081014135138]
[have makefile make hspwd rather than shell_harness.
David Roundy <[EMAIL PROTECTED]>**20081013192943
Ignore-this: 31008f1993c5a2281b229b9c5cdca66c
I think there was a problem that make -j check could cause ghc --make
to be run simultaneously. Now it's run just once, before running any
tests.
]
[slightly hokey approach to solving pwd problem.
David Roundy <[EMAIL PROTECTED]>**20081013184209
Ignore-this: 762f0339c99f1d4a529ab031ad353cd0
I think this may help the Solaris/BSD test portability issue, and it's
also (I think) a slightly cleaner alternative to the portable_pwd
hack.
]
[Remove bashisms and GNUisms
Matthias Kilian <[EMAIL PROTECTED]>**20081012123017
Replace some bashisms and GNUisms by more standards compliant command
lines, i.e.:
- Don't use `\|' in BREs, since it's undefined according to POSIX.
Instead just use grep -E with an ERE.
- Don't create "funny" strings with the $'\x01...' bashism but use
printf(1) instead. Note that this isn't strictly necessary to fix
printer.sh on non-GNUish systems, but it makes it much simpler to test
what's going on.
- In test_line(), just use grep -F, and unescape all second arguments
passed to test_line(). This makes the script much more readable and
actually fixes it for non-GNUish systems.
]
[Restore quiet grep in portable_pwd
Eric Kow <[EMAIL PROTECTED]>**20081005164212
Only this time, we use > /dev/null.
]
[Disable a test that triggers a setCooked failure under Windows.
Eric Kow <[EMAIL PROTECTED]>**20081005145124]
[further makefile cleanups.
David Roundy <[EMAIL PROTECTED]>**20081005124353
Ignore-this: 8c498e4b793b7049e273d6ac98441256
]
[Simplify testing in makefile.
Eric Kow <[EMAIL PROTECTED]>**20081005092416]
[Revise test documentation to reflect consolidation to shell tests.
Eric Kow <[EMAIL PROTECTED]>**20081005091131]
[Remove Perl test harness and convenience copies.
Eric Kow <[EMAIL PROTECTED]>**20081005090921]
[Do not use Perl test harness.
Eric Kow <[EMAIL PROTECTED]>**20081005090903]
[Hopefully fix issue595 test on Solaris.
Eric Kow <[EMAIL PROTECTED]>**20081005090156
I'm not entirely clear on what is causing this to fail.
The basic test is:
mkdir -p restrictive/liberal
chmod 111 restrictive
cd restrictive/liberal
darcs get
This is apparantly known to fail under Solaris. The original Perl test
claims it's because you can't cd into restrictive/liberal, but the shell
variant seems to manage fine. In any case, I think this touch file
check is simpler.
]
[fix bug in external.sh translation.
David Roundy <[EMAIL PROTECTED]>**20081005122814
Ignore-this: 1291ebf27ea9c4a04d79c877b0f6f82d
]
[Translate printer test into shell.
Eric Kow <[EMAIL PROTECTED]>**20081005020140]
[Translate still more Perl tests into shell.
Eric Kow <[EMAIL PROTECTED]>**20081005012058]
[Translate pull_many_files tests into shell and avoid redoing work.
Eric Kow <[EMAIL PROTECTED]>**20081005004120
Just use whatever format is in .darcs/defaults
]
[Skip filepath test which does not work on Windows.
Eric Kow <[EMAIL PROTECTED]>**20081004234806]
[Fix non-portable use of grep -q in tests.
Eric Kow <[EMAIL PROTECTED]>**20081004234524]
[Make sed usage more portable in hidden_conflict2 test.
Eric Kow <[EMAIL PROTECTED]>**20081004233717]
[Translate some more Perl tests into shell.
Eric Kow <[EMAIL PROTECTED]>**20081004201632]
[add test that timestamps are properly set.
David Roundy <[EMAIL PROTECTED]>**20081013152933
Ignore-this: caf36b9fff70f9a44b0f35078f3a5aee
]
[simplify write_default_prefs.
David Roundy <[EMAIL PROTECTED]>**20081013121512
Ignore-this: 4f72699d2406802e771a0ceadc913550
It's easier to read this way, and shorter, too.
]
[documented provenance of .tmp_versions and .DS_Store files in default boring
[EMAIL PROTECTED]
[resolve issue1139: make special cases handle no arguments gracefully.
David Roundy <[EMAIL PROTECTED]>**20081011161059
Ignore-this: 12b17a3940558860dd4caf7bb2619ec7
I accidentally broke this when refactoring Darcs.Match. This change
restores some efficiency when no arguments are given and thus we are
creating copies of all the files in the repository.
]
[remove reimplementation of zipWith.
David Roundy <[EMAIL PROTECTED]>**20081010191051
Ignore-this: 277f49de513ec84bc6db0b4da6c633b1
]
[fix incompatibilities with ghc 6.6
David Roundy <[EMAIL PROTECTED]>**20081009165845
Ignore-this: 18739c880a49b976ec151363f4ff9296
]
[refactor Match to handle --store-in-memory itself.
David Roundy <[EMAIL PROTECTED]>**20081008172748
Ignore-this: 647c75f78d2d4981e67039ae1b6e96df
This reduces the amount of duplicate code, at the cost of adding a
class to Darcs.Match--but at least it isn't exported.
]
[make writeSlurpy work properly when given "."
David Roundy <[EMAIL PROTECTED]>**20081008172207
Ignore-this: 9d5d077bcdf3a9bb7bfa8477ab9d96d5
This isn't a bugfix per se, but rather a feature addition.
writeSlurpy has a "safety feature" that it refuses to overwrite a
directory, but that safety feature doesn't really apply to the
directory ".", since "." explicitly means that we want to overwrite
the directory.
]
[add tests for issue1139.
David Roundy <[EMAIL PROTECTED]>**20081011155324
Ignore-this: ff50784059114f969fb4657ea5e92025
]
[Copyright and licensing notes and rationales.
Trent W. Buck <[EMAIL PROTECTED]>**20081011035925]
[Document DARCS_KEEP_TMPDIR in manual.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081011115026
Ignore-this: bd77d5a85fa44094dcd1a867c2a63d2e
]
[Documentation for DARCS_KEEP_TMPDIR.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081011113042
Ignore-this: 5e3d6598aed4b681a099341c3ec5017a
]
[add new test that optimize --reorder behaves itself on lazy repos.
David Roundy <[EMAIL PROTECTED]>**20081010194834
Ignore-this: 5246d20700c153490da1997caede4369
]
[give more debug output in test.
David Roundy <[EMAIL PROTECTED]>**20081010191209
Ignore-this: a13ec79ae69f4fe9621ea3c16c9b41d6
]
[add a --prompt-for-dependencies to restore the default behaviour
[EMAIL PROTECTED]
Ignore-this: 92480353c19dea1b67aff89b933759a2
Add a --prompt-for-dependencies flag so that one can put
--dont-prompt-for-dependencies in their defaults file and
still get back the default behavior when needed.
]
[cleanup default boring
[EMAIL PROTECTED]
Also turn default_boring and default_binaries into (pure) CAFs.
]
[Fix spurious diff and missing cd in diff test.
Eric Kow <[EMAIL PROTECTED]>**20081008192142
If tests are run in parallel, each instance of the diff test may
attempt to create temporary directories for use by darcs diff.
Darcs itself handles this fine; only the test script gets confused
by the spurious difference that results.
]
[Help the test harness clean to up after tests.
Eric Kow <[EMAIL PROTECTED]>**20081008190340
A typical use case is if a test sets restrictive permissions
and dies. Notes:
* we do this after each test so that one test result doesn't
contaminate others
* we explicitly do /not/ remove these temporary directories
because you may want them around for forensics
]
[Minor refactor in URL.urlThread.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081010071649
Ignore-this: 809d750f10adc8073ebe0dd3d432f2a2
]
[clean up code formatting in Hopefully.
David Roundy <[EMAIL PROTECTED]>**20081010144943
Ignore-this: 65a4dbb17505adbc0c0c615c445a8926
]
[clean up unused exports in Hopefully.
David Roundy <[EMAIL PROTECTED]>**20081010144918
Ignore-this: a016b66fd64f756295555255b268e80a
]
[haddock documentation for Hopefully
[EMAIL PROTECTED]
[resolve issue1062: ignore setCooked and setEcho errors.
Eric Kow <[EMAIL PROTECTED]>**20081010122047
Ignore-this: 2f8c8710faefdcdb6b224244995a00af
The issue in question is only about setCooked.
I presume setEcho can similarly fail.
]
[add missing createLink to win32/System/Posix/Files.hsc.
David Roundy <[EMAIL PROTECTED]>**20081010133500
Ignore-this: 39d246ab1db8c31f78e0b8362ad05ca3
]
[make make_changelog default to quiet output.
David Roundy <[EMAIL PROTECTED]>**20081009203322
Ignore-this: 55eba7a68a3c8a5683d23cc99848bd6f
You can restore previous behavior by defining the VERBOSE environment
variable.
]
[remove unused and unneeded Workarounds.
David Roundy <[EMAIL PROTECTED]>**20081009194541
Ignore-this: bca5a7a2444d4ddffeed673cbbfa19ec
]
[rename lazy-deps to dont-prompt-for-dependencies.
David Roundy <[EMAIL PROTECTED]>**20081009171030
Ignore-this: 78393e28c184c9339c89cecaa852dbc9
]
[basic tests for --lazy-deps
Florent Becker <[EMAIL PROTECTED]>**20081008124956
Ignore-this: 79d8a312943813e9fe5448bc2ab86aa0
]
[added a --lazy-deps option
Florent Becker <[EMAIL PROTECTED]>**20081008122224
Ignore-this: d934868e56f0084067f5aedf0512a533
This option means that you don't get asked about patches which do not match
a --match, but are depended upon by a patch that does. These patches will get
ilently selected.
]
[refactor of SelectChanges
Florent Becker <[EMAIL PROTECTED]>**20081008100551
Ignore-this: e620d36d6e52eb62a2205fe5122d7076
]
[rewrite push_coalesce_patch to avoid calls to lengthFL.
David Roundy <[EMAIL PROTECTED]>**20080924161517
Ignore-this: cf746702c3b1e06ab2d400878e20e305
]
[change a bit of code to accept FilePathLike arguments.
David Roundy <[EMAIL PROTECTED]>**20081008172047
Ignore-this: 87032e071bb49117133d99a90bdfd0e1
These functions really should expect FileName, and this is an
incremental move in that direction.
]
[Implement Commands.Check in terms of Repository.Repair functionality.
[EMAIL PROTECTED]
[Implement Commands.Repair in terms of Repository.Repair functionality.
[EMAIL PROTECTED]
[Export testTentative from Darcs.Repository.
[EMAIL PROTECTED]
[Implement Repository.Repair to provide primitives for check and repair commands.
[EMAIL PROTECTED]
[keep changepref patches from breaking the toSimple optimization.
David Roundy <[EMAIL PROTECTED]>**20080924162022
Ignore-this: 404a4386b048b74dd9afcdde47bc1b11
]
[make various autoconf simplifications.
David Roundy <[EMAIL PROTECTED]>**20080923150742
Ignore-this: 213c53eda0b54c01909c8d15b2a5fdd6
]
[Translate merging_newlines bug into shell and restore bug context.
Eric Kow <[EMAIL PROTECTED]>**20081005085031
This used to be a TODO item at the end of the merging_newlines
test, but when it was moved out, the actions required to set up
a bug were forgotten. This patch restores those actions.
]
[Remove residual Perlisms in match-date.
Eric Kow <[EMAIL PROTECTED]>**20081005000324]
[Use example.com in external.pl tests.
Eric Kow <[EMAIL PROTECTED]>**20080928082407
This avoids timing out in some DNS lookup. When I first wrote this
test, I did not know that RFC2606 has reserved example.{com,net,org}
which seems to be useful in precisely this situation.
]
[fix incorrect merging_newlines.sh test.
David Roundy <[EMAIL PROTECTED]>**20081004223547
Ignore-this: 33ebc10cd54112ec101750dd6c75fdf9
]
[Move merging_newlines test to bugs and add a simpler version.
Eric Kow <[EMAIL PROTECTED]>**20081004135724
There are two issues I noticed when converting this Perl test into
shell. This test was passing, but I made some mistakes translating it,
and in doing so, noticed two potential bugs.
The first is a potentially hidden conflict. If we start from
a file
from temp1
<EOF>
And then it seems that a change which adds an empty line should
conflict with a change that adds a line with content.
The second is that if you do omit the newline, as the original
test does,
from temp1<EOF>
you get some strange-looking changes, namely that appending a
line to this yields two addline changes and not one.
]
[Restore send-external.sh test.
David Roundy <[EMAIL PROTECTED]>**20081009140121
Ignore-this: 700f9c538033108cac397c1d757fbfc4
]
[use minimum Cachable time in corner case where f/=f' and c/=c'.
David Roundy <[EMAIL PROTECTED]>**20081008173804
Ignore-this: 51f2a68ac4139420bd116e8293cc5cc2
]
[add test of Ignore-this functionality.
David Roundy <[EMAIL PROTECTED]>**20081008192621
Ignore-this: 47b7bf225e2997dd78c351763c769738
]
[warn users if they try to record a change beginning with Ignore-this:.
David Roundy <[EMAIL PROTECTED]>**20081008192001
Ignore-this: 94828726d609f46e384c2ab8091e49db
Ignore-this: I am testing the functionality of this feature.
]
[allow users to add their own ignored information to patches.
David Roundy <[EMAIL PROTECTED]>**20081008190038
Ignore-this: fe8294776896b6fdcd489752a29d1069
]
[remove excessive indentation that made the code very hard to read.
David Roundy <[EMAIL PROTECTED]>**20081008173358
Ignore-this: d93e312c27f0d9a1ef993855c6872257
]
[When requesting same URL with different cachability choose least cachable.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20081008145049
Ignore-this: fddacf3e706a68c55871f81438d283b
]
[Improve test pull.sh cleanup
Thorkil Naur <[EMAIL PROTECTED]>**20081008115539]
[Allow dist command to take a tag argument (issue 286).
Stephen Hicks <[EMAIL PROTECTED]>**20081006075133
It should probably be a "match_one_context" instead of a "match_one"
option type, and then instead of using the "nonranged" matcher, we'd
use the "patchset" ones (that don't exist yet). But I couldn't figure
out how to blend "get_nonrange_match" and "get_one_patchset" in any
sensical way to get immediate pristine output (and all the more so for
the "_s" variants). So for now, contexts are not supported, but it
would be nice if they were someday.
]
[clean up RepoPath a bit (removing unused methods from classes).
David Roundy <[EMAIL PROTECTED]>**20081008161906
Ignore-this: 4e69882ebe10f20bb67350b106bd10af
]
[clean up exportation of SlurmMonad private internals.
David Roundy <[EMAIL PROTECTED]>**20081008151758
Ignore-this: 3763cc352b6f28fa83d8fbe5b1077985
]
[Optimize clean_hashdir's use of cleanCaches.
Petr Rockai <[EMAIL PROTECTED]>**20081007191237
We now only ask cleanCaches to look at files we have unlinked and therefore
might have caused their cached equivalents to drop link-count to 1. Limits
number of stats to O(n), n = number of cleaned out files.
]
[partial haddock documentation of Arguments.lhs
Florent Becker <[EMAIL PROTECTED]>**20081007131122]
[mv nfs-failure test to the bugs/ folder, since it fails.
David Roundy <[EMAIL PROTECTED]>**20081005130112
Ignore-this: 73c6e55558233f1b56d7ff51f327f454
]
[Translate some Perl bugs into shell.
Eric Kow <[EMAIL PROTECTED]>**20081005084157]
[Translate date matching test to shell.
Eric Kow <[EMAIL PROTECTED]>**20081005000243]
[Translate some more Perl tests into shell.
Eric Kow <[EMAIL PROTECTED]>**20081004163850
Shell equivalents already exist for these particular tests,
but they may not do the same thing.
]
[Move non-date-matching code out of match.pl
Eric Kow <[EMAIL PROTECTED]>**20081004145445
The goal is to minimise and eventually eliminate our use of Perl
for regression tests.
]
[Fix minor bug in conflict-doppelganger test.
Eric Kow <[EMAIL PROTECTED]>**20081004163746
It does not account for --old-fashioned-inventory being
in .darcs/defaults
]
[Update tests to reflect --darcs-2 default.
Eric Kow <[EMAIL PROTECTED]>**20080925143252
We need to explicitly say --old-fashioned-inventory to test
accordingly.
]
[Translate some more Perl tests into shell.
Eric Kow <[EMAIL PROTECTED]>**20081004092507]
[remove -q from diff in test, not supported on solaris
Tommy Pettersson <[EMAIL PROTECTED]>**20081003205756]
[Translate some Perl tests into shell.
Eric Kow <[EMAIL PROTECTED]>**20081003183746]
[Convert tag.pl test into shell.
Eric Kow <[EMAIL PROTECTED]>**20081003095231]
[make default_boring and default_binaries NOINLINE
David Roundy <[EMAIL PROTECTED]>**20081001202731
Ignore-this: f74741738a612bb283d1e871d70aa492
This is primarily so I won't have to recompile all of darcs when these
change, but also because they shouldn't be inlined. It would just be
a waste of space (and would slow down darcs).
]
[fix bug in 1105 fix that led to improper overrides of defaults
David Roundy <[EMAIL PROTECTED]>**20081001175907
Ignore-this: 8413d2596f97076ccb096900585f0c62
The problem is illustrated in the tests/override-defaults.sh that I've
recorded separately. We want conflicting defaults in
~/.darcs/defaults and _darcs/prefs/defaults to be resolved in favor of
the default residing in _darcs/prefs/defaults.
]
[add test that overriding of defaults works right.
David Roundy <[EMAIL PROTECTED]>**20081001175645
Ignore-this: aedfd923676b1fa35c25c72abb88c8f3
]
[Test for issue1105.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080929142205
Ignore-this: 5b7c2f7d270ab614eb1294566048a586
]
[Resolve issue1105: check if default options are valid.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080929141948
Ignore-this: 17b4b27e31545689f21496f7fc9c9fe7
]
[Restore 'simplify patches in rollback'.
Eric Kow <[EMAIL PROTECTED]>**20080926225429]
[Restore issue27 patches.
Eric Kow <[EMAIL PROTECTED]>**20080926222522
rolling back:
Fri Sep 26 23:01:19 BST 2008 Eric Kow <[EMAIL PROTECTED]>
* Resolve issue1102: recognise but do not generate patch log 'junk'.
]
[TAG 2.1.0
Eric Kow <[EMAIL PROTECTED]>**20081009120532]
Patch bundle hash:
aa3da235ddeeb5dd08a8b7baeb49fe3b59c932b1
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
