The resolve command must support displaying path conflicts and marking
them as resolved or unresolved.
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
Event Timeline
Comment Actions
This looks fine to me. Some future cleanup opportunities but this fits the current style just fine.
mercurial/commands.py | ||
---|---|---|
4273–4281 | 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). | |
4277–4280 | In another future refactor, consider making the key and label into a tuple in the dict: { 'u': ('unresolved', 'U'), ... 'pr': ('resolved', 'R'), ... } |
In another future refactor, consider making the key and label into a tuple in the dict: