Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Jan 30 15:47:10 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sat Jan 30 16:07:16 2010 +0000
@@ -230,7 +230,6 @@
         opts = self.vcs.options['global'] + self.vcs.options['status']
         verbose = "--verbose" in opts
         recurse = "--non-recursive" not in opts
-        ignore = True # "--ignore" not in opts
         update = "--show-updates" in opts
         
         locker = QMutexLocker(self.vcs.vcsExecutionMutex)
@@ -253,7 +252,7 @@
                 
                 # step 2: determine status of files
                 allFiles = self.client.status(name, recurse = recurse, get_all = verbose, 
-                                              ignore = ignore, update = update)
+                                              ignore = True, update = update)
                 counter = 0
                 for file in allFiles:
                     uptodate = True
@@ -599,4 +598,4 @@
         for itm in self.statusList.selectedItems():
             if not itm.text(self.__changelistColumn):
                 clitems.append(itm)
-        return clitems
\ No newline at end of file
+        return clitems

--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Jan 30 15:47:10 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Jan 30 16:07:16 2010 +0000
@@ -646,7 +646,7 @@
         opts = self.options['global'] + self.options['add']
         recurse = False
         force = "--force" in opts or noDialog
-        ignore = "--ignore" in opts
+        noignore = "--no-ignore" in opts
         client = self.getClient()
         if not noDialog:
             dlg = \
@@ -654,12 +654,12 @@
                     self.trUtf8('Adding files/directories to the Subversion repository'),
                         "add --non-recursive%s%s %s" % \
                             (force and " --force" or "",
-                             ignore and " --ignore" or "",
+                             noignore and " --no-ignore" or "",
                              " ".join(names)),
                     client)
             QApplication.processEvents()
         try:
-            client.add(names, recurse = recurse, force = force, ignore = ignore)
+            client.add(names, recurse = recurse, force = force, ignore = not noignore)
         except pysvn.ClientError as e:
             if not noDialog:
                 dlg.showError(e.args[0])