UEXTeamMenu

(Difference between revisions)
 
(20 intermediate revisions not shown)
Line 1: Line 1:
-
Proposed changes in team menu by Ondra Vrabec and Jan Peška. The goal is to decrease number of top level menu items and reorganize them so ordering is similar in every VCS.
+
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:
 +
 
 +
# 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|GIT]]'''
 +
# 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|Mercurial]]'''
== GIT ==
== GIT ==
Line 7: Line 12:
# [[image:icon_symbol.png]] Add              ''(icon not available yet)''
# [[image:icon_symbol.png]] Add              ''(icon not available yet)''
# [[image:icon_symbol.png]] Commit...
# [[image:icon_symbol.png]] Commit...
 +
# Checkout  [[image:submenu.png]]
 +
## Revision - <repo name>...
 +
## Files...
# [[image:icon_symbol.png]] Revert Modifications...
# [[image:icon_symbol.png]] Revert Modifications...
# [[image:icon_symbol.png]] Show Annotations
# [[image:icon_symbol.png]] Show Annotations
# [[image:icon_symbol.png]] Search History... ''(icon not available yet)''
# [[image:icon_symbol.png]] Search History... ''(icon not available yet)''
-
# Checkout  [[image:submenu.png]]
 
-
## Revision...
 
-
## Files...
 
-
# ----------------------------------
 
# Resolve Conflicts                          ''(not visible right now, bug?)''
# Resolve Conflicts                          ''(not visible right now, bug?)''
 +
# ----------------------------------
# Ignore  [[image:submenu.png]]              ''(submenu introduced)''
# Ignore  [[image:submenu.png]]              ''(submenu introduced)''
## Ignore (Unignore)
## Ignore (Unignore)
Line 20: Line 25:
# Patches  [[image:submenu.png]]              ''(renamed - it should be clearer to the user since all items are related to patches)''
# Patches  [[image:submenu.png]]              ''(renamed - it should be clearer to the user since all items are related to patches)''
## Export Uncommited Changes...
## Export Uncommited Changes...
-
## Export Commit...
+
## Export Commit - <repo name>...
 +
## ---------------------------------
 +
## Apply Diff Patch...
# ----------------------------------
# ----------------------------------
-
# Branch/Tag  [[image:submenu.png]]          ''(Merging Branch, Tag and Merge items)''
+
# Branch/Tag - <repo name> [[image:submenu.png]]          ''(Merging Branch, Tag and Merge items)''
## Create Branch...
## Create Branch...
## Switch to Branch...
## Switch to Branch...
Line 30: Line 37:
## ---------------------------------
## ---------------------------------
## Merge Revision...
## Merge Revision...
-
# Remote  [[image:submenu.png]]              ''(Merging Pull, Push, Fetch and Clone items - items related to the remote repository)''
+
# Remote - <repo name> [[image:submenu.png]]              ''(Merging Pull, Push, Fetch and Clone items - items related to the remote repository)''
## Clone...
## Clone...
## ---------------------------------
## ---------------------------------
Line 41: Line 48:
## Push...
## Push...
## Push to Upstream...
## Push to Upstream...
-
# Revert / Recover  [[image:submenu.png]]    ''(Merging Revert and Recover items)''
+
# Revert / Recover - <repo name> [[image:submenu.png]]    ''(Merging Revert and Recover items)''
## Reset
## Reset
## Revert Commit...
## Revert Commit...
# Repository Browser
# Repository Browser
# ----------------------------------
# ----------------------------------
 +
# Shelve Changes  [[image:submenu.png]]       
 +
## Shelve Changes...                   
# Disconnect...
# Disconnect...
# ----------------------------------
# ----------------------------------
Line 58: Line 67:
### Import Into Repository...
### Import Into Repository...
### Checkout...
### Checkout...
 +
# ----------------------------------
 +
