Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Sat Oct 29 16:22:35 2016 +0200
+++ b/eric6.e4p	Sat Oct 29 19:28:04 2016 +0200
@@ -576,6 +576,13 @@
     <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/HgUtilities.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/__init__.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py</Source>
@@ -1589,7 +1596,6 @@
     <Form>PluginManager/PluginInstallDialog.ui</Form>
     <Form>PluginManager/PluginRepositoryDialog.ui</Form>
     <Form>PluginManager/PluginUninstallDialog.ui</Form>
-    <Form>Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui</Form>
     <Form>Plugins/AboutPlugin/AboutDialog.ui</Form>
     <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui</Form>
     <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.ui</Form>
@@ -1641,6 +1647,9 @@
     <Form>Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui</Form>
@@ -1659,6 +1668,7 @@
     <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.ui</Form>
     <Form>Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui</Form>
@@ -1935,14 +1945,14 @@
   <Interfaces/>
   <Others>
     <Other>.hgignore</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>