darcs

Issue 2010 What's new should tell you which files have conflicts

Title What's new should tell you which files have conflicts
Priority feature Status given-up
Milestone Resolved in
Superseder Nosy List bsrkaditya, dagit, owst
Assigned To
Topics Conflicts, PatchIndex, UI

Created on 2010-12-04.20:29:56 by dagit, last changed 2017-07-31.01:13:26 by gh.

Files
File name Uploaded Type Edit Remove
resolve-issue2010_-make-whatsnew-tell-which-files-have-conflicts.dpatch gh, 2013-07-04.15:17:15 application/octet-stream
Messages
msg13290 (view) Author: dagit Date: 2010-12-04.20:29:56
What's new should tell you when a file has a conflict, even if you've 
already run 'darcs revert -a'.
msg13292 (view) Author: kowey Date: 2010-12-04.20:39:42
See the related issue1828
msg16891 (view) Author: gh Date: 2013-07-04.15:17:15
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)
Attachments
msg16900 (view) Author: gh Date: 2013-07-16.09:49:23
An observation of owst was to store conflicting patches data in patch index.
History
Date User Action Args
2010-12-04 20:29:56dagitcreate
2010-12-04 20:39:44koweysetpriority: wishlist -> feature
topic: + Conflicts, UI
messages: + msg13292
2013-07-04 15:17:16ghsetfiles: + resolve-issue2010_-make-whatsnew-tell-which-files-have-conflicts.dpatch
messages: + msg16891
2013-07-16 09:49:26ghsettopic: + PatchIndex
nosy: + bsrkaditya, owst
messages: + msg16900
2017-07-31 01:13:26ghsetstatus: unknown -> given-up