eric: comparison eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

-:866adc8c315b
+:0acf98cd089a
 self.__revs = nextRevs
 return col, color, edges
 def __generateIcon(self, column, color, bottomedges, topedges, dotColor,
-currentRev, closed, isDraft):
+currentRev, closed, isPushableDraft):
 """
 Private method to generate an icon containing the revision tree for the
 given data.
 @param column column index of the revision
 current revision
 @type bool
 @param closed flag indicating to draw an icon for a closed
 branch
 @type bool
-@param isDraft flag indicating an entry of phase 'draft'
+@param isPushableDraft flag indicating an entry of phase 'draft',
+that can by pushed
 @type bool
 @return icon for the node
 @rtype QIcon
 """
 def col2x(col, radius):
 QPoint(dot_x + offset, dot_y),
 QPoint(dot_x, dot_y + 2 * offset),
 QPoint(dot_x + 2 * offset, dot_y + 2 * offset)
 )
 else:
-if isDraft:
+if isPushableDraft:
-# 'draft' phase: draw an up arrow like outgoing
+# 'draft' phase: draw an up arrow like outgoing,
+# if it can be pushed
 offset = radius // 2
 painter.drawConvexPolygon(
 QPoint(dot_x + offset, dot_y),
 QPoint(dot_x, dot_y + 2 * offset),
 QPoint(dot_x + 2 * offset, dot_y + 2 * offset)
 return res
 def __generateLogItem(self, author, date, message, revision, changedPaths,
 parents, branches, tags, phase, bookmarks,
-latestTag):
+latestTag, canPush=False):
 """
 Private method to generate a log tree entry.
-@param author author info (string)
+@param author author info
-@param date date info (string)
+@type str
-@param message text of the log message (list of strings)
+@param date date info
-@param revision revision info (string)
+@type str
+@param message text of the log message
+@type list of str
+@param revision revision info
+@type str
 @param changedPaths list of dictionary objects containing
 info about the changed files/directories
-@param parents list of parent revisions (list of integers)
+@type dict
-@param branches list of branches (list of strings)
+@param parents list of parent revisions
-@param tags list of tags (string)
+@type list of int
-@param phase phase of the entry (string)
+@param branches list of branches
-@param bookmarks list of bookmarks (string)
+@type list of str
+@param tags list of tags
+@type str
+@param phase phase of the entry
+@type str
+@param bookmarks list of bookmarks
+@type str
 @param latestTag the latest tag(s) reachable from the changeset
-(list of strings)
+@type list of str
-@return reference to the generated item (QTreeWidgetItem)
+@param canPush flag indicating that changesets can be pushed
+@type bool
+@return reference to the generated item
+@rtype QTreeWidgetItem
 """
 logMessageColumnWidth = self.vcs.getPlugin().getPreferences(
 "LogMessageColumnWidth")
 msgtxt = ""
 for line in message:
 icon = self.__generateIcon(column, color, edges, topedges,
 QColor(self.__branchColor(branches[0])),
 rev in self.__projectWorkingDirParents,
 rev in self.__closedBranchesRevs,
-phase == "draft")
+phase == "draft" and canPush)
 itm.setIcon(0, icon)
 try:
 self.__lastRev = int(revision.split(":")[0])
 except ValueError:
 def __getLogEntries(self, startRev=None, noEntries=0):
 """
 Private method to retrieve log entries from the repository.
 @param startRev revision number to start from (integer, string)
-@keyparam noEntries number of entries to get (0 = default) (int)
+@param noEntries number of entries to get (0 = default) (int)
 """
 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
 QApplication.processEvents()
 if startRev is not None:
 args.append('--rev')
 args.append('{0}:0'.format(startRev))
 if (
 not self.projectMode and
-not self.fname == "." and
 not self.stopCheckBox.isChecked()
 ):
 args.append('--follow')
 if self.commandMode == "log":
 args.append('--copies')
 ):
 # no incoming changesets, just switch to log mode
 self.commandMode = "log"
 self.__finish()
-def start(self, fn, bundle=None, isFile=False, noEntries=0):
+def start(self, name=None, bundle=None, isFile=False, noEntries=0):
 """
 Public slot to start the hg log command.
-@param fn filename to show the log for (string)
+@param name file/directory name to show the log for
-@keyparam bundle name of a bundle file (string)
+@type str
-@keyparam isFile flag indicating log for a file is to be shown
+@param bundle name of a bundle file
-(boolean)
+@type str
-@keyparam noEntries number of entries to get (0 = default) (int)
+@param isFile flag indicating log for a file is to be shown
+@type bool
+@param noEntries number of entries to get (0 = default)
+@type int
 """
 self.__bundle = bundle
 self.__isFile = isFile
 if self.initialCommandMode == "full_log":
 self.errors.clear()
 QApplication.processEvents()
 self.__initData()
