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

-:e35d2cda9a74
+:b3d966393ba9
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
 svnUrl = '{0}/trunk'.format(vcsDir)
 else:
 if not tag.startswith('tags') and not tag.startswith('branches'):
-type_, ok = QInputDialog.getItem(\
+type_, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Subversion Checkout"),
 self.trUtf8("The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 " Please select from the list."),
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
 svnUrl = '{0}/trunk'.format(vcsDir)
 else:
 if not tag.startswith('tags') and not tag.startswith('branches'):
-type_, ok = QInputDialog.getItem(\
+type_, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Subversion Export"),
 self.trUtf8("The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 " Please select from the list."),
 force = "--force" in opts or noDialog
 noignore = "--no-ignore" in opts
 client = self.getClient()
 if not noDialog:
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Adding files/directories to the Subversion repository'),
 "add --non-recursive{0}{1} {2}".format(
 force and " --force" or "",
 noignore and " --no-ignore" or "",
 " ".join(names)),
 recurse = True
 force = "--force" in opts
 ignore = "--ignore" in opts
 client = self.getClient()
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Adding directory trees to the Subversion repository'),
 "add{0}{1} {2}".format(
 force and " --force" or "",
 ignore and " --ignore" or "",
 " ".join(names)),
 opts = self.options['global'] + self.options['remove']
 force = "--force" in opts or noDialog
 client = self.getClient()
 if not noDialog:
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Removing files/directories from the Subversion repository'),
 "remove{0} {1}".format(
 force and " --force" or "",
 " ".join(name)),
 client)
 else:
 log = ""
 target = target
 if not noDialog:
 dlg = \
-SvnDialog(\
+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 = self.getClient()
 rev = None
 if tagOp in [1, 2]:
 log = 'Created tag <{0}>'.format(self.tagName)
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Tagging {0} in the Subversion repository').format(name),
 "copy --message {0} {1} {2}".format(log, reposURL, url),
 client, log = log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 dlg.showError(e.args[0])
 locker.unlock()
 else:
 log = 'Deleted tag <{0}>'.format(self.tagName)
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Tagging {0} in the Subversion repository').format(name),
 "remove --message {0} {1}".format(log, url),
 client, log = log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.remove(url)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
-rev and dlg.showMessage(\
+rev and dlg.showMessage(
 self.trUtf8("Revision {0}.\n").format(rev.number))
 dlg.finish()
 dlg.exec_()
 def vcsRevert(self, name):
 url2 = urlrev2
 revision2 = pysvn.Revision(pysvn.opt_revision_kind.unspecified)
 rev2 = ""
 client = self.getClient()
 dlg = \
-SvnDialog(\
+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 ""),
 log = "Copying {0} to {1}".format(name, target)
 else:
 log = ""
 target = target
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Copying {0}').format(name),
 "copy{0} {1} {2}".format(
 log and (" --message {0}".format(log)) or "",
 name, target),
 client, log = log)
 os.chdir(dname)
 opts = self.options['global']
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Subversion Set Property'),
 "propset{0}{1} {2} {3} {4}".format(
 recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, propValue,
 os.chdir(dname)
 opts = self.options['global']
 skipchecks = "--skip-checks" in opts
 client = self.getClient()
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Subversion Delete Property'),
 "propdel{0}{1} {2} {3}".format(
 recurse and " --recurse" or "",
 skipchecks and " --skip-checks" or "",
 propName, " ".join(fnames)),
 Public method used to view the (limited) log of a file/directory from the
 Subversion repository.
 @param name file/directory name to show the log of (string)
 """
-noEntries, ok = QInputDialog.getInteger(\
+noEntries, ok = QInputDialog.getInteger(
 None,
 self.trUtf8("Subversion Log"),
 self.trUtf8("Select number of entries to show."),
 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1)
 if ok:
 @param name file/directory name to be locked (string or list of strings)
 @param stealIt flag indicating a forced operation (boolean)
 @param parent reference to the parent object of the subversion dialog (QWidget)
 """
-comment, ok = QInputDialog.getText(\
+comment, ok = QInputDialog.getText(
 None,
 self.trUtf8("Subversion Lock"),
 self.trUtf8("Enter lock comment"),
 QLineEdit.Normal)
 locker = QMutexLocker(self.vcsExecutionMutex)
 cwd = os.getcwd()
 os.chdir(dname)
 client = self.getClient()
 dlg = \
-SvnDialog(\
+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)),
 locker = QMutexLocker(self.vcsExecutionMutex)
 cwd = os.getcwd()
 os.chdir(dname)
 client = self.getClient()
 dlg = \
-SvnDialog(\
+SvnDialog(
 self.trUtf8('Unlocking in the Subversion repository'),
 "unlock{0} {1}".format(
 breakIt and " --force" or "",
 " ".join(fnames)),
 client, parent = parent)
 url = self.svnGetReposName(projectPath)
 else:
 url = None
 if url is None:
-url, ok = QInputDialog.getText(\
+url, ok = QInputDialog.getText(
 None,
 self.trUtf8("Repository Browser"),
 self.trUtf8("Enter the repository URL."),
 QLineEdit.Normal)
 if not ok or not url:
 (string)
 """
 if not isinstance(names, list):
 names = [names]
-clname, ok = QInputDialog.getText(\
+clname, ok = QInputDialog.getText(
 None,
 self.trUtf8("Add to changelist"),
 self.trUtf8("Enter name of the changelist:"),
 QLineEdit.Normal)
 if not ok or not clname:

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py

Plugins/VcsPlugins/vcsPySvn/subversion.py