Register custom repository contexts

mostafaeweda commented 8 years ago

In Nuclide, we need to integrate such an awesome package for our mercurial repository (which currently doesn't come without all of nuclide).

Here are the changes I needed to do to get it working:

Service API: Following Atom's New Service API, followed by Nuclide, I made the merge-conflicts compatible with that service API to register custom contexts.
Code: The Stage term is specific to git, changed to ResolveFile
UI: The hardcoded Stage message in the UI is also git-specific --> changed to a context-specifc resolveText
Priority: Since you can easily have multiple roots with multiple repositories in an Atom window, the priority goes to the active file path and comes context-specific, because for example, in Nuclide, we have a current working directory feature that prioritizes a root over the others (hence, the need to make it context-specific).

Coming after:

Provide merge-conflict APIs for auto-detection of conflicting state (now happens in our mercurial repo) and quitting / hiding the UI from outside.
Custom final message: git rebase --continue with context-specific logic / message.
Automate running the rebase / merge command to finish all of the rebase / merge within Atom.
As bits of this gets done for mercurial, it will be pushed to https://github.com/facebook/nuclide

smashwilson commented 8 years ago

Oh, nice! :shipit:

smashwilson commented 8 years ago

@mostafaeweda: I've added you to the repository as a collaborator.

mostafaeweda commented 8 years ago

thanks a ton :+1:

smashwilson / merge-conflicts