← Back to branch summary

~ubuntu-branches/debian/sid/tortoisehg/sid

« back to all changes in this revision

Viewing changes to tortoisehg/hgqt/mq.py

  • Committer: Package Import Robot
  • Author(s): Ludovico Cavedon
  • Date: 2012-02-20 22:03:12 UTC
  • mfrom: (1.2.8)
  • Revision ID: package-import@ubuntu.com-20120220220312-11yhqpn8suxvwyg4
Tags: 2.3-1
http://bugs.debian.org/660387
http://bugs.debian.org/658140
* Imported Upstream version 2.3 (Closes: #660387, #658140).
* Update dependency on Merurual (2.1, 2.2).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tortoisehg/hgqt/mq.py
12
12
from PyQt4.QtCore import *
13
13
from PyQt4.QtGui import *
14
14
 
15
 
from mercurial import hg, ui, url, util, error
16
 
from mercurial import merge as mergemod
 
15
from mercurial import patch
17
16
from hgext import mq as mqmod
18
17
 
19
 
from tortoisehg.util import hglib, patchctx
 
18
from tortoisehg.util import hglib
20
19
from tortoisehg.hgqt.i18n import _
21
20
from tortoisehg.hgqt import qtlib, cmdui, rejects, qscilib, thgrepo, status
22
 
from tortoisehg.hgqt import qqueue, qreorder, fileview, thgimport, messageentry
 
21
from tortoisehg.hgqt import qqueue, qreorder, thgimport, messageentry
23
22
from tortoisehg.hgqt.qtlib import geticon
24
23
 
25
24
# TODO
353
352
            uguards = hglib.tounicode(' '.join(item._thgguards))
354
353
        else:
355
354
            uguards = ''
356
 
        new, ok = QInputDialog.getText(self,
 
355
        new, ok = qtlib.getTextInput(self,
357
356
                      _('Configure guards'),
358
357
                      _('Input new guards for %s:') % hglib.tounicode(patch),
359
358
                      text=uguards)