We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 10 files · Browse files at e1ed86384cce Showing diff from parent 8ca8a35fa15d c8060a9b71b5 Diff from another changeset...
|
@@ -67,7 +67,7 @@ install contrib/mergetools.rc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/thgmergetools.rc
ln -s tortoisehg/icons/svg/thg_logo.svg %{buildroot}%{_datadir}/pixmaps/%{name}_logo.svg
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications contrib/%{name}.desktop
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications contrib/%{name}.desktop --vendor %{name}
%find_lang %{name}
@@ -80,7 +80,9 @@%doc COPYING.txt doc/build/html/
%{_bindir}/thg
%{python_sitelib}/tortoisehg/
+%if "%{?pythonver}" > "2.4"
%{python_sitelib}/tortoisehg-*.egg-info
+%endif
%{_datadir}/pixmaps/tortoisehg/
%{_datadir}/pixmaps/%{name}_logo.svg
%{_datadir}/applications/%{name}.desktop
|
||
|
@@ -803,12 +803,13 @@ assert self.currentThread() != qApp.thread()
self._threadid = self.currentThreadId()
try:
- data = []
- for (fctx, line), _text in self._fctx.annotate(True, True):
- data.append((fctx, line))
- self.data = data
- except KeyboardInterrupt:
- pass
+ try:
+ data = []
+ for (fctx, line), _text in self._fctx.annotate(True, True):
+ data.append((fctx, line))
+ self.data = data
+ except KeyboardInterrupt:
+ pass
finally:
self._threadid = None
del self._fctx
|
||
|
@@ -288,7 +288,10 @@ opts = {}
mgr = self.pbranch.patchmanager(self.repo.ui, self.repo, opts)
graph = mgr.graphforopts(opts)
+ graph_cur = mgr.graphforopts({'tips': True})
heads = self.repo.branchheads(patch_name)
+ if graph_cur.isinner(patch_name) and not graph.isinner(patch_name):
+ status.append(_('will be closed'))
if len(heads) > 1:
status.append(_('needs merge of %i heads\n') % len(heads))
for dep, through in graph.pendingmerges(patch_name):
|
||
|
@@ -315,6 +315,7 @@ root = self.selitem.internalPointer().rootpath()
sd = settings.SettingsDialog(configrepo=True, focus='web.name',
parent=self, root=root)
+ sd.finished.connect(sd.deleteLater)
sd.exec_()
def openAll(self):
|
||
|
@@ -406,12 +406,13 @@ def excepthandler(self):
'Display exception info; run in main (GUI) thread'
try:
- self._showexceptiondialog()
- except:
- # make sure to quit mainloop first, so that it never leave
- # zombie process.
- self._mainapp.exit(1)
- self._printexception()
+ try:
+ self._showexceptiondialog()
+ except:
+ # make sure to quit mainloop first, so that it never leave
+ # zombie process.
+ self._mainapp.exit(1)
+ self._printexception()
finally:
self.errors = []
|
||
|
@@ -133,11 +133,12 @@ origtimeout = socket.getdefaulttimeout()
socket.setdefaulttimeout(TIMEOUT)
try:
- conn.request('GET', '/')
- res = conn.getresponse()
- res.read()
- except (socket.error, httplib.HTTPException):
- pass
+ try:
+ conn.request('GET', '/')
+ res = conn.getresponse()
+ res.read()
+ except (socket.error, httplib.HTTPException):
+ pass
finally:
socket.setdefaulttimeout(origtimeout)
conn.close()
|
||
|
@@ -460,7 +460,8 @@ _fi(_('Close After Commit'), 'tortoisehg.closeci', genBoolCombo,
_('Close the commit tool after every successful '
'commit. Default: False')),
- _fi(_('Push After Commit'), 'tortoisehg.cipushafter', genEditCombo,
+ _fi(_('Push After Commit'), 'tortoisehg.cipushafter', (genEditCombo,
+ ['default-push', 'default']),
_('Attempt to push to specified URL or alias after each successful '
'commit. Default: No push')),
_fi(_('Auto Commit List'), 'tortoisehg.autoinc', genEditCombo,
|
||
|
@@ -634,5 +634,8 @@ for e in repotreemodel.iterRepoItemFromXml(f):
if e.basenode() == repoid:
yield e.rootpath(), e.shortname()
- finally:
+ except:
f.close()
+ raise
+ else:
+ f.close()
|
||
Add a tag
Loading...