# Team Server  [[image:submenu.png]]
# ----------------------------------
# ----------------------------------
# History  [[image:submenu.png]]
# History  [[image:submenu.png]]
Line 75: Line 86:
# [[image:icon_symbol.png]] Add                    ''(icon not available yet)''
# [[image:icon_symbol.png]] Add                    ''(icon not available yet)''
# [[image:icon_symbol.png]] Commit...
# [[image:icon_symbol.png]] Commit...
 +
# [[image:icon_symbol.png]] Update...
# [[image:icon_symbol.png]] Revert Modifications...
# [[image:icon_symbol.png]] Revert Modifications...
# [[image:icon_symbol.png]] Show Annotations
# [[image:icon_symbol.png]] Show Annotations
# [[image:icon_symbol.png]] Search History...      ''(icon not available yet)''
# [[image:icon_symbol.png]] Search History...      ''(icon not available yet)''
-
# [[image:icon_symbol.png]] Update...
 
-
# ----------------------------------
 
# Conflicts  [[image:submenu.png]]                  ''(visible when conflict(s) appears)''
# Conflicts  [[image:submenu.png]]                  ''(visible when conflict(s) appears)''
## Resolve Conflicts...
## Resolve Conflicts...
## Mark as Resolved...
## Mark as Resolved...
 +
# ----------------------------------
# Ignore  [[image:submenu.png]]                    ''(submenu introduced)''
# Ignore  [[image:submenu.png]]                    ''(submenu introduced)''
## Ignore (Unignore)
## Ignore (Unignore)
Line 91: Line 102:
## Export Changeset Bundle...
## Export Changeset Bundle...
## ---------------------------------
## ---------------------------------
 +
## Apply Diff Patch...
## Import Changesets...
## Import Changesets...
# ----------------------------------
# ----------------------------------
Line 101: Line 113:
## Manage Tags...
## Manage Tags...
## ---------------------------------
## ---------------------------------
-
## Merge Changes
+
## Merge Changes - <repo name> 
# Queues  [[image:submenu.png]]
# Queues  [[image:submenu.png]]
## Diff
## Diff
## Go to Patch...
## Go to Patch...
-
## Pop All Patches
+
## Pop All Patches - <repo name>
-
## Push All Patches
+
## Push All Patches - <repo name>
## ---------------------------------
## ---------------------------------
## Create Patch...
## Create Patch...
## Refresh Patch...
## Refresh Patch...
## Finish Patches...
## Finish Patches...
-
# Remote  [[image:submenu.png]]                    ''(Merging Pull, Push, Fetch and Clone items - related to the remote repository)''
+
# Remote  [[image:submenu.png]]                    ''(Merging Pull, Push, Fetch, Clone and Show items - related to the remote repository)''
-
## Clone...
+
## Clone Other...
-
## ---------------------------------
+
## Clone - <repo name>
-
## Fetch...
+
-
## Fetch from Upstream...
+
## ---------------------------------
## ---------------------------------
 +
## Pull Current Branch - <repo name>
 +
## Pull All Branches - <repo name>
## Pull...
## Pull...
-
## Pull from Upstream...
 
## ---------------------------------
## ---------------------------------
 +
## Push Current Branch - <repo name>
 +
## Push All Branches - <repo name>
## Push...
## Push...
-
## Push to Upstream...
+
## ---------------------------------
-
# Recover  [[image:submenu.png]]
+
## Fetch - <repo name>
 +
## ---------------------------------
 +
## Incoming Changsets - <repo name>
 +
## Outgoing Changsets - <repo name>
 +
# Recover - <repo name> [[image:submenu.png]]
## Strip...
## Strip...
## Backout...
## Backout...
Line 128: Line 145:
## Verify
## Verify
# ----------------------------------
# ----------------------------------
-
# Show
+
# Show View...
-
## Show Incoming
+
-
## Show Out
+
-
## View...
+
# Repository Browser
# Repository Browser
# ----------------------------------
# ----------------------------------
# Properties...
# Properties...
# ----------------------------------
# ----------------------------------
 +
# Shelve Changes  [[image:submenu.png]]       
 +
