Mercurial Repositories > eric / changeset
changeset
Fixed the Subversion and PySvn status commands (issue caused by latest Subversion and PySvn updates).
Mon, 09 Apr 2012 18:51:29 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 09 Apr 2012 18:51:29 +0200
- branch
- 5_2_x
- changeset 1774
- fda2bb18c3ae
- parent 1769
- 02e7e55b47f5
- child 1777
- d464bb43569d
- child 1783
- 010fd0120ef6
Fixed the Subversion and PySvn status commands (issue caused by latest Subversion and PySvn updates).
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat Apr 07 16:39:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Apr 09 18:51:29 2012 +0200 @@ -324,10 +324,10 @@ uptodate = True if file.repos_text_status != pysvn.wc_status_kind.none: uptodate = uptodate and \ - file.repos_text_status == file.text_status + file.repos_text_status != pysvn.wc_status_kind.modified if file.repos_prop_status != pysvn.wc_status_kind.none: uptodate = uptodate and \ - file.repos_prop_status == file.prop_status + file.repos_prop_status != pysvn.wc_status_kind.modified lockState = " " if file.entry is not None and \
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py Sat Apr 07 16:39:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py Mon Apr 09 18:51:29 2012 +0200 @@ -73,9 +73,11 @@ for file in allFiles: uptodate = True if file.repos_text_status != pysvn.wc_status_kind.none: - uptodate = uptodate and file.repos_text_status == file.text_status + uptodate = uptodate and \ + file.repos_text_status != pysvn.wc_status_kind.modified if file.repos_prop_status != pysvn.wc_status_kind.none: - uptodate = uptodate and file.repos_prop_status == file.prop_status + uptodate = uptodate and \ + file.repos_prop_status != pysvn.wc_status_kind.modified status = "" if not uptodate:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Apr 07 16:39:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Apr 09 18:51:29 2012 +0200 @@ -189,11 +189,11 @@ } self.rx_status = \ - QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') - # flags (8 anything), revision, changed rev, author, path + QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') + # flags (8 or 9 anything), revision, changed rev, author, path self.rx_status2 = \ - QRegExp('(.{8})\\s+(.+)\\s*') - # flags (8 anything), path + QRegExp('(.{8,9})\\s+(.+)\\s*') + # flags (8 or 9 anything), path self.rx_changelist = \ QRegExp('--- \\S+ .([\\w\\s]+).:\\s+') # three dashes, Changelist (translated), quote, @@ -488,14 +488,14 @@ path = self.rx_status.cap(5).strip() self.__generateItem(flags[0], flags[1], flags[2], flags[3], - flags[4], flags[5], flags[7], rev, + flags[4], flags[5], flags[-1], rev, change, author, path) elif self.rx_status2.exactMatch(s): flags = self.rx_status2.cap(1) path = self.rx_status2.cap(2).strip() self.__generateItem(flags[0], flags[1], flags[2], flags[3], - flags[4], flags[5], flags[7], "", "", + flags[4], flags[5], flags[-1], "", "", "", path) elif self.rx_changelist.exactMatch(s): self.currentChangelist = self.rx_changelist.cap(1)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Sat Apr 07 16:39:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Mon Apr 09 18:51:29 2012 +0200 @@ -32,9 +32,9 @@ self.__ioEncoding = Preferences.getSystem("IOEncoding") self.rx_status1 = \ - QRegExp('(.{8})\\s+([0-9-]+)\\s+(.+)\\s*') + QRegExp('(.{8,9})\\s+([0-9-]+)\\s+(.+)\\s*') self.rx_status2 = \ - QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') + QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') def _performMonitor(self): """ @@ -85,8 +85,8 @@ else: continue if flags[0] in "ACDMR" or \ - (flags[0] == " " and flags[7] == "*"): - if flags[7] == "*": + (flags[0] == " " and flags[-1] == "*"): + if flags[-1] == "*": status = "U" else: status = flags[0]
