[darcs-devel] [issue2010] What's new should tell you which files have conflicts
Guillaume Hoffmann
bugs at darcs.net
Thu Jul 4 15:17:16 UTC 2013
Guillaume Hoffmann <guillaumh at gmail.com> added the comment:
I've attached a patch that implements it but it makes the whatsnew
command slower.
Quick benchmark: on my laptop, on darcs.net, without changes in the
working copy and without conflicts:
without the patch: 0.04s
with the patch: 0.14s
Is there a faster way of checking if there are conflicts in a repository?
Here goes the patch summary:
hunk ./src/Darcs/UI/Commands/WhatsNew.hs 142
+
+ r <- readRepo repo
+ Sealed res <- return $ patchsetConflictResolutions r
+ case res of
+ NilFL -> return ()
+ _ -> let cfs = nubSort $ listTouchedFiles res in
+ putDocLnWith fancyPrinters $
+ redText "Conflicts found in the following files:" $$ text
(unlines cfs)
__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue2010>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolve-issue2010_-make-whatsnew-tell-which-files-have-conflicts.dpatch
Type: application/octet-stream
Size: 36860 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20130704/19d1e8d8/attachment-0001.obj>
More information about the darcs-devel
mailing list