Skip to content

Extended Graphical Diff Functionality #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claytonlemons wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extended Graphical Diff Functionality #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions Context.sublime-menu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
},
{
"command": "perforce_create_changelist",
"caption": "Create Changelist"
"caption": "Create Changelist"
},
{
"command": "perforce_delete",
"caption": "Delete"
"caption": "Delete"
},
{
"command": "perforce_diff",
Expand All @@ -43,21 +43,41 @@
[
{
"command": "perforce_graphical_diff_with_depot",
"caption": "Diff"
"caption": "Diff Against Have Revision",
"args":
{
"target_revision": "have"
}
},
{
"command": "perforce_graphical_diff_with_depot",
"caption": "Diff Against Latest Revision",
"args":
{
"target_revision": "head"
}
},
{
"command": "perforce_graphical_diff_with_depot",
"caption": "Diff Against Specific Revision",
"args":
{
"target_revision": "specific_revision"
}
},
{
"command": "perforce_select_graphical_diff_application",
"caption": "Select Diff Application"
}
]
},
},
{
"command": "perforce_list_checked_out_files",
"caption": "List Checked Out Files"
},
{
"command": "perforce_move_current_file_to_changelist",
"caption": "Move Current File To Changelist"
"caption": "Move Current File To Changelist"
},
{
"command": "perforce_rename",
Expand Down Expand Up @@ -85,6 +105,10 @@
}
]
},
{
"command": "perforce_show_revisions_list",
"caption": "Show Revisions List"
},
{
"command": "perforce_logout",
"caption": "Logout"
Expand Down
28 changes: 26 additions & 2 deletions Default.sublime-commands
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,28 @@
"command": "perforce_diff"
},
{
"caption": "Perforce: Graphical Diff with Depot",
"command": "perforce_graphical_diff_with_depot"
"caption": "Perforce: Diff Against Have Revision",
"command": "perforce_graphical_diff_with_depot",
"args":
{
"target_revision": "have"
}
},
{
"caption": "Perforce: Diff Against Latest Revision",
"command": "perforce_graphical_diff_with_depot",
"args":
{
"target_revision": "head"
}
},
{
"caption": "Perforce: Diff Against Specific Revision",
"command": "perforce_graphical_diff_with_depot",
"args":
{
"target_revision": "specific_revision"
}
},
{
"caption": "Perforce: Select Graphical Diff Application",
Expand Down Expand Up @@ -66,5 +86,9 @@
{
"caption": "Perforce: Unshelve Changelist",
"command": "perforce_unshelve_cl"
},
{
"caption": "Perforce: Show Revisions List",
"command": "perforce_show_revisions_list"
}
]
32 changes: 28 additions & 4 deletions Main.sublime-menu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
},
{
"command": "perforce_create_changelist",
"caption": "Create Changelist"
"caption": "Create Changelist"
},
{
"command": "perforce_delete",
"caption": "Delete"
"caption": "Delete"
},
{
"command": "perforce_diff",
Expand All @@ -45,7 +45,27 @@
[
{
"command": "perforce_graphical_diff_with_depot",
"caption": "Diff"
"caption": "Diff Against Have Revision",
"args":
{
"target_revision": "have"
}
},
{
"command": "perforce_graphical_diff_with_depot",
"caption": "Diff Against Latest Revision",
"args":
{
"target_revision": "head"
}
},
{
"command": "perforce_graphical_diff_with_depot",
"caption": "Diff Against Specific Revision",
"args":
{
"target_revision": "specific_revision"
}
},
{
"command": "perforce_select_graphical_diff_application",
Expand All @@ -59,7 +79,7 @@
},
{
"command": "perforce_move_current_file_to_changelist",
"caption": "Move Current File To Changelist"
"caption": "Move Current File To Changelist"
},
{
"command": "perforce_rename",
Expand Down Expand Up @@ -87,6 +107,10 @@
}
]
},
{
"command": "perforce_show_revisions_list",
"caption": "Show Revisions List"
},
{
"command": "perforce_logout",
"caption": "Logout"
Expand Down
Loading