eric: comparison Plugins/VcsPlugins/vcsPySvn/subversion.py

-:0a02c433f52d
+:5883ce99ee12
 rev = None
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
-rev and dlg.showMessage(self.trUtf8("Imported revision {0}.\n")\
+rev and dlg.showMessage(self.trUtf8("Imported revision {0}.\n")
 .format(rev.number))
 dlg.finish()
 dlg.exec_()
 os.chdir(cwd)
 shutil.rmtree(tmpDir, True)
 if not noDialog:
 dlg = SvnDialog(
 self.trUtf8('Checking project out of Subversion repository'),
 "checkout{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.checkout(url, projectDir, recurse)
 client = self.getClient()
 dlg = SvnDialog(
 self.trUtf8('Exporting project from Subversion repository'),
 "export --force{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.export(url, projectDir, force=True, recurse=recurse)
 # check for commit of the project
 if os.path.isdir(nam):
 project = e5App().getObject("Project")
 if nam == project.getProjectPath():
 ok &= project.checkAllScriptsDirty(
 reportSyntaxErrors=True) and \
 project.checkDirty()
 continue
 elif os.path.isfile(nam):
 editor = e5App().getObject("ViewManager")\
 .getOpenEditor(nam)
 if editor:
 self.trUtf8('Commiting changes to Subversion repository'),
 "commit{0}{1}{2}{3} --message {4} {5}".format(
 (not recurse) and " --non-recursive" or "",
 keeplocks and " --keep-locks" or "",
 keepChangelists and " --keep-changelists" or "",
-changelists and \
+changelists and
 " --changelist ".join([""] + changelists) or "",
 msg, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 if changelists:
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
 while os.path.normcase(dname) != os.path.normcase(repodir) and \
-(os.path.normcase(dname) not in self.statusCache or \
+(os.path.normcase(dname) not in self.statusCache or
 self.statusCache[os.path.normcase(dname)] ==
 self.canBeAdded):
 # add directories recursively, if they aren't in the
 # repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
 while os.path.normcase(d) != \
 os.path.normcase(repodir) and \
 (d not in tree2 + tree) and \
-(os.path.normcase(d) not in self.statusCache or \
+(os.path.normcase(d) not in self.statusCache or
 self.statusCache[os.path.normcase(d)] ==
 self.canBeAdded):
 tree2.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
 while os.path.normcase(d) != \
 os.path.normcase(repodir) and \
 (d not in tree) and \
-(os.path.normcase(d) not in self.statusCache or \
+(os.path.normcase(d) not in self.statusCache or
 self.statusCache[os.path.normcase(d)] ==
 self.canBeAdded):
 tree.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
 while os.path.normcase(dname) != \
 os.path.normcase(repodir) and \
-(os.path.normcase(dname) not in self.statusCache or \
+(os.path.normcase(dname) not in self.statusCache or
 self.statusCache[os.path.normcase(dname)] ==
 self.canBeAdded):
 # add directories recursively, if they aren't in the
 # repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 target = target
 if not noDialog:
 dlg = \
 SvnDialog(
 self.trUtf8('Moving {0}').format(name),
 "move{0}{1} {2} {3}".format(
 force and " --force" or "",
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.move(name, target, force=force)
 """
 Public method used to view the difference of a file/directory to the
 Subversion repository.
 If name is a directory and is the project directory, all project files
 are saved first. If name is a file (or list of files), which is/are
 being edited and has unsaved modification, they can be saved or the
 operation may be aborted.
 @param name file/directory name to be diffed (string)
 """
 rev2 = ""
 client = self.getClient()
 dlg = \
 SvnDialog(
 self.trUtf8('Merging {0}').format(name),
 "merge{0}{1} {2} {3} {4}".format(
 (not recurse) and " --non-recursive" or "",
 force and " --force" or "",
 "{0}{1}".format(url1, rev1 and ("@" + rev1) or ""),
 "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""),
 fname),
 client)
 QApplication.processEvents()
 try:
 client.merge(url1, revision1, url2, revision2, fname,
 recurse=recurse, force=force)
 mixin._clientSslServerTrustPromptCallback
 try:
 locker = QMutexLocker(self.vcsExecutionMutex)
 allFiles = client.status(dname, recurse=True, get_all=True,
 ignore=True, update=False)
 locker.unlock()
 dirs = [x for x in names.keys() if os.path.isdir(x)]
 for file in allFiles:
 name = os.path.normcase(file.path)
 if file.is_versioned:
 if name in names:
 names[name] = self.canBeCommitted
 dn = name
 while os.path.splitdrive(dn)[1] != os.sep and \
 dn != repodir:
 dn = os.path.dirname(dn)
 if dn in self.statusCache and \
 self.statusCache[dn] == self.canBeCommitted:
 break
 self.statusCache[dn] = self.canBeCommitted
 mixin._clientSslServerTrustPromptCallback
 try:
 locker = QMutexLocker(self.vcsExecutionMutex)
 allFiles = client.status(dname, recurse=True, get_all=True,
 ignore=True, update=False)
 locker.unlock()
 for file in allFiles:
 name = os.path.normcase(file.path)
 if file.is_versioned:
 if name in names:
 """<tr><td><b>Committed revision</b></td><td>{5}</td></tr>"""
 """<tr><td><b>Committed date</b></td><td>{6}</td></tr>"""
 """<tr><td><b>Comitted time</b></td><td>{7}</td></tr>"""
 """<tr><td><b>Last author</b></td><td>{8}</td></tr>"""
 """</table>"""
 )\
 .format(".".join([str(v) for v in pysvn.version]),
 ".".join([str(v) for v in pysvn.svn_version[:3]]),
 apiVersion,
 entry.url,
 entry.revision.number,
 time.strftime(
 "%Y-%m-%d", time.localtime(entry.commit_time)),
 time.strftime(
 "%H:%M:%S %Z", time.localtime(entry.commit_time)),
 entry.commit_author
 )
 ###########################################################################
 ## Public Subversion specific methods are below.
 ###########################################################################
 log = ""
 target = target
 dlg = \
 SvnDialog(
 self.trUtf8('Copying {0}').format(name),
 "copy{0} {1} {2}".format(
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.copy(name, target)
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(
 self.trUtf8('Subversion Set Property'),
 "propset{0}{1} {2} {3} {4}".format(
 recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, propValue,
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 for name in fnames:
 client.propset(propName, propValue, name,
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
 SvnDialog(
 self.trUtf8('Subversion Delete Property'),
 "propdel{0}{1} {2} {3}".format(
 recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 for name in fnames:
 client.propdel(propName, name,
 E5MessageBox.critical(
 self.__ui,
 self.trUtf8("Subversion Side-by-Side Difference"),
 self.trUtf8(
 """<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 return
 if self.sbsDiff is None:
 from UI.CompareDialog import CompareDialog
 self.sbsDiff = CompareDialog()
 os.chdir(dname)
 client = self.getClient()
 dlg = \
 SvnDialog(
 self.trUtf8('Locking in the Subversion repository'),
 "lock{0}{1} {2}".format(
 stealIt and " --force" or "",
 comment and (" --message {0}".format(comment)) or "",
 " ".join(fnames)),
 client, parent=parent)
 QApplication.processEvents()
 try:
 client.lock(fnames, comment, force=stealIt)
 except pysvn.ClientError as e:
 os.chdir(dname)
 client = self.getClient()
 dlg = \
 SvnDialog(
 self.trUtf8('Unlocking in the Subversion repository'),
 "unlock{0} {1}".format(
 breakIt and " --force" or "",
 " ".join(fnames)),
 client, parent=parent)
 QApplication.processEvents()
 try:
 client.unlock(fnames, force=breakIt)
 except pysvn.ClientError as e:
 helper.setObjects(self, project)
 self.__wcng = \
 os.path.exists(
 os.path.join(project.getProjectPath(), ".svn", "format")) or \
 os.path.exists(
-os.path.join(project.getProjectPath(), "_svn", "format"))
+os.path.join(project.getProjectPath(), "_svn", "format")) or \
+os.path.exists(
+os.path.join(project.getProjectPath(), ".svn", "wc.db")) or \
+os.path.exists(
+os.path.join(project.getProjectPath(), "_svn", "wc.db"))
 return helper
 ###########################################################################
 ##  Status Monitor Thread methods
 ###########################################################################

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py

Plugins/VcsPlugins/vcsPySvn/subversion.py