-self.__filename = fn
+self.__filename = name
-self.dname, self.fname = self.vcs.splitPath(fn)
+self.projectMode = name is None
-# find the root of the repo
+self.stopCheckBox.setDisabled(self.projectMode)
-self.repodir = self.dname
-while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)):
-self.repodir = os.path.dirname(self.repodir)
-if os.path.splitdrive(self.repodir)[1] == os.sep:
-return
-self.projectMode = (self.fname == "." and self.dname == self.repodir)
-self.stopCheckBox.setDisabled(self.projectMode or self.fname == ".")
 self.activateWindow()
 self.raise_()
 self.logTree.clear()
 self.__started = True
 noEntries = 0
 log = {"message": [], "bookmarks": None, "phase": ""}
 changedPaths = []
 initialText = True
 fileCopies = {}
+canPush = self.vcs.canPush()
 for s in self.buf:
 if s != "@@@\n":
 try:
 key, value = s.split("|", 1)
 except ValueError:
 if len(log) > 1:
 self.__generateLogItem(
 log["author"], log["date"],
 log["message"], log["revision"], changedPaths,
 log["parents"], log["branches"], log["tags"],
-log["phase"], log["bookmarks"], log["latesttag"])
+log["phase"], log["bookmarks"], log["latesttag"],
+canPush=canPush)
 dt = QDate.fromString(log["date"], Qt.ISODate)
 if (
 not self.__maxDate.isValid() and
 not self.__minDate.isValid()
 ):
 newPhase = self.phases["secret"]
 data = (revs, "s", True)
 else:
 newPhase = self.phases["draft"]
 data = (revs, "d", False)
-res = self.vcs.hgPhase(self.repodir, data)
+res = self.vcs.hgPhase(data)
 if res:
 for itm in self.logTree.selectedItems():
 itm.setText(self.PhaseColumn, newPhase)
 @pyqtSlot()
 if branch != self.__projectBranch:
 revs.append(
 itm.text(self.RevisionColumn).strip().split(":", 1)[0])
 if revs:
-shouldReopen = self.vcs.hgGraft(self.repodir, revs)
+shouldReopen = self.vcs.hgGraft(revs)
 if shouldReopen:
 res = E5MessageBox.yesNo(
 None,
 self.tr("Copy Changesets"),
 self.tr(
 if len([itm for itm in self.logTree.selectedItems()
 if not itm.data(0, self.__incomingRole)]) == 1:
 itm = self.logTree.selectedItems()[0]
 rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0]
 tag = itm.text(self.TagsColumn).strip().split(", ", 1)[0]
-res = self.vcs.vcsTag(self.repodir, revision=rev, tagName=tag)
+res = self.vcs.vcsTag(revision=rev, tagName=tag)
 if res:
 self.on_refreshButton_clicked()
 @pyqtSlot()
 def __closeHeadsActTriggered(self):
 if not itm.data(0, self.__incomingRole)]
 revs = [rev for rev in revs if rev in self.__headRevisions]
 if revs:
 closeheadExtension = self.vcs.getExtensionObject("closehead")
 if closeheadExtension is not None:
-closeheadExtension.hgCloseheads(
+closeheadExtension.hgCloseheads(revisions=revs)
-self.repodir, revisions=revs)
 self.on_refreshButton_clicked()
 @pyqtSlot()
 def __switchActTriggered(self):
 if not ok:
 return
 if bookmark:
 rev = bookmark
 if rev:
-shouldReopen = self.vcs.vcsUpdate(self.repodir, revision=rev)
+shouldReopen = self.vcs.vcsUpdate(revision=rev)
 if shouldReopen:
 res = E5MessageBox.yesNo(
 None,
 self.tr("Switch"),
 self.tr(
 self.tr('Enter bookmark name for changeset "{0}":').format(
 changeset),
 QLineEdit.Normal)
 if ok and bool(bookmark):
 self.vcs.hgBookmarkDefine(
-self.repodir, revision="rev({0})".format(rev),
+revision="rev({0})".format(rev),
 bookmark=bookmark)
 self.on_refreshButton_clicked()
 @pyqtSlot()
 def __bookmarkMoveActTriggered(self):
 if not itm.data(0, self.__incomingRole)]) == 1:
 itm = self.logTree.selectedItems()[0]
 rev, changeset = (
 itm.text(self.RevisionColumn).strip().split(":", 1)
 )
-bookmarksList = self.vcs.hgGetBookmarksList(self.repodir)
+bookmarksList = self.vcs.hgGetBookmarksList()
 bookmark, ok = QInputDialog.getItem(
 self,
 self.tr("Move Bookmark"),
 self.tr('Select the bookmark to be moved  to changeset'
 ' "{0}":').format(changeset),
 [""] + bookmarksList,
 0, False)
 if ok and bool(bookmark):
 self.vcs.hgBookmarkMove(
-self.repodir, revision="rev({0})".format(rev),
+revision="rev({0})".format(rev),
 bookmark=bookmark)
 self.on_refreshButton_clicked()
 @pyqtSlot()
 def __lfPullActTriggered(self):
 rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0]
 if rev:
 revs.append(rev)
 if revs:
