Mercurial Repositories > eric / file diff

diff: eric6.e4p

eric6.e4p

changeset 6020
baf6da1ae288
parent 6018
1c858879d3d0
child 6028
859f6894eed9
--- a/eric6.e4p	Sun Dec 10 16:43:11 2017 +0100
+++ b/eric6.e4p	Sun Dec 10 17:42:11 2017 +0100
@@ -512,6 +512,7 @@
     <Source>Plugins/PluginSyntaxChecker.py</Source>
     <Source>Plugins/PluginTabnanny.py</Source>
     <Source>Plugins/PluginTranslator.py</Source>
+    <Source>Plugins/PluginVcsGit.py</Source>
     <Source>Plugins/PluginVcsMercurial.py</Source>
     <Source>Plugins/PluginVcsPySvn.py</Source>
     <Source>Plugins/PluginVcsSubversion.py</Source>
@@ -563,6 +564,61 @@
     <Source>Plugins/UiExtensionPlugins/VirtualenvInterface/__init__.py</Source>
     <Source>Plugins/UiExtensionPlugins/__init__.py</Source>
     <Source>Plugins/VcsPlugins/__init__.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/Config.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/ConfigurationPage/__init__.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitBlameDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitBranchDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitBundleDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitCommandDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitCommitDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitCopyDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitDiffDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitDiffParser.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitFetchDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitListDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitMergeDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitPullDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitPushDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitStatusDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitTagDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitUtilities.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/ProjectHelper.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/__init__.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/git.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/Config.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/__init__.py</Source>
@@ -1736,6 +1792,50 @@
     <Form>Plugins/UiExtensionPlugins/Translator/TranslatorWidget.ui</Form>
     <Form>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvConfigurationDialog.ui</Form>
     <Form>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvExecDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitBlameDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitCopyDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitDescribeDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitFetchDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitListDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitOptionsDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitPullDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitPushDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitStashDataDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitTagDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui</Form>
@@ -2217,6 +2317,10 @@
     <Other>Plugins/UiExtensionPlugins/Translator/icons/pronounce.png</Other>
     <Other>Plugins/UiExtensionPlugins/Translator/icons/swap.png</Other>
     <Other>Plugins/UiExtensionPlugins/Translator/icons/translate.png</Other>
+    <Other>Plugins/VcsPlugins/vcsGit/icons/conflict.png</Other>
+    <Other>Plugins/VcsPlugins/vcsGit/icons/git.png</Other>
+    <Other>Plugins/VcsPlugins/vcsGit/icons/git92.png</Other>
+    <Other>Plugins/VcsPlugins/vcsGit/icons/preferences-git.png</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/icons/mercurial.png</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.png</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other>

Mercurial Repository: eric

eric ide

mercurial