diff options
author | Stefan Lay | 2010-05-11 15:40:16 +0000 |
---|---|---|
committer | Matthias Sohn | 2010-05-11 22:58:44 +0000 |
commit | 2dbf8ddec4a9a59954a68b7bccdfd089ef84886f (patch) | |
tree | 3be35b62a02f024bad8077bc43723a0bda9e5c54 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | |
parent | b9dca109a8302e5e7237fe00efe60f467364b378 (diff) | |
download | egit-2dbf8ddec4a9a59954a68b7bccdfd089ef84886f.tar.gz egit-2dbf8ddec4a9a59954a68b7bccdfd089ef84886f.tar.xz egit-2dbf8ddec4a9a59954a68b7bccdfd089ef84886f.zip |
Show "Create Patch..." context menu entry in history view
The menu entry is shown in history view and not in the package
explorer as in CVS. The reason is that when you use a distributed
versioning system you normally commit your local changes
to a local branch before you create a patch.
When one commit is selected in the commit list, the diff to
its parent can be saved to a file or stored in the clipboard.
The file filter of the history view is used.
It is not possible to create patch files for the first commit and
for merge commits.
Per default the wizard creates a patch with a format which can
be applied with the eclipse apply patch wizard: The paths to the
files have no prefixes (as with git format-patch --no-prefix) and
they are relative to the eclipse project and not to the repository.
There is an option to create a patch which can be applied with
"git apply" on the command line (Not yet in eclipse.).
There may be more options in the future on the Options page.
Before more options are offered the diff rendering code should
be moved to jgit.
[ms]
- fixed some style nits
- reduced initial wizard height
Bug: 297636
Change-Id: I8d53a4c7685df75887ad6ec80aeda22dbb31e01f
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index b737d6f2bb..00ceee7b1f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -84,6 +84,13 @@ GitHistoryPage_find=Find GitHistoryPage_notContainedInCommits=File {0} is not contained in the commits: {1} GitHistoryPage_open=Open GitHistoryPage_openFailed=Opening Editor failed +GitHistoryPage_seeLog=See error log for details +GitHistoryPage_CreatePatch=Create &Patch... +GitHistoryPage_Date=Date +GitHistoryPage_ErrorNotWritten=The patch file could not be written +GitHistoryPage_FileNotInCommit={0} not in {1} +GitHistoryPage_From=From +GitHistoryPage_Subject=Subject GitProjectPropertyPage_LabelBranch=Branch: GitProjectPropertyPage_LabelGitDir=Git directory: GitProjectPropertyPage_LabelId=Id: @@ -642,6 +649,16 @@ GitCreateGeneralProjectPage_FileExistsInDirMessage=A {0} file already exists in GitCreateGeneralProjectPage_FileNotDirMessage=File {0} is not a directory GitCreateGeneralProjectPage_PorjectAlreadyExistsMessage=Project {0} already exists GitCreateGeneralProjectPage_ProjectNameLabel=Project name +GitCreatePatchWizard_Browse=Browse +GitCreatePatchWizard_Clipboard=Clipboard +GitCreatePatchWizard_CreatePatchTitle=Create patch +GitCreatePatchWizard_File=File +GitCreatePatchWizard_GitFormat=Export in git patch format +GitCreatePatchWizard_InternalError=An internal error occurred. +GitCreatePatchWizard_SelectLocationDescription=Select the location to store the patch +GitCreatePatchWizard_SelectLocationTitle=Select location +GitCreatePatchWizard_SelectOptionsDescription=Select options for patch creation +GitCreatePatchWizard_SelectOptionsTitle=Select options GitCreateProjectViaWizardWizard_AbortedMessage=Action was aborted GitCreateProjectViaWizardWizard_WizardTitle=Import projects from Git Repository {0} GitImportProjectsWizard_ImportExistingProjects0=Import existing projects |