Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread (forgot to save the project file including the new files).

Mon, 12 Sep 2011 18:03:05 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 12 Sep 2011 18:03:05 +0200
changeset 1313
063bc4545f75
parent 1312
12506dba74dc
child 1314
7e7b88c58fda

Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread (forgot to save the project file including the new files).

eric5.e4p file | annotate | diff | comparison | revisions
diff -r 12506dba74dc -r 063bc4545f75 eric5.e4p
--- a/eric5.e4p	Fri Sep 09 19:31:51 2011 +0200
+++ b/eric5.e4p	Mon Sep 12 18:03:05 2011 +0200
@@ -929,6 +929,7 @@
     <Source>UtilitiesPython2/PySideImporter.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/HgClient.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py</Source>
   </Sources>
   <Forms>
     <Form>PyUnit/UnittestDialog.ui</Form>
@@ -1191,6 +1192,7 @@
     <Form>Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui</Form>
     <Form>Preferences/ConfigurationPages/SecurityPage.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui</Form>
   </Forms>
   <Translations>
     <Translation>i18n/eric5_cs.qm</Translation>
@@ -1369,15 +1371,15 @@
     </VcsOtherData>
   </Vcs>
   <FiletypeAssociations>
+    <FiletypeAssociation pattern="*.idl" type="INTERFACES"/>
+    <FiletypeAssociation pattern="*.py" type="SOURCES"/>
+    <FiletypeAssociation pattern="*.pyw" type="SOURCES"/>
+    <FiletypeAssociation pattern="*.qm" type="TRANSLATIONS"/>
+    <FiletypeAssociation pattern="*.qrc" type="RESOURCES"/>
     <FiletypeAssociation pattern="*.rb" type="SOURCES"/>
+    <FiletypeAssociation pattern="*.ts" type="TRANSLATIONS"/>
     <FiletypeAssociation pattern="*.ui" type="FORMS"/>
-    <FiletypeAssociation pattern="*.idl" type="INTERFACES"/>
-    <FiletypeAssociation pattern="*.qm" type="TRANSLATIONS"/>
     <FiletypeAssociation pattern="Ui_*.py" type="__IGNORE__"/>
-    <FiletypeAssociation pattern="*.qrc" type="RESOURCES"/>
-    <FiletypeAssociation pattern="*.pyw" type="SOURCES"/>
-    <FiletypeAssociation pattern="*.ts" type="TRANSLATIONS"/>
-    <FiletypeAssociation pattern="*.py" type="SOURCES"/>
   </FiletypeAssociations>
   <Documentation>
     <DocumentationParams>

eric ide

mercurial