## Shelve Changes...                   
# Disconnect...
# Disconnect...
# ----------------------------------
# ----------------------------------
Line 150: Line 166:
### Import Into Repository...
### Import Into Repository...
### Checkout...
### Checkout...
 +
# ----------------------------------
 +
# Team Server  [[image:submenu.png]]
# ----------------------------------
# ----------------------------------
# History  [[image:submenu.png]]
# History  [[image:submenu.png]]
Line 159: Line 177:
# ----------------------------------
# ----------------------------------
# Create Build Job...
# Create Build Job...
-
 
== Subversion ==
== Subversion ==
Line 166: Line 183:
# [[image:icon_symbol.png]] Diff
# [[image:icon_symbol.png]] Diff
# [[image:icon_symbol.png]] Commit...
# [[image:icon_symbol.png]] Commit...
-
# [[image:icon_symbol.png]] Revert Modifications...
 
-
# [[image:icon_symbol.png]] Show Annotations
 
-
# [[image:icon_symbol.png]] Search History...      ''(icon not available yet)''
 
# [[image:icon_symbol.png]] Update  [[image:submenu.png]]
# [[image:icon_symbol.png]] Update  [[image:submenu.png]]
-
## Update
+
## Update to HEAD
## Update to...
## Update to...
## Update with Dependencies
## Update with Dependencies
-
# ----------------------------------
+
# [[image:icon_symbol.png]] Revert Modifications...
 +
# [[image:icon_symbol.png]] Show Annotations
 +
# [[image:icon_symbol.png]] Search History...      ''(icon not available yet)''
# Resolve Conflicts...
# Resolve Conflicts...
 +
# ----------------------------------
# Ignore  [[image:submenu.png]]                    ''(submenu introduced)''
# Ignore  [[image:submenu.png]]                    ''(submenu introduced)''
## Ignore (Unignore)
## Ignore (Unignore)
## Exclude From Commit  (Include in Commit)
## Exclude From Commit  (Include in Commit)
# Patches  [[image:submenu.png]]                    ''(submenu introduced)''
# Patches  [[image:submenu.png]]                    ''(submenu introduced)''
-
## Export Diff Patch...
+
## Export Unsubmitted Changes...                   ''(renamed)''
## Apply Diff Patch...
## Apply Diff Patch...
# ----------------------------------
# ----------------------------------
Line 212: Line 229:
### Import Into Repository...
### Import Into Repository...
### Checkout...
### Checkout...
 +
# ----------------------------------
 +
# Team Server  [[image:submenu.png]]
# ----------------------------------
# ----------------------------------
# History  [[image:submenu.png]]
# History  [[image:submenu.png]]
Line 221: Line 240:
# ----------------------------------
# ----------------------------------
# Create Build Job...
# Create Build Job...
-
 
-
 
== CVS ==
== CVS ==
Line 229: Line 246:
# [[image:icon_symbol.png]] Diff
# [[image:icon_symbol.png]] Diff
# [[image:icon_symbol.png]] Commit...
# [[image:icon_symbol.png]] Commit...
 +
# [[image:icon_symbol.png]] Update  [[image:submenu.png]]
 +
## Update
 +
## Update with Dependencies
# [[image:icon_symbol.png]] Revert Modifications...
# [[image:icon_symbol.png]] Revert Modifications...
# [[image:icon_symbol.png]] Show Annotations
# [[image:icon_symbol.png]] Show Annotations
# [[image:icon_symbol.png]] Search History...      ''(icon not available yet)''
# [[image:icon_symbol.png]] Search History...      ''(icon not available yet)''
-
# [[image:icon_symbol.png]] Update  [[image:submenu.png]]
+
# View Revision...
-
## Update
+
-
## Update with Dependencies
+
-
# ----------------------------------
+
# Resolve Conflicts...
# Resolve Conflicts...
 +
