Fri, 21 Jun 2013 19:02:27 +0200
Merged remote changes.
--- a/Debugger/DebugViewer.py Fri Jun 21 19:01:31 2013 +0200 +++ b/Debugger/DebugViewer.py Fri Jun 21 19:02:27 2013 +0200 @@ -365,6 +365,7 @@ """ Public slot to show the call stack of the program being debugged. """ + block = self.stackComboBox.blockSignals(True) self.framenr = 0 self.stackComboBox.clear() self.currentStack = stack @@ -373,6 +374,7 @@ # just show base filename to make it readable s = (os.path.basename(s[0]), s[1], s[2]) self.stackComboBox.addItem('{0}:{1}:{2}'.format(*s)) + self.stackComboBox.blockSignals(block) def setVariablesFilter(self, globalsFilter, localsFilter): """
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Jun 21 19:01:31 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Jun 21 19:02:27 2013 +0200 @@ -1890,6 +1890,7 @@ if not os.path.exists(cfgFile): try: f = open(cfgFile, "w") + f.write("[ui]\nusername = Firstname Lastname <email_address>\n") f.close() except (IOError, OSError): # ignore these