UEXTeamMenu

(Difference between revisions)
m
Line 53: Line 53:
# Repository Browser
# Repository Browser
# ----------------------------------
# ----------------------------------
 +
# Shelve Changes  [[image:submenu.png]]       
 +
## Shelve Changes...                   
# Disconnect...
# Disconnect...
# ----------------------------------
# ----------------------------------
Line 144: Line 146:
# Properties...
# Properties...
# ----------------------------------
# ----------------------------------
 +
# Shelve Changes  [[image:submenu.png]]       
 +
## Shelve Changes...                   
# Disconnect...
# Disconnect...
# ----------------------------------
# ----------------------------------

Revision as of 12:47, 30 January 2013

Proposed changes in the Team menu. The goal is to decrease number of top level menu items, reorganize them so ordering is similar in every VCS.

Another problem we should solve is how to differ context sensitive action and repository-wide actions. We've come up with two options:

  1. highlighting every repository-wide action in the menu by the repository name next to the action name i.e. <action name> - <repository name>. Used in GIT
  2. use previous highlighting only for "no dialog" repository-wide actions (e.g. Push to Default - <repository name>). Other actions has to specify in their dialog if they are context sensitive or repository wide (e.g. in dialog title). Used in Mercurial

Contents

GIT

  1. image:icon_symbol.png Show Changes (icon not available yet)
  2. image:icon_symbol.png Diff
  3. image:icon_symbol.png Add (icon not available yet)
  4. image:icon_symbol.png Commit...
  5. image:icon_symbol.png Revert Modifications...
  6. image:icon_symbol.png Show Annotations
  7. image:icon_symbol.png Search History... (icon not available yet)
  8. Checkout image:submenu.png
    1. Revision - <repo name>...
    2. Files...
  9. ----------------------------------
  10. Resolve Conflicts (not visible right now, bug?)
  11. Ignore image:submenu.png (submenu introduced)
    1. Ignore (Unignore)
    2. Exclude From Commit (Include in Commit)
  12. Patches image:submenu.png (renamed - it should be clearer to the user since all items are related to patches)
    1. Export Uncommited Changes...
    2. Export Commit - <repo name>...
    3. ---------------------------------
    4. Apply Diff Patch...
  13. ----------------------------------
  14. Branch/Tag - <repo name> image:submenu.png (Merging Branch, Tag and Merge items)
    1. Create Branch...
    2. Switch to Branch...
    3. ---------------------------------
    4. Create Tag...
    5. Manage Tags...
    6. ---------------------------------
    7. Merge Revision...
  15. Remote - <repo name> image:submenu.png (Merging Pull, Push, Fetch and Clone items - items related to the remote repository)
    1. Clone...
    2. ---------------------------------
    3. Fetch...
    4. Fetch from Upstream...
    5. ---------------------------------
    6. Pull...
    7. Pull from Upstream...
    8. ---------------------------------
    9. Push...
    10. Push to Upstream...
  16. Revert / Recover - <repo name> image:submenu.png (Merging Revert and Recover items)
    1. Reset
    2. Revert Commit...
  17. Repository Browser
  18. ----------------------------------
  19. Shelve Changes image:submenu.png
    1. Shelve Changes...
  20. Disconnect...
  21. ----------------------------------
  22. Other VCS(s) image:submenu.png (Merging other VCS in one submenu - created 3rd level, but these items are not used very often, current VCS removed)
    1. Mercurial image:submenu.png
      1. Initialize Project...
      2. Clone Other...
    2. Subversion image:submenu.png
      1. Import Into Repository...
      2. Checkout...
    3. CVS image:submenu.png
      1. Import Into Repository...
      2. Checkout...
  23. ----------------------------------
  24. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  25. ----------------------------------
  26. Find Issues...
  27. Report Issue...
  28. ----------------------------------
  29. Create Build Job...


Mercurial

  1. image:icon_symbol.png Show Changes (renamed, icon not available yet)
  2. image:icon_symbol.png Diff
  3. image:icon_symbol.png Add (icon not available yet)
  4. image:icon_symbol.png Commit...
  5. image:icon_symbol.png Revert Modifications...
  6. image:icon_symbol.png Show Annotations
  7. image:icon_symbol.png Search History... (icon not available yet)
  8. image:icon_symbol.png Update...
  9. ----------------------------------
  10. Conflicts image:submenu.png (visible when conflict(s) appears)
    1. Resolve Conflicts...
    2. Mark as Resolved...
  11. Ignore image:submenu.png (submenu introduced)
    1. Ignore (Unignore)
    2. Exclude From Commit (Include in Commit)
  12. Patches image:submenu.png (renamed - it should be clearer to the user since all items are related to patches)
    1. Export Uncommited Changes...
    2. Export Commit...
    3. Export Changeset Bundle...
    4. ---------------------------------
    5. Apply Diff Patch...
    6. Import Changesets...
  13. ----------------------------------
  14. Branch/Tag image:submenu.png (Merging Branch, Tag and Merge items)
    1. Create Branch...
    2. Switch to Branch...
    3. Close Branch...
    4. ---------------------------------
    5. Create Tag...
    6. Manage Tags...
    7. ---------------------------------
    8. Merge Changes - <repo name>
  15. Queues image:submenu.png
    1. Diff
    2. Go to Patch...
    3. Pop All Patches - <repo name>
    4. Push All Patches - <repo name>
    5. ---------------------------------
    6. Create Patch...
    7. Refresh Patch...
    8. Finish Patches...
  16. Remote image:submenu.png (Merging Pull, Push, Fetch, Clone and Show items - related to the remote repository)
    1. Clone Other...
    2. Clone - <repo name>
    3. ---------------------------------
    4. Fetch - <repo name>
    5. ---------------------------------
    6. Pull...
    7. Pull from Default - <repo name>
    8. ---------------------------------
    9. Push...
    10. Push to Default - <repo name>
    11. ---------------------------------
    12. Incoming Changsets - <repo name>
    13. Outgoing Changsets - <repo name>
  17. Recover - <repo name> image:submenu.png
    1. Strip...
    2. Backout...
    3. Rollback
    4. Verify
  18. ----------------------------------
  19. Show View...
  20. Repository Browser
  21. ----------------------------------
  22. Properties...
  23. ----------------------------------
  24. Shelve Changes image:submenu.png
    1. Shelve Changes...
  25. Disconnect...
  26. ----------------------------------
  27. Other VCS(s) image:submenu.png (Merging other VCS in one submenu - created 3rd level, but these items are not used very often, current VCS removed)
    1. Git image:submenu.png
      1. Clone...
      2. Initialize
      3. ----------------------------------
      4. Repository Browser
    2. Subversion image:submenu.png
      1. Import Into Repository...
      2. Checkout...
    3. CVS image:submenu.png
      1. Import Into Repository...
      2. Checkout...
  28. ----------------------------------
  29. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  30. ----------------------------------
  31. Find Issues...
  32. Report Issue...
  33. ----------------------------------
  34. Create Build Job...

