sun's sandbox: Wysiwyg in Drupal core

Goal

• #1706688: [meta] In-place editing, inline macros, editables, and Wysiwyg in core
• #1782838: WYSIWYG in core: round one — filter types
• #807996: [meta] Input filters and text formats
• #226963: Context-aware text filters (provide more meta information to the filter system)
• http://drupal.org/project/spark

Development guidelines

1. Branches
   • wysiwyg/wysiwyg-[topic]-base: Upstream tracking 8.x branch of Drupal core for a particular topic/feature branch.

     Each topic branch MUST use a separate and corresponding -base branch, so each topic branch can be diffed against its relative 8.x base.

     To create or update a base branch:

     git push wysiwyg 8.x:wysiwyg-topic-base
     

   • wysiwyg/wysiwyg-[topic]-[issue]-[username]: Topic/feature branches under development per user.

     Based on the respective topic base branch, or the branch of another user.

   • origin/*: Your regular upstream Drupal core branches.

   See all current branches.

2. Always commit atomic changes

   Do not change X different things in a single commit. Commit early, commit often.

   Commit atomic change-sets. Touching 10 files for a particular change is OK. Touching 10 files for 2-10 different changes is absurd. Exception: Coding style, documentation, and comment clean-ups/fixes.

3. Provide proper credit

   When applying a patch from someone else, attribute the author by using the --author option:

   git commit --author="sun <sun@54136.no-reply.drupal.org>"
   

   The Git attribution option is exposed on each user's profile page (example).

4. Write proper commit messages

   Branches might be merged into Drupal core. Each commit message should make sense when being looked at in a partial context; e.g., when only looking at the file history of foo.module. Don't do this. Follow the general commit message guidelines as much as possible.

Developer setup

1. Go to your existing Drupal 8 core checkout:
   

   $ cd /var/www/drupal8
   $ git remote show -v
   origin  http://git.drupal.org/project/drupal.git (fetch)
   origin  http://git.drupal.org/project/drupal.git (push)
   

2. Add this sandbox as a new remote:
   

   $ git remote add wysiwyg [username]@git.drupal.org:sandbox/sun/1787858.git
   $ git remote show -v
   origin    http://git.drupal.org/project/drupal.git (fetch)
   origin    http://git.drupal.org/project/drupal.git (push)
   wysiwyg  [username]@git.drupal.org:sandbox/sun/1787858.git (fetch)
   wysiwyg  [username]@git.drupal.org:sandbox/sun/1787858.git (push)
   
   $ git branch -a
   * 8.x
     remotes/origin/8.x
     remotes/wysiwyg/wysiwyg-aloha-12354678-wim
     remotes/wysiwyg/wysiwyg-aloha-base
     ...
   

3. Warning: With multiple remotes, always specify the branch to push.

   Otherwise, git push wysiwyg will push all local branches whose names appear with the same name in the remote, which means you can easily and unintentionally overwrite other wysiwyg sandbox branches. Always use git push wysiwyg [branch].