D2806: tweakdefaults: add commands.status.verbose to tweakefaults
martinvonz added inline comments. INLINE COMMENTS > durin42 wrote in ui.py:66 > As long as skipstates is reasonably documented, I'm okay with this. > > (I might even leave it on, given this good defense of an annoying feature.) I think it's reasonably documented: https://www.mercurial-scm.org/repo/hg/file/4.6/mercurial/commands.py#l4860 I'll send a patch to remove "bisect" from status.skipstates. Thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2806 To: pulkit, #hg-reviewers, durin42 Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2806: tweakdefaults: add commands.status.verbose to tweakefaults
durin42 added inline comments. INLINE COMMENTS > martinvonz wrote in ui.py:66 > I didn't notice this had changed until now. I've run `hg bisect --bad` to > start bisecting twice in the last week or so and hg replies with "The first > bad revision is:" etc. Of course, the reason that happens is because I had > not cleared the bisect state from last time. I wonder if we should remove > this line since it seems better for new users to include the bisect state > reporting and advanced users who have gotten used to running `hg bisect > --reset` to start bisecting can instead set the config. What do you think? > Augie, how about you (it's you I had in mind with "advanced users can turn it > off" :))? As long as skipstates is reasonably documented, I'm okay with this. (I might even leave it on, given this good defense of an annoying feature.) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2806 To: pulkit, #hg-reviewers, durin42 Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2806: tweakdefaults: add commands.status.verbose to tweakefaults
martinvonz added inline comments. INLINE COMMENTS > ui.py:66 > +# Skip the bisect state in conflicts information in `hg status` > +status.skipstates = bisect > I didn't notice this had changed until now. I've run `hg bisect --bad` to start bisecting twice in the last week or so and hg replies with "The first bad revision is:" etc. Of course, the reason that happens is because I had not cleared the bisect state from last time. I wonder if we should remove this line since it seems better for new users to include the bisect state reporting and advanced users who have gotten used to running `hg bisect --reset` to start bisecting can instead set the config. What do you think? Augie, how about you (it's you I had in mind with "advanced users can turn it off" :))? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2806 To: pulkit, #hg-reviewers, durin42 Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2806: tweakdefaults: add commands.status.verbose to tweakefaults
This revision was automatically updated to reflect the committed changes. Closed by commit rHG98487ad0cf8b: tweakdefaults: add commands.status.verbose to tweakefaults (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2806?vs=6868=6963 REVISION DETAIL https://phab.mercurial-scm.org/D2806 AFFECTED FILES mercurial/ui.py CHANGE DETAILS diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -60,6 +60,10 @@ status.relative = yes # Refuse to perform an `hg update` that would cause a file content merge update.check = noconflict +# Show conflicts information in `hg status` +status.verbose = True +# Skip the bisect state in conflicts information in `hg status` +status.skipstates = bisect [diff] git = 1 To: pulkit, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2806: tweakdefaults: add commands.status.verbose to tweakefaults
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY commands.status,verbose if set to True, shows conflict information in `hg status`. It shows which unresolved state you are in, which are the unresolved files and how to continue the unresolved state. That sounds like a very good candidate for tweakdefaults. bisect is added to commands.status.skipstates because people generally leave unresolved bisect state and we should skip that in morestatus output. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2806 AFFECTED FILES mercurial/ui.py CHANGE DETAILS diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -60,6 +60,10 @@ status.relative = yes # Refuse to perform an `hg update` that would cause a file content merge update.check = noconflict +# Show conflicts information in `hg status` +status.verbose = True +# Skip the bisect state in conflicts information in `hg status` +status.skipstates = bisect [diff] git = 1 To: pulkit, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