Subversion

  1. image:icon_symbol.png Show Changes (icon not available yet)
  2. image:icon_symbol.png Diff
  3. image:icon_symbol.png Commit...
  4. image:icon_symbol.png Revert Modifications...
  5. image:icon_symbol.png Show Annotations
  6. image:icon_symbol.png Search History... (icon not available yet)
  7. image:icon_symbol.png Update image:submenu.png
    1. Update
    2. Update to...
    3. Update with Dependencies
  8. ----------------------------------
  9. Resolve Conflicts...
  10. Ignore image:submenu.png (submenu introduced)
    1. Ignore (Unignore)
    2. Exclude From Commit (Include in Commit)
  11. Patches image:submenu.png (submenu introduced)
    1. Export Diff Patch...
    2. Apply Diff Patch...
  12. ----------------------------------
  13. Copy image:submenu.png (Merging Copy, Switch, Export and Merge items)
    1. Copy to...
    2. Switch to...
    3. Merge to...
    4. Export...
  14. Checkout...
  15. ----------------------------------
  16. Working Copy image:submenu.png (Merging items related to working copy)
    1. Relocate...
    2. Cleanup...
    3. Upgrade...
  17. Versioning Info
  18. Properties... (renamed from Svn Properties to match other VCS)
  19. ----------------------------------
  20. Shelve Changes image:submenu.png
    1. Shelve Changes...
  21. Disconnect...
  22. ----------------------------------
  23. Other VCS(s) image:submenu.png (Merging other VCS in one submenu - created 3rd level, but these items are not used very often, current VCS removed)
    1. Git image:submenu.png
      1. Clone...
      2. Initialize
      3. ----------------------------------
      4. Repository Browser
    2. Mercurial image:submenu.png
      1. Initialize Project...
      2. Clone Other...
    3. CVS image:submenu.png
      1. Import Into Repository...
      2. Checkout...
  24. ----------------------------------
  25. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  26. ----------------------------------
  27. Find Issues...
  28. Report Issue...
  29. ----------------------------------
  30. Create Build Job...


CVS

  1. image:icon_symbol.png Show Changes (icon not available yet)
  2. image:icon_symbol.png Diff
  3. image:icon_symbol.png Commit...
  4. image:icon_symbol.png Revert Modifications...
  5. image:icon_symbol.png Show Annotations
  6. image:icon_symbol.png Search History... (icon not available yet)
  7. image:icon_symbol.png Update image:submenu.png
    1. Update
    2. Update with Dependencies
  8. ----------------------------------
  9. Resolve Conflicts...
  10. Ignore image:submenu.png (submenu introduced)
    1. Ignore (Unignore)
    2. Exclude From Commit (Include in Commit)
  11. Patches image:submenu.png (submenu introduced)
    1. Export Diff Patch...
    2. Apply Diff Patch...
  12. ----------------------------------
  13. Branch/Tag image:submenu.png (Merging Branches and Tag items)
    1. Branch...
    2. Switch to Branch...
    3. Merge Changes from Branch...
    4. ---------------------------------
    5. Tag...
  14. ----------------------------------
  15. Checkout...
  16. Change CVS Root...
  17. ----------------------------------
  18. Shelve Changes image:submenu.png
    1. Shelve Changes...
  19. Disconnect...
  20. ----------------------------------
  21. Other VCS(s) image:submenu.png (Merging other VCS in one submenu - created 3rd level, but these items are not used very often, current VCS removed)
    1. Git image:submenu.png
      1. Clone...
      2. Initialize
      3. ----------------------------------
      4. Repository Browser
    2. Mercurial image:submenu.png
      1. Initialize Project...
      2. Clone Other...
    3. Subversion image:submenu.png
      1. Import Into Repository...
      2. Checkout...
  22. ----------------------------------
  23. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  24. ----------------------------------
  25. Find Issues...
  26. Report Issue...
  27. ----------------------------------
  28. Create Build Job...
Not logged in. Log in, Register

By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo