( )⚙ D4336 merge: improve interactive one-changed one-deleted message (issue5550)

This is an archive of the discontinued Mercurial Phabricator instance.

merge: improve interactive one-changed one-deleted message (issue5550)
ClosedPublic

Authored by durin42 on Aug 20 2018, 2:13 PM.

Details

Summary

I like the wording from the bug, so I figured I'd package it up in a
change and see what people think.

Diff Detail

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

Event Timeline

durin42 created this revision.Aug 20 2018, 2:13 PM
pulkit added a subscriber: pulkit.Aug 25 2018, 1:18 PM

I like the improvement very much. This is one of the place where as a beginner I used to hit Ctrl+C because I didn't understand the message. Queued this, many thanks!

This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Aug 25 2018, 10:20 PM
  • a/mercurial/filemerge.py

+++ b/mercurial/filemerge.py
@@ -56,12 +56,14 @@
fullmerge = internaltool.fullmerge # both premerge and merge
_localchangedotherdeletedmsg = _(

  • "local%(l)s changed %(fd)s which other%(o)s deleted\n"

+ "file %(fd)s was deleted in local%(l)s but was modified in other%(o)s.\n"
+ "What do you want to do?\n"

"use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved")

_otherchangedlocaldeletedmsg = _(

  • "other%(o)s changed %(fd)s which local%(l)s deleted\n"

+ "file %(fd)s was deleted in other%(o)s but was modified in local%(l)s.\n"
+ "What do you want to do?\n"

"use (c)hanged version, leave (d)eleted, or "
"leave (u)nresolved?"
"$$ &Changed $$ &Deleted $$ &Unresolved")

Don't they say the opposite things?

indygreg added inline comments.
mercurial/filemerge.py
60

The UI consistently uses lower case sentences. While I like proper punctuation, I thought I'd point out the inconsistency in case others feel it should be changed.

yuja added a comment.Aug 29 2018, 8:55 AM

+ "file %(fd)s was deleted in local%(l)s but was modified in other%(o)s.\n"
+ "What do you want to do?\n"

"use (c)hanged version, (d)elete, or leave (u)nresolved?"

The UI consistently uses lower case sentences. While I like proper punctuation, I thought I'd point out the inconsistency in case others feel it should be changed.

Perhaps "What do you want to do?" can be removed? It adds nothing useful.