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.java | |
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.java')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index a0e66afbb6..429e218037 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -220,6 +220,15 @@ public class UIText extends NLS { public static String GitHistoryPage_errorReadingHeadCommit; /** */ + public static String GitHistoryPage_CreatePatch; + + /** */ + public static String GitHistoryPage_Date; + + /** */ + public static String GitHistoryPage_ErrorNotWritten; + + /** */ public static String GitHistoryPage_FileNotInCommit; /** */ @@ -238,6 +247,15 @@ public class UIText extends NLS { public static String GitHistoryPage_openFailed; /** */ + public static String GitHistoryPage_seeLog; + + /** */ + public static String GitHistoryPage_From; + + /** */ + public static String GitHistoryPage_Subject; + + /** */ public static String GitProjectPropertyPage_LabelBranch; /** */ @@ -1798,6 +1816,36 @@ public class UIText extends NLS { public static String GitCreateGeneralProjectPage_ProjectNameLabel; /** */ + public static String GitCreatePatchWizard_Browse; + + /** */ + public static String GitCreatePatchWizard_Clipboard; + + /** */ + public static String GitCreatePatchWizard_CreatePatchTitle; + + /** */ + public static String GitCreatePatchWizard_File; + + /** */ + public static String GitCreatePatchWizard_GitFormat; + + /** */ + public static String GitCreatePatchWizard_InternalError; + + /** */ + public static String GitCreatePatchWizard_SelectLocationDescription; + + /** */ + public static String GitCreatePatchWizard_SelectLocationTitle; + + /** */ + public static String GitCreatePatchWizard_SelectOptionsDescription; + + /** */ + public static String GitCreatePatchWizard_SelectOptionsTitle; + + /** */ public static String GitCreateProjectViaWizardWizard_AbortedMessage; /** */ |