-self.vcs.getExtensionObject("largefiles").hgLfPull(
+self.vcs.getExtensionObject("largefiles").hgLfPull(revisions=revs)
-self.repodir, revisions=revs)
 @pyqtSlot()
 def __pullActTriggered(self):
 """
 Private slot to pull changes from a remote repository.
 for itm in [item for item in self.logTree.selectedItems()
 if item.data(0, self.__incomingRole)]:
 rev = itm.text(self.RevisionColumn).split(":")[1].strip()
 if rev:
 revs.append(rev)
-shouldReopen = self.vcs.hgPull(self.repodir, revisions=revs)
+shouldReopen = self.vcs.hgPull(revisions=revs)
 refresh = True
 if self.initialCommandMode == "incoming":
 addNext = True
 if shouldReopen:
 """
 itm = self.logTree.selectedItems()[0]
 if not itm.data(0, self.__incomingRole):
 rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0]
 if rev:
-self.vcs.hgPush(self.repodir, rev=rev)
+self.vcs.hgPush(rev=rev)
 self.on_refreshButton_clicked(
 addNext=self.initialCommandMode == "outgoing")
 @pyqtSlot()
 def __pushAllActTriggered(self):
 """
 Private slot to push all changes to a remote repository.
 """
-self.vcs.hgPush(self.repodir)
+self.vcs.hgPush()
 self.on_refreshButton_clicked()
 @pyqtSlot()
 def __stripActTriggered(self):
 """
 """
 itm = self.logTree.selectedItems()[0]
 if not itm.data(0, self.__incomingRole):
 rev = itm.text(self.RevisionColumn).strip().split(":", 1)[1]
 shouldReopen = self.vcs.getExtensionObject("strip").hgStrip(
-self.repodir, rev=rev)
+rev=rev)
 if shouldReopen:
 res = E5MessageBox.yesNo(
 None,
 self.tr("Strip Changesets"),
 self.tr(
 """
 itm = self.logTree.selectedItems()[0]
 if not itm.data(0, self.__incomingRole):
 rev = "rev({0})".format(
 itm.text(self.RevisionColumn).strip().split(":", 1)[0])
-self.vcs.vcsMerge(self.repodir, rev=rev)
+self.vcs.vcsMerge("", rev=rev)
 @pyqtSlot()
 def __bundleActTriggered(self):
 """
 Private slot to create a changegroup file.
 "revs": revs,
 "base": "",
 "all": False,
 }
-self.vcs.hgBundle(self.repodir, bundleData=bundleData)
+self.vcs.hgBundle(bundleData=bundleData)
 @pyqtSlot()
 def __unbundleActTriggered(self):
 """
 Private slot to apply the currently previewed bundle file.
 """
 if self.initialCommandMode == "incoming" and bool(self.__bundle):
-shouldReopen = self.vcs.hgUnbundle(self.repodir,
+shouldReopen = self.vcs.hgUnbundle(files=[self.__bundle])
-files=[self.__bundle])
 if shouldReopen:
 res = E5MessageBox.yesNo(
 None,
 self.tr("Apply Changegroup"),
 self.tr("""The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
 e5App().getObject("Project").reopenProject()
 return
-self.vcs.vcsLogBrowser(self.repodir)
+self.vcs.vcsLogBrowser()
 self.close()
 @pyqtSlot()
 def __gpgSignActTriggered(self):
 """
 rev = itm.text(self.RevisionColumn).split(":", 1)[0].strip()
 if rev:
 revs.append(rev)
 if revs:
-self.vcs.getExtensionObject("gpg").hgGpgSign(
+self.vcs.getExtensionObject("gpg").hgGpgSign(revisions=revs)
-self.repodir, revisions=revs)
 @pyqtSlot()
 def __gpgVerifyActTriggered(self):
 """
 Private slot to verify the signatures of a selected revisions.
 itm = self.logTree.selectedItems()[0]
 if not itm.data(0, self.__incomingRole):
 rev = itm.text(self.RevisionColumn).split(":", 1)[0].strip()
 if rev:
 self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures(
-self.repodir, rev=rev)
+rev=rev)
 def __selectAllActTriggered(self, select=True):
 """
 Private method to select or unselect all log entries.
 Private slot to handle selection of a side-by-side link.
 @param link text of the selected link
 @type str
 """
-if ":" in link:
+if ":" in link and self.__filename is not None:
 scheme, path = link.split(":", 1)
 if scheme == "sbsdiff" and "_" in path:
 rev1, rev2 = path.split("_", 1)
 self.vcs.hgSbsDiff(self.__filename, revisions=(rev1, rev2))

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py