Juliusz,
This is a resend.
I'm not sure if you'll want to apply the issue79 fix. It certainly helped on
my system, but I strongly feel that it needs reviewed by someone that knows
darcs better and maybe it needs some real world testing. Do we have an
experimental branch that is just used for testing changes? Maybe I'm being
over cautious...
Thanks,
Jason
Fri Jan 13 12:49:30 PST 2006 Jason Dagit <[EMAIL PROTECTED]>
* posthook success/failure messages with --verbose only
Changes behavior of posthook status messages. Use --verbose to have
posthook status messages. Error reporting can be turned off with
--quiet. Note: The command run by the posthook might still generate
output, this patch does not address this output.
Fri Jan 13 13:02:36 PST 2006 Jason Dagit <[EMAIL PROTECTED]>
* issue79 fix, whats -l no longer computes full patch for new files
Makes darcs whatsnew --look-for-adds stop computing the patch for a file
when it realizes the file is new. This is okay because the command in
question defaults to summary mode. This gives a substantial speedup when
large files are in the repository but have not beed added. Several calls
to get_unrecorded were modified so that they would pass on the necesary
information to smart_diff to skip computing the full patch when in
summary mode. Note: The test suite passes after this modification, but
I'm not 100% certain that Summary and NoSummary have been passed to
smart_diff and get_unrecorded in all cases. This patch requires further
testing.
New patches:
[posthook success/failure messages with --verbose only
Jason Dagit <[EMAIL PROTECTED]>**20060113204930
Changes behavior of posthook status messages. Use --verbose to have
posthook status messages. Error reporting can be turned off with
--quiet. Note: The command run by the posthook might still generate
output, this patch does not address this output.
] {
hunk ./Test.lhs 28
-import DarcsArguments ( DarcsFlag( Quiet, LeaveTestDir,
+import DarcsArguments ( DarcsFlag( Verbose, Quiet, LeaveTestDir,
hunk ./Test.lhs 34
+import IO ( hPutStr, stderr )
hunk ./Test.lhs 112
- let putInfo s = when (not $ Quiet `elem` opts) $ putStr s
+ let putInfo s = when (Verbose `elem` opts) $ putStr s
+ putErr s = when (Quiet `notElem` opts) $ hPutStr stderr s
hunk ./Test.lhs 123
- else putInfo "Posthook failed!\n"
+ else putErr "Posthook failed!\n"
}
[issue79 fix, whats -l no longer computes full patch for new files
Jason Dagit <[EMAIL PROTECTED]>**20060113210236
Makes darcs whatsnew --look-for-adds stop computing the patch for a file
when it realizes the file is new. This is okay because the command in
question defaults to summary mode. This gives a substantial speedup when
large files are in the repository but have not beed added. Several calls
to get_unrecorded were modified so that they would pass on the necesary
information to smart_diff to skip computing the full patch when in
summary mode. Note: The test suite passes after this modification, but
I'm not 100% certain that Summary and NoSummary have been passed to
smart_diff and get_unrecorded in all cases. This patch requires further
testing.
] {
hunk ./AmendRecord.lhs 44
-import DarcsArguments ( DarcsFlag ( NoTest, All, AnyOrder ),
+import DarcsArguments ( DarcsFlag ( NoTest, All, AnyOrder, NoSummary ),
hunk ./AmendRecord.lhs 112
- then get_unrecorded repository (AnyOrder:opts)
- else get_unrecorded repository opts
+ then get_unrecorded repository (NoSummary:AnyOrder:opts)
+ else get_unrecorded repository (NoSummary:opts)
hunk ./Apply.lhs 32
- AllowConflicts, Verbose, HappyForwarding
+ AllowConflicts, Verbose, HappyForwarding,
+ NoSummary
hunk ./Apply.lhs 169
- Just c -> do pend <- get_unrecorded repository (AnyOrder:opts)
+ Just c -> do pend <- get_unrecorded repository (NoSummary:AnyOrder:opts)
hunk ./Apply.lhs 182
- mp <- get_unrecorded repository (AnyOrder:opts)
+ mp <- get_unrecorded repository (NoSummary:AnyOrder:opts)
hunk ./Diff.lhs 45
-import DarcsFlags ( DarcsFlag(IgnoreTimes,LookForAdds) )
+import DarcsFlags ( DarcsFlag(IgnoreTimes,LookForAdds,Summary,NoSummary) )
hunk ./Diff.lhs 59
- = case gendiff (ignore_times, look_for_adds) wt [] s1 s2 [] of
+ = case gendiff (ignore_times, look_for_adds, summary) wt [] s1 s2 [] of
hunk ./Diff.lhs 64
+ summary = Summary `elem` opts && NoSummary `notElem` opts
hunk ./Diff.lhs 69
-gendiff :: (Bool,Bool)
+gendiff :: (Bool,Bool,Bool)
hunk ./Diff.lhs 72
-gendiff opts@(isparanoid,_) wt fps s1 s2
+gendiff opts@(isparanoid,_,_) wt fps s1 s2
hunk ./Diff.lhs 98
-recur_diff :: (Bool,Bool)
+-- recur_diff or recursive diff
+-- First parameter is (IgnoreTimes?, LookForAdds?, Summary?)
+recur_diff :: (Bool,Bool,Bool)
hunk ./Diff.lhs 104
-recur_diff opts@(_,doadd) wt fps (s:ss) (s':ss')
+recur_diff opts@(_,doadd,summary) wt fps (s:ss) (s':ss')
+ -- this is the case if a file has been removed in the working directory
hunk ./Diff.lhs 107
+ -- this next case is when there is a file in the directory that is not
+ -- in the repository (ie, not managed by darcs)
hunk ./Diff.lhs 111
- else diff_added wt fps s' . rest
+ else diff_added summary wt fps s' . rest
+ -- actually compare the files because the names match
hunk ./Diff.lhs 116
-recur_diff opts@(_,True) wt fps [] (s':ss') =
- diff_added wt fps s' . recur_diff opts wt fps [] ss'
-recur_diff (_,False) _ _ [] _ = id
+recur_diff opts@(_,True,summary) wt fps [] (s':ss') =
+ diff_added summary wt fps s' . recur_diff opts wt fps [] ss'
+recur_diff (_,False,_) _ _ [] _ = id
hunk ./Diff.lhs 121
+-- creates a diff for a file or direcotry which needs to be added to the
+-- repository
+diff_added :: Bool -> (FilePath -> FileType) -> [FilePath] -> Slurpy
+ -> ([Patch] -> [Patch])
+diff_added summary wt fps s
+ | is_file s = case wt n of
+ TextFile -> (addfile f:) . (if summary then id else
+ diff_from_empty id f (get_filecontents s))
+ BinaryFile -> (addfile f:) . (if summary then id else
+ (bin_patch f
+ nilPS (getbin $ get_filecontents s)))
+ | otherwise {- is_dir s -} =
+ (adddir f:)
+ . foldr (.) id (map (diff_added summary wt (n:fps)) (get_dircontents s))
+ where n = slurp_name s
+ f = mk_filepath (n:fps)
+
hunk ./Diff.lhs 188
-diff_added :: (FilePath -> FileType) -> [FilePath] -> Slurpy
- -> ([Patch] -> [Patch])
-diff_added wt fps s
- | is_file s = case wt n of
- TextFile -> (addfile f:)
- . diff_from_empty id f (get_filecontents s)
- BinaryFile -> (addfile f:)
- . (bin_patch f
- nilPS (getbin $ get_filecontents s))
- | otherwise {- is_dir s -} =
- (adddir f:)
- . foldr (.) id (map (diff_added wt (n:fps)) (get_dircontents s))
- where n = slurp_name s
- f = mk_filepath (n:fps)
+-- creates a diff for a file or direcotry which needs to be added to the
+-- repository
+-- diff_added :: (FilePath -> FileType) -> [FilePath] -> Slurpy
+-- -> ([Patch] -> [Patch])
+-- diff_added wt fps s
+-- | is_file s = case wt n of
+-- TextFile -> (addfile f:)
+-- . diff_from_empty id f (get_filecontents s)
+-- BinaryFile -> (addfile f:)
+-- . (bin_patch f
+-- nilPS (getbin $ get_filecontents s))
+-- | otherwise {- is_dir s -} =
+-- (adddir f:)
+-- . foldr (.) id (map (diff_added wt (n:fps)) (get_dircontents s))
+-- where n = slurp_name s
+-- f = mk_filepath (n:fps)
hunk ./Pull.lhs 28
- Intersection ),
+ Intersection, NoSummary ),
hunk ./Pull.lhs 159
- Just c -> do pend <- get_unrecorded repository (AnyOrder:opts)
+ Just c -> do pend <- get_unrecorded repository (NoSummary:AnyOrder:opts)
hunk ./Pull.lhs 171
- mp <- get_unrecorded repository (AnyOrder:opts)
+ mp <- get_unrecorded repository (NoSummary:AnyOrder:opts)
hunk ./Record.lhs 133
- get_unrecorded repository (AnyOrder:opts)
- else get_unrecorded repository opts
+ get_unrecorded repository (NoSummary:AnyOrder:opts)
+ else get_unrecorded repository (NoSummary:opts)
hunk ./Resolve.lhs 24
-import DarcsArguments ( DarcsFlag( AnyOrder ),
+import DarcsArguments ( DarcsFlag( AnyOrder, NoSummary ),
hunk ./Resolve.lhs 70
- pend <- get_unrecorded repository (AnyOrder:opts)
+ pend <- get_unrecorded repository (NoSummary:AnyOrder:opts)
hunk ./WhatsNew.lhs 101
- maybe_all_changes <- get_unrecorded repository opts
+ -- add Summary to the opts since 'darcs whatsnew --look-for-adds'
+ -- implies summary
+ maybe_all_changes <- get_unrecorded repository (Summary:opts)
hunk ./WhatsNew.lhs 105
- filter (/= LookForAdds) opts
+ filter (/= LookForAdds) (Summary:opts)
hunk ./WhatsNew.lhs 119
- smart_diff [LookForAdds] ftf so sn
+ smart_diff [LookForAdds,Summary] ftf so sn
}
Context:
[fix pathname in comment in darcs.cgi.in
[EMAIL PROTECTED]
[fix win32 build breaks
Will <[EMAIL PROTECTED]>**20060112054853]
[fix content-type in rss output of cgi
Will <[EMAIL PROTECTED]>**20060110052938]
[resolve conflict
Tommy Pettersson <[EMAIL PROTECTED]>**20060108173148]
[Obey normal autoconf conventions.
Dave Love <[EMAIL PROTECTED]>**20051117190231
Allows you to `make install prefix=...', for instance, and doesn't change
default for sysconfdir.
]
[add link to darcs-unstable repo on darcs home page
Tommy Pettersson <[EMAIL PROTECTED]>**20060107212721]
[Don't say "yes" in an infinite loop.
Bill Trost <[EMAIL PROTECTED]>**20060108162605
I ended up with this test hanging forever because the while loop wasn't getting
a SIGPIPE because of the way my editor environment (no controlling tty?) was
set up. We have a pretty good idea of how many "y"s are needed anyhow.
]
[fix crash caused by tests failing on amend-record
Zachary P. Landau <[EMAIL PROTECTED]>**20060108174722]
[More canonization
Eric Kow <[EMAIL PROTECTED]>**20060108235935
canonized : Mark Stosberg, Erik Schnetter, Joeri van Ruth
identified: Richard Smith, Victor Hugo Borja Rodriguez
]
[Improved single-character prompt (RT #261)
Eric Kow <[EMAIL PROTECTED]>**20060108225741
In the dialogue prompting for a single character as a response, if the
user just presses enter, we behave is if we got an invalid response.
This way, the user gets a little bit of feedback that he should respond
differently.
Also: refactors the case where there is a default answer and where the
user may press '?' for help.
]
[Corrections to bugfix for (RT #466)
Eric Kow <[EMAIL PROTECTED]>**20060108225411
The bug fix for case insensitive filesystems was incorrect because
1. canonicalizePath does not canonicalise the same filename with
different cases into the same entry
2. RT #466 affects case sensitive and case insensitive file
systems alike (i.e. the bug description was wrong)
3. canonicalizePath is not available in ghc 6.2.2
This correction also has the advantage of being much simpler and closer
to what David Roundy suggested on the bug tracker. We remove the old
file from the slurpy so that it doesn't get mistaken for the new file.
]
[use _darcs/pristine in regression tests
Eric Kow <[EMAIL PROTECTED]>**20060108222000]
[Make the "record --pipe" docs match the program behavior.
Bill Trost <[EMAIL PROTECTED]>**20060107050910]
[Make --exact-version also work if darcs is built from "make dist" tar ball
Marnix Klooster <[EMAIL PROTECTED]>**20060106205857
This is to prevent "darcs --exact-version" outputting something like
darcs compiled on Mar 2 2005, at 10:56:16
unknown
as it does when building from the output of "make dist", e.g., from the
official tarballs at darcs.net. (This is what a lot of people and distros do.
Gentoo does this, and I'm using Gentoo, and I want to be able to do "darcs
--exact-version" and have it output something sensible.)
The reason that this problem occurs is that while doing 'make predist' (in the
'predist' preference), Context.hs was nicely preserved by predist_copy, but
then thrown away by distclean which calls clean. So the resulting tarball has
no Context.hs, which results in the "unknown" exact version.
The solution consists of the following:
* Only remove Context.hs in "clean" if it can be rebuilt using its rule
in automake.mk (i.e., if _darcs/inventory exists, so if we are in a
repository).
* Target realclean is renamed to the newer maintainer-clean and extended a
little, according to the GNU make manual (not strictly necessary).
As a result of this, we now follow GNU makefile conventions more closely. See
the rules in the "Standard Targets for Users" section of the GNU make manual
(currently at http://www.gnu.org/software/make/manual/html_node/make_127.html),
and an interpretation of these rules in the "What Gets Cleaned" section of the
GNU automake manual (currently at
http://www.gnu.org/software/automake/manual/html_node/Clean.html).
Thanks to Taral <[EMAIL PROTECTED]> for the above info.
]
[Coalesce setpref (issue70 and RT #349)
Eric Kow <[EMAIL PROTECTED]>**20051230230842]
[only create log file when a long comment was requested
Zachary P. Landau <[EMAIL PROTECTED]>**20060108181034]
[Use temporary file when editing send description.
Zachary P. Landau <[EMAIL PROTECTED]>**20051217212051]
[Extended date matching functionality.
Eric Kow <[EMAIL PROTECTED]>**20051228210942
(issue31 and RT #34)
Now accepts ISO 8601 intervals (mostly) as well as a larger subset of
English (including times like "yesterday at noon").
Note: also includes corrections to ISO 8601 date/time parsing, using
a more elegant technique of building dates up.
]
[Partial implementation of iso 8601 dates
Eric Kow <[EMAIL PROTECTED]>**20051228123040
(issue31) - first step
reluctant to implement (ambiguous!):
* years > 9999
* truncated representations with implied century (89 for 1989)
unimplemented:
* time intervals -- this might be good to have in darcs
* negative dates (BC)
]
[Allow rename to different case (RT #466, case-insensitive file systems)
Eric Kow <[EMAIL PROTECTED]>**20060106000141
Creates an exception in the check that the new name does not already exists;
it's ok if both names reduce to the same canonical path
]
[Update "darcs init" documentation to match its behavior.
Bill Trost <[EMAIL PROTECTED]>**20060105040737]
[Invert 'file exists already' error message in mv
Eric Kow <[EMAIL PROTECTED]>**20051230220431
mv used the wrong error message for --case-ok and opposite
]
[bug fixes for darcs help
Eric Kow <[EMAIL PROTECTED]>**20051230011003]
[Canonize myself and almost all other contributers.
Eric Kow <[EMAIL PROTECTED]>**20051229140428
Add function to append name to email address
Merged: Marnix Klooster, Eric Kow, Andres Loeh, Esa Ilari Vuokko
Looked up name on Google for most orphaned email addresses.
Hope nobody actually objects to this.
]
[add a --without-docs option to configure
[EMAIL PROTECTED]
[only print 'making executable' in verbose mode
Eric Kow <[EMAIL PROTECTED]>**20051226182817]
[fix for Issue14 remove darcs-createrepo
Jason Dagit <[EMAIL PROTECTED]>**20051224002230]
[Support --interactive option in changes command (issue #59).
Zachary P. Landau <[EMAIL PROTECTED]>**20051221052049]
[Fix type incompatibility between C code and Haskell foreign declaration.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20060106154108]
[Move patchSetToPatches to Repository.lhs
Zachary P. Landau <[EMAIL PROTECTED]>**20051219043719]
[Use _darcs/pristine instead of _darcs/current.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20051215180814
All versions of Darcs since 1.0.2rc1 are able to handle either name. This
will break compatibility of new repositories with older versions.
]
[Do not document "darcs query manifest" twice.
Erik Schnetter <[EMAIL PROTECTED]>**20051222125103]
[Rename git.c to gitlib.c
Erik Schnetter <[EMAIL PROTECTED]>**20051222115318
On case-insensitive file systems, the source files Git.lhs and git.c
lead to the same object file git.o. Renaming git.c to gitlib.c solves
this problem.
]
[Remove periods from the AC_MSG_CHECKING call for the release state.
Matt Kraai <[EMAIL PROTECTED]>**20051220174536]
[Implementation of help command
Eric Kow <[EMAIL PROTECTED]>**20051218172558
(RT #307)
Provides a command to display usage information on the screen.
darcs help = darcs --help
darcs help --verbose = darcs --extended-help
darcs help command = darcs command --help
This implementation understands abbreviated commands and subcommands.
Slightly refactors darcs.lhs.
]
[reorganize comments (and add a comment) in Depends.lhs.
David Roundy <[EMAIL PROTECTED]>**20051218122029]
[fix bug in doesDirectoryReallyExist.
David Roundy <[EMAIL PROTECTED]>**20051020121710
We were failing with an exception if there was no such object. The error
message was:
Fail: getSymbolicLinkStatus: does not exist
]
[fix type of foreign calls in FastPackedString.
David Roundy <[EMAIL PROTECTED]>**20050920125800]
[rename RepoTypes to PatchSet.
David Roundy <[EMAIL PROTECTED]>**20050917133920]
[remove PatchSequence, which has long been obsolete.
David Roundy <[EMAIL PROTECTED]>**20050917133313
The patch removes remaining vestiges of PatchSequence, which was obsoleted
long ago by PatchSet (which stores patches in the opposite order (better
for lazy use) and which has additional information about tags that allows
us to avoid looking at old history.
]
[correction for send.sh test
Eric Kow <[EMAIL PROTECTED]>**20051218095652
previously failed on (at least) MacOS X 10.3.9
]
[RemoteApply no longer depends on cd, use --repodir instead.
[EMAIL PROTECTED]
This is a minor change to make darcs no longer use cd
before applying patches to a remote repository.
Now the --repodir option for the apply command is used.
This patch came from a hack to rssh[http://sf.net/projects/rssh]
to allow using darcs as a restricted command without depending
on the cd binary.
http://sf.net/tracker/index.php?func=detail&aid=1351939&group_id=65349&atid=510643
]
[Support signed push
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051129082159]
[Fix typo in multirepo pull.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20051217201918]
[Fix merge conflicts.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20051217201903]
[add changelog entry for multirepo pull.
David Roundy <[EMAIL PROTECTED]>**20051215122808]
[add support for pulling from multiple repositories simultaneously.
David Roundy <[EMAIL PROTECTED]>**20050919125012]
[Use POSIX-style option for 'head', instead of obsolescent syntax
Marnix Klooster <[EMAIL PROTECTED]>**20051216111731]
[Clarify wording for changes that can't be unreverted
[EMAIL PROTECTED]
[Set attachment filename when sending a patch bundle by e-mail.
Zachary P. Landau <[EMAIL PROTECTED]>**20051217195009]
[save long comment file if a test fails during record
Zachary P. Landau <[EMAIL PROTECTED]>**20051216023948]
[properly quote paths so that paths with spaces in them are okay
[EMAIL PROTECTED]
[fix up debug printouts in cygwin-wrapper.bash
[EMAIL PROTECTED]
[smoother invocation of cygwin-wrapper.bash -- it detects fully-qualified path to itself by leading /
[EMAIL PROTECTED]
[modernize amend-record.pl to be more portable.
Mark Stosberg <[EMAIL PROTECTED]>**20050402133417
This depends on the new "echo_to_darcs()" function in Test::Darcs
]
[implementation of --set-scripts-executable on local darcs get
[EMAIL PROTECTED]
proposed fix for issue38
The --set-scripts-executable flag is normally evaluated when you apply
patches. But when you do a local darcs get, no patches are applied.
So as a solution, we traverse the directory on local darcs get , and set
any script files to be executable.
Note: one flaw in this patch is that it duplicates the definition of
what a script is -- a file that starts with #! -- in PatchApply.lhs and
Get.lhs. It might be good to refactor these somehow.
]
[extended set-scripts-executable test
[EMAIL PROTECTED]
added check for local darcs get (issue 38) as well as initial sanity check
]
[Fix merge conflicts.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20051214223217]
[Add --subject flag to 'darcs send'
Joeri van Ruth <[EMAIL PROTECTED]>**20051205120301]
[print out the patch name when a test fails.
Zachary P. Landau <[EMAIL PROTECTED]>**20051205055109]
[Fix mistyped /dev/null, fixes --sendmail-command in Windows
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051129160120]
[Use \ as path separator for GnuPG in Windows -- makes apply --verify work
Esa Ilari Vuokko <[EMAIL PROTECTED]>**20051129164533]
[make dangers and recommended use of "Amend" clearer in the docs.
Mark Stosberg <[EMAIL PROTECTED]>**20051213140523
I think it's important to be clearer about when it's appropriate to use 'amend',
so I moved some notes into the short and mid-length help texts.
]
[update web page to reflect 1.0.5 as latest stable source.
Tommy Pettersson <[EMAIL PROTECTED]>**20051213111137]
[fix handling of absolute paths containing drive letters
Will <[EMAIL PROTECTED]>**20051208054737
This fixes issue 47 where paths containing drive letters (i.e. on windows)
are not treated as absolute paths.
]
[bump version to 1.0.6pre1
Tommy Pettersson <[EMAIL PROTECTED]>**20051208092839]
[revert maybe_relink and atomic_create to original C code.
David Roundy <[EMAIL PROTECTED]>**20051208131213]
[resolve conflicts between stable and unstable.
David Roundy <[EMAIL PROTECTED]>**20051206134818]
[Merge changes
Ian Lynagh <[EMAIL PROTECTED]>**20051008225210]
[fix mkstemp implementation for win32
Peter Strand <[EMAIL PROTECTED]>**20050810211303]
[Implement parts of System.Posix.(IO|Files) for win32
[EMAIL PROTECTED]
[implement RawMode with library functions instead of ffi
[EMAIL PROTECTED]
[call hsc2hs without output filename argument
[EMAIL PROTECTED]
[Rename compat.c to c_compat.c to avoid object filename conflict with Compat.hs
[EMAIL PROTECTED]
[Move atomic_create/sloppy_atomic_create to Compat
Ian Lynagh <[EMAIL PROTECTED]>**20050730141703]
[Split the raw mode stuff out into its own .hsc file. Windows needs some TLC
Ian Lynagh <[EMAIL PROTECTED]>**20050730134030]
[Move maybe_relink out of compat.c
Ian Lynagh <[EMAIL PROTECTED]>**20050730131205]
[Remove is_symlink
Ian Lynagh <[EMAIL PROTECTED]>**20050730122255]
[Move mkstemp to Compat.hs
Ian Lynagh <[EMAIL PROTECTED]>**20050730020918]
[Start Compat.hs, and move stdout_is_a_pipe from compat.c
Ian Lynagh <[EMAIL PROTECTED]>**20050730004829]
[TAG 1.0.5
Tommy Pettersson <[EMAIL PROTECTED]>**20051207112730]
Patch bundle hash:
d4e9c61ace6285fb02a8be47d5ae89b4029c6b0f
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
