( )⚙ D834 hg update hint

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D834

hg update hint
ClosedPublic

Authored by diegocr on Sep 28 2017, 11:46 AM.
Tags
None
Subscribers
ryanmce, quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX6d8c66ee1cf5: hg update hint

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

diegocr created this revision.Sep 28 2017, 11:46 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 28 2017, 11:46 AM
quark added a subscriber: quark.Sep 28 2017, 12:42 PM
quark added inline comments.
hgext3rd/tweakdefaults.py
439

ui.note is better. ui.warn may use a different color (ex. red) if the user has configured it.

440

hg usually uses hint for this kind of tips. Maybe reuse that word:

ui.warn(_('(hint: use `hg prev` to move to the parent changeset)\n'))
quark added inline comments.Sep 28 2017, 12:45 PM
hgext3rd/tweakdefaults.py
440

Actually, ui.write() seems the best choice here.

diegocr retitled this revision from hg update tip to hg update hint.Sep 28 2017, 12:57 PM
diegocr updated this revision to Diff 2147.
ryanmce added a subscriber: ryanmce.Sep 28 2017, 1:13 PM

Personally I think I'd prefer ui.status since that doesn't print out in quiet mode. I'm not familiar with how ui.write interacts with quiet mode.

ryanmce added a comment.Sep 28 2017, 1:13 PM

Ideally the string would have i18n as well

quark accepted this revision.Sep 28 2017, 1:49 PM

I wonder if we should hide the hint if the user runs prev at least one time. But that is probably another diff. I think this kind of UX improvement probably needs a general purposed "framework". We might even need to sync "whether a hint should be hidden" information with the cloud for a given unixname.

hgext3rd/tweakdefaults.py
439

@ryanmce is right. Let's change it to:

ui.status(_("(hint: use 'hg prev' to move to the parent changeset)\n"))

before landing.

This revision is now accepted and ready to land.Sep 28 2017, 1:49 PM
ryanmce added a comment.Sep 28 2017, 1:56 PM

Since we don't have that generalized framework yet, probably we should have this config gated for now?

diegocr added a comment.Sep 28 2017, 2:22 PM

Thanks for the comments, I will change it to ui.status(_("(hint: use 'hg prev' to move to the parent changeset)\n")) and land it

quark added a comment.Sep 28 2017, 2:57 PM
In D834#14114, @ryanmce wrote:

Since we don't have that generalized framework yet, probably we should have this config gated for now?

Sounds good to me. It could be a follow-up.

Closed by commit rFBHGX6d8c66ee1cf5: hg update hint (authored by diegocr). · Explain WhyOct 1 2017, 8:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2266

hgext3rd/tweakdefaults.py

if inactive: if inactive:
wrapfunction(hg, 'updatetotally', _wrapupdatetotally) wrapfunction(hg, 'updatetotally', _wrapupdatetotally)
result = orig(ui, repo, node=node, rev=rev, **kwargs) result = orig(ui, repo, node=node, rev=rev, **kwargs)
if inactive: if inactive:
extensions.unwrapfunction(hg, 'updatetotally', _wrapupdatetotally) extensions.unwrapfunction(hg, 'updatetotally', _wrapupdatetotally)
# If the command succeed a message for 'hg update .^' will appear
# suggesting to use hg prev
if node == '.^':
ui.status(_("(hint: use 'hg prev' to move to the parent changeset)\n"))
quarkUnsubmitted
Not Done

ui.note is better. ui.warn may use a different color (ex. red) if the user has configured it.

quark: `ui.note` is better. `ui.warn` may use a different color (ex. red) if the user has configured…
quarkUnsubmitted
Not Done

@ryanmce is right. Let's change it to:

ui.status(_("(hint: use 'hg prev' to move to the parent changeset)\n"))

before landing.

quark: @ryanmce is right. Let's change it to: ui.status(_("(hint: use 'hg prev' to move to the…
quarkUnsubmitted
Not Done

hg usually uses hint for this kind of tips. Maybe reuse that word:

ui.warn(_('(hint: use `hg prev` to move to the parent changeset)\n'))
quark: hg usually uses `hint` for this kind of tips. Maybe reuse that word: ui.warn(_('(hint: use…
quarkUnsubmitted
Not Done

Actually, ui.write() seems the best choice here.

quark: Actually, `ui.write()` seems the best choice here.
return result return result
def _wrapupdatetotally(orig, ui, repo, checkout, brev, *args, **kwargs): def _wrapupdatetotally(orig, ui, repo, checkout, brev, *args, **kwargs):
# set brev to invalidbookmark to prevent bookmark update # set brev to invalidbookmark to prevent bookmark update
invalidbookmark = ' ' invalidbookmark = ' '
assert checkout is not None assert checkout is not None
assert invalidbookmark not in repo._bookmarks assert invalidbookmark not in repo._bookmarks
# assert invalidbookmark is not None # assert invalidbookmark is not None

tests/test-tweakdefaults-ordering.t

$ touch a $ touch a
$ hg commit -Aqm a $ hg commit -Aqm a
$ touch b $ touch b
$ hg commit -Aqm b $ hg commit -Aqm b
$ hg bookmark AB $ hg bookmark AB
$ hg up ".^" $ hg up ".^"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark AB) (leaving bookmark AB)
(hint: use 'hg prev' to move to the parent changeset)
$ touch c $ touch c
$ hg commit -Aqm c $ hg commit -Aqm c
$ hg bookmark C -t AB $ hg bookmark C -t AB
$ hg rebase $ hg rebase
rebasing 2:d5e255ef74f8 "c" (C tip) rebasing 2:d5e255ef74f8 "c" (C tip)
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob)

tests/test-tweakdefaults-update.t

| o 3 | o 3
| | | |
| o 2 | o 2
|/ |/
o 1 o 1
| |
o 0 o 0
$ hg up 3 $ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Make an uncommitted change. Make an uncommitted change.
$ echo foo > foo $ echo foo > foo
$ hg add foo $ hg add foo
$ hg st $ hg st
A foo A foo
--clean should work as expected. --clean should work as expected.
$ hg st $ hg st
A foo A foo
$ hg up --clean 3 $ hg up --clean 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st $ hg st
? foo ? foo
$ hg update .^
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(hint: use 'hg prev' to move to the parent changeset)

tests/test-tweakdefaults.t

[255] [255]
Dirty update allowed to same rev, with no conflicts, and --clean Dirty update allowed to same rev, with no conflicts, and --clean
$ hg update . $ hg update .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update ".^" $ hg update ".^"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(hint: use 'hg prev' to move to the parent changeset)
$ hg update --clean 1 $ hg update --clean 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Log on dir's works Log on dir's works
$ hg log -T '{rev} {desc}\n' dir $ hg log -T '{rev} {desc}\n' dir
1 b 1 b