( )⚙ D775 commands: update the resolve command to handle path conflicts

This is an archive of the discontinued Mercurial Phabricator instance.

commands: update the resolve command to handle path conflicts
ClosedPublic

Authored by mbthomas on Sep 22 2017, 5:27 AM.

Details

Summary

The resolve command must support displaying path conflicts and marking
them as resolved or unresolved.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mbthomas created this revision.Sep 22 2017, 5:27 AM
ryanmce accepted this revision.Sep 25 2017, 3:29 PM
ryanmce added a subscriber: ryanmce.

This looks fine to me. Some future cleanup opportunities but this fits the current style just fine.

mercurial/commands.py
4276–4284

In a future patch, we may want to refactor this so we're not instantiating the dict over and over (I don't know if python is optimizing this, but it seems "bad" to have it in a loop).

4280–4283

In another future refactor, consider making the key and label into a tuple in the dict:

{
   'u': ('unresolved', 'U'),
   ...
   'pr': ('resolved', 'R'),
   ...
}
mbthomas updated this revision to Diff 2211.Oct 1 2017, 5:32 AM
mbthomas marked 2 inline comments as done.Oct 1 2017, 6:36 AM
mbthomas updated this revision to Diff 2352.Oct 2 2017, 5:15 PM
ryanmce accepted this revision.Oct 5 2017, 10:49 AM
This revision was automatically updated to reflect the committed changes.