by
Changes to 3 files · Browse files at c19873efd8d5 Showing diff from parent 0a84cfa83687 dc336d56a9ab Diff from another changeset...
@@ -334,6 +334,15 @@ if '--version' not in sys.argv:
raise
+ # Allow use of environment variables to specify the location of Mercurial
+ import modulefinder
+ path = os.getenv('MERCURIAL_PATH')
+ if path:
+ modulefinder.AddPackagePath('mercurial', path)
+ path = os.getenv('HGEXT_PATH')
+ if path:
+ modulefinder.AddPackagePath('hgext', path)
+
if 'py2exe' in sys.argv:
import hgext
hgextdir = os.path.dirname(hgext.__file__)
|
@@ -296,12 +296,16 @@ w.setFocus() # to handle key press by InfoBar
return w
+ @pyqtSlot()
def clearInfoBar(self, priority=None):
"""Close current infobar if available; return True if got empty"""
it = self._infobarlayout.itemAt(0)
if not it:
return True
if priority is None or it.widget().infobartype <= priority:
+ # removes current infobar explicitly, because close() seems to
+ # delay deletion until next eventloop.
+ self._infobarlayout.removeItem(it)
it.widget().close()
return True
else:
@@ -363,6 +367,7 @@ sw.output.connect(self._showOutputOnInfoBar)
sw.progress.connect(self.progress)
sw.makeLogVisible.connect(self.makeLogVisible)
+ sw.syncStarted.connect(self.clearInfoBar)
sw.outgoingNodes.connect(self.setOutgoingNodes)
sw.showMessage.connect(self.showMessage)
sw.showMessage.connect(self._showMessageOnInfoBar)
@@ -741,6 +746,7 @@
def onRevisionClicked(self, rev):
'User clicked on a repoview row'
+ self.clearInfoBar(qtlib.InfoBar.INFO)
tw = self.taskTabsWidget
cw = tw.currentWidget()
if not cw.canswitch():
@@ -756,7 +762,6 @@ def onRevisionSelected(self, rev):
'View selection changed, could be a reload'
self.showMessage('')
- self.clearInfoBar(qtlib.InfoBar.INFO)
if self.repomodel.graph is None:
return
try:
|
@@ -51,6 +51,7 @@ return user, host, port, folder, passwd, scheme
class SyncWidget(QWidget, qtlib.TaskWidget):
+ syncStarted = pyqtSignal() # incoming/outgoing/pull/push started
outgoingNodes = pyqtSignal(object)
incomingBundle = pyqtSignal(QString)
showMessage = pyqtSignal(unicode)
@@ -752,6 +753,7 @@ ##
def inclicked(self):
+ self.syncStarted.emit()
url = self.currentUrl(True)
urlu = hglib.tounicode(url)
self.showMessage.emit(_('Getting incoming changesets from %s...') % urlu)
@@ -787,6 +789,7 @@ self.run(cmdline, ('force', 'branch', 'rev', 'subrepos'))
def pullclicked(self):
+ self.syncStarted.emit()
url = self.currentUrl(True)
urlu = hglib.tounicode(url)
def finished(ret, output):
@@ -825,6 +828,7 @@ self.run(cmdline, ('force', 'branch', 'rev', 'bookmark'))
def outclicked(self):
+ self.syncStarted.emit()
url = self.currentUrl(True)
urlu = hglib.tounicode(url)
self.showMessage.emit(_('Finding outgoing changesets to %s...') % urlu)
@@ -898,6 +902,7 @@ self.run(['--repository', self.repo.root, 'p4pending', '--verbose'], ())
def pushclicked(self, confirm, rev=None, branch=None):
+ self.syncStarted.emit()
url = self.currentUrl(True)
urlu = hglib.tounicode(url)
if (not hg.islocal(self.currentUrl(False)) and confirm
|
Loading...