Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py

branch
5_2_x
changeset 1774
fda2bb18c3ae
parent 1690
273c6a70d2e3
child 2302
f29e9405c851
equal deleted inserted replaced
1769:02e7e55b47f5 1774:fda2bb18c3ae
30 VcsStatusMonitorThread.__init__(self, interval, project, vcs, parent) 30 VcsStatusMonitorThread.__init__(self, interval, project, vcs, parent)
31 31
32 self.__ioEncoding = Preferences.getSystem("IOEncoding") 32 self.__ioEncoding = Preferences.getSystem("IOEncoding")
33 33
34 self.rx_status1 = \ 34 self.rx_status1 = \
35 QRegExp('(.{8})\\s+([0-9-]+)\\s+(.+)\\s*') 35 QRegExp('(.{8,9})\\s+([0-9-]+)\\s+(.+)\\s*')
36 self.rx_status2 = \ 36 self.rx_status2 = \
37 QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') 37 QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
38 38
39 def _performMonitor(self): 39 def _performMonitor(self):
40 """ 40 """
41 Protected method implementing the monitoring action. 41 Protected method implementing the monitoring action.
42 42
83 flags = self.rx_status2.cap(1) 83 flags = self.rx_status2.cap(1)
84 path = self.rx_status2.cap(5).strip() 84 path = self.rx_status2.cap(5).strip()
85 else: 85 else:
86 continue 86 continue
87 if flags[0] in "ACDMR" or \ 87 if flags[0] in "ACDMR" or \
88 (flags[0] == " " and flags[7] == "*"): 88 (flags[0] == " " and flags[-1] == "*"):
89 if flags[7] == "*": 89 if flags[-1] == "*":
90 status = "U" 90 status = "U"
91 else: 91 else:
92 status = flags[0] 92 status = flags[0]
93 if status == "C": 93 if status == "C":
94 status = "Z" # give it highest priority 94 status = "Z" # give it highest priority

eric ide

mercurial