Changeset 1ef3bac66caf…
Parent aef6aedd4beb…
by
Changes to 4 files · Browse files at 1ef3bac66caf Showing diff from parent aef6aedd4beb Diff from another changeset...
@@ -8,8 +8,6 @@ import os
import gtk
import pango
-from dialog import GDialog
-from hgcmd import CmdDialog
from mercurial.i18n import _
import histselect
import shlib
@@ -98,6 +96,7 @@ start, end = buf.get_bounds()
cmdline = ['hg', 'backout', '--rev', self.reventry.get_text(),
'--message', buf.get_text(start, end)]
+ from hgcmd import CmdDialog
dlg = CmdDialog(cmdline)
dlg.show_all()
dlg.run()
|
@@ -13,10 +13,9 @@ from mercurial.node import short, nullrev
from mercurial import cmdutil, context, util, ui, hg, patch
from gdialog import GDialog, Confirm
-from hgcmd import CmdDialog
from hglib import toutf, fromutf, displaytime, hgcmd_toq, diffexpand, LookupError
from gtklib import StatusBar
-from shlib import shell_notify
+import shlib
class ChangeSet(GDialog):
"""GTK+ based dialog for displaying repository logs
@@ -724,7 +723,8 @@ if dialog.run() == gtk.RESPONSE_NO:
return
cmdline = ['hg', 'revert', '--verbose', '--rev', str(rev), self.curfile]
+ from hgcmd import CmdDialog
dlg = CmdDialog(cmdline)
dlg.run()
dlg.hide()
- shell_notify([self.curfile])
+ shlib.shell_notify([self.curfile])
|
@@ -18,7 +18,6 @@ from mercurial import ui, hg, util, patch
from gdialog import Prompt, Confirm
from status import GStatus, FM_STATUS, FM_CHECKED, DM_REJECTED, DM_CHUNK_ID
-from hgcmd import CmdDialog
from hglib import fromutf
import shlib
from shlib import shell_notify
@@ -603,6 +602,7 @@ if self.qnew:
cmdline += [fromutf(self._get_qnew_name())]
cmdline += [self.repo.wjoin(x) for x in files]
+ from hgcmd import CmdDialog
dialog = CmdDialog(cmdline, True)
dialog.set_transient_for(self)
dialog.run()
|
@@ -7,7 +7,6 @@ import gtk
import os
import sys
-from gdialog import GDialog
from mercurial import cmdutil, util, hg, ui
from mercurial.i18n import _
from hglib import RepoError
|
Loading...