# ----------------------------------
# Ignore  [[image:submenu.png]]                    ''(submenu introduced)''
# Ignore  [[image:submenu.png]]                    ''(submenu introduced)''
## Ignore (Unignore)
## Ignore (Unignore)
## Exclude From Commit  (Include in Commit)
## Exclude From Commit  (Include in Commit)
# Patches  [[image:submenu.png]]                    ''(submenu introduced)''
# Patches  [[image:submenu.png]]                    ''(submenu introduced)''
-
## Export Diff Patch...
+
## Export Unsubmitted Changes...                             ''(renamed)''
## Apply Diff Patch...
## Apply Diff Patch...
# ----------------------------------
# ----------------------------------
-
# '''Branch/Tag''' [[image:submenu.png]]                ''(Merging Branches and Tag items)''
+
# Branch/Tag  [[image:submenu.png]]                ''(Merging Branches and Tag items)''
## Branch...
## Branch...
## Switch to Branch...
## Switch to Branch...
Line 270: Line 288:
### Import Into Repository...
### Import Into Repository...
### Checkout...
### Checkout...
 +
# ----------------------------------
 +
# Team Server  [[image:submenu.png]]
# ----------------------------------
# ----------------------------------
# History  [[image:submenu.png]]
# History  [[image:submenu.png]]

Current revision as of 12:29, 23 July 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. Checkout image:submenu.png
    1. Revision - <repo name>...
    2. Files...
  6. image:icon_symbol.png Revert Modifications...
  7. image:icon_symbol.png Show Annotations
  8. image:icon_symbol.png Search History... (icon not available yet)
  9. Resolve Conflicts (not visible right now, bug?)
  10. ----------------------------------
  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. Team Server image:submenu.png
  25. ----------------------------------
  26. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  27. ----------------------------------
  28. Find Issues...
  29. Report Issue...
  30. ----------------------------------
  31. 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 Update...
  6. image:icon_symbol.png Revert Modifications...
  7. image:icon_symbol.png Show Annotations
  8. image:icon_symbol.png Search History... (icon not available yet)
  9. Conflicts image:submenu.png (visible when conflict(s) appears)
    1. Resolve Conflicts...
    2. Mark as Resolved...
  10. ----------------------------------
  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. Pull Current Branch - <repo name>
    5. Pull All Branches - <repo name>
    6. Pull...
    7. ---------------------------------
    8. Push Current Branch - <repo name>
    9. Push All Branches - <repo name>
    10. Push...
    11. ---------------------------------
    12. Fetch - <repo name>
    13. ---------------------------------
    14. Incoming Changsets - <repo name>
    15. 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. Team Server image:submenu.png
  30. ----------------------------------
  31. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  32. ----------------------------------
  33. Find Issues...
  34. Report Issue...
  35. ----------------------------------
  36. 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 Update image:submenu.png
    1. Update to HEAD
    2. Update to...
    3. Update with Dependencies
  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. Resolve Conflicts...
  9. ----------------------------------
  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 Unsubmitted Changes... (renamed)
    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. Team Server image:submenu.png
  26. ----------------------------------
  27. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  28. ----------------------------------
  29. Find Issues...
  30. Report Issue...
  31. ----------------------------------
  32. 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 Update image:submenu.png
    1. Update
    2. Update with Dependencies
  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. View Revision...
  9. Resolve Conflicts...
  10. ----------------------------------
  11. Ignore image:submenu.png (submenu introduced)
    1. Ignore (Unignore)
    2. Exclude From Commit (Include in Commit)
  12. Patches image:submenu.png (submenu introduced)
    1. Export Unsubmitted Changes... (renamed)
    2. Apply Diff Patch...
  13. ----------------------------------
  14. Branch/Tag image:submenu.png (Merging Branches and Tag items)
    1. Branch...
    2. Switch to Branch...
    3. Merge Changes from Branch...
    4. ---------------------------------
    5. Tag...
  15. ----------------------------------
  16. Checkout...
  17. Change CVS Root...
  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. 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...
  23. ----------------------------------
  24. Team Server image:submenu.png
  25. ----------------------------------
  26. History image:submenu.png
    1. Show History
    2. Revert Deleted Files
  27. ----------------------------------
  28. Find Issues...
  29. Report Issue...
  30. ----------------------------------
  31. 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