Submitter | phabricator |
---|---|
Date | March 11, 2018, 8:31 a.m. |
Message ID | <differential-rev-PHID-DREV-4p3cjpujdso2dyd6o2pp-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/29301/ |
State | Superseded |
Headers | show |
Comments
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
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
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
Patch
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