def onVisualDiffFile(self):
rev = self.selection[0]
paths = [self.filerevmodel.graph.filename(rev)]
opts = dict(change=self.selection[0])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def onVisualDiffFileToLocal(self):
rev = self.selection[0]
paths = [self.filerevmodel.graph.filename(rev)]
opts = dict(rev=['rev(%d)' % rev])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def vdiff(self):
filenames = self.getSelectedFiles()
if len(filenames) == 0:
return
opts = {'change': self.ctx.rev()}
dlg = visdiff.visualdiff(self.repo.ui, self.repo, filenames, opts)
if dlg:
dlg.exec_()
def vdiff(ui, repoagent, *pats, **opts):
"""launch configured visual diff tool"""
from tortoisehg.hgqt import visdiff
repo = repoagent.rawRepo()
if opts.get('bundle'):
repo = thgrepo.repository(ui, opts.get('bundle'))
pats = hglib.canonpaths(pats)
return visdiff.visualdiff(ui, repo, pats, opts)
def vdiff(self):
if self.path is None:
return
pats = [hglib.fromunicode(self.path)]
opts = {"change": self.rev}
dlg = visdiff.visualdiff(self._repo.ui, self._repo, pats, opts)
if dlg:
dlg.exec_()
def vdiff(ui, repoagent, *pats, **opts):
"""launch configured visual diff tool"""
from tortoisehg.hgqt import visdiff
repo = repoagent.rawRepo()
if opts.get('bundle'):
repo = thgrepo.repository(ui, opts.get('bundle'))
pats = hglib.canonpaths(pats)
return visdiff.visualdiff(ui, repo, pats, opts)
def vdiff(self):
filenames = self.filelist.getSelectedFiles()
if not filenames:
return
opts = {'change':self.ctx.rev()}
dlg = visdiff.visualdiff(self.repo.ui, self.repo, filenames, opts)
if dlg:
dlg.exec_()
def vdifflocal(self):
repo, filenames, rev = self._findsub(self._selectedfiles)
if not filenames:
return
assert type(rev) is int
opts = {'rev': ['rev(%d)' % rev]}
dlg = visdiff.visualdiff(repo.ui, repo, filenames, opts)
if dlg:
dlg.exec_()
def vp1(self):
paths = self.getVdiffFiles(self.rtree)
if paths:
opts = {}
opts["rev"] = ["p2()"]
opts["tool"] = self.tcombo.readValue()
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def vp0(self):
paths = self.getVdiffFiles(self.rtree)
if paths:
opts = {}
opts['rev'] = ['p1()']
opts['tool'] = self.tcombo.readValue()
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def onVisualDiffRevs(self):
revs = self.selection
if len(revs) != 2:
self.textView.showMessage.emit(_('You must select two revisions to diff'))
return
opts = dict(rev=revs)
dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
if dlg:
dlg.exec_()
def vdifflocal(self):
if self.path is None:
return
pats = [hglib.fromunicode(self.path)]
assert type(self.rev) is int
opts = {"rev": ["rev(%d)" % self.rev]}
dlg = visdiff.visualdiff(self._repo.ui, self._repo, pats, opts)
if dlg:
dlg.exec_()
def vdifflocal(self):
repo, filenames, rev = self._findsub(self._selectedfiles)
if not filenames:
return
assert type(rev) is int
opts = {'rev': ['rev(%d)' % rev]}
dlg = visdiff.visualdiff(repo.ui, repo, filenames, opts)
if dlg:
dlg.exec_()
def vp1(self):
paths = self.getVdiffFiles(self.rtree)
if paths:
opts = {}
opts['rev'] = ['p2()']
opts['tool'] = self.tcombo.readValue()
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def diffOthToAnc(self):
paths = self.getVdiffFiles(self.utree)
if paths:
opts = {}
opts['rev'] = ['ancestor(p1(),p2())..p2()']
opts['tool'] = self.tcombo.readValue()
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def vdiff(self):
filenames = self.getSelectedFiles()
if len(filenames) == 0:
return
opts = {'change':self.ctx.rev()}
dlg = visdiff.visualdiff(self.repo.ui, self.repo, filenames, opts)
if dlg:
dlg.exec_()
dlg.deleteLater()
def diffOthToAnc(self):
paths = self.getVdiffFiles(self.utree)
if paths:
opts = {}
opts["rev"] = ["ancestor(p1(),p2())..p2()"]
opts["tool"] = self.tcombo.readValue()
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def vdifflocal(self):
filenames = self.filelist.getSelectedFiles()
if not filenames:
return
assert type(self.ctx.rev()) is int
opts = {'rev':['rev(%d)' % (self.ctx.rev())]}
dlg = visdiff.visualdiff(self.repo.ui, self.repo, filenames, opts)
if dlg:
dlg.exec_()
def diffLocToAnc(self):
paths = self.getVdiffFiles(self.utree)
if paths:
opts = {}
opts['rev'] = ['ancestor(p1(),p2())..p1()']
opts['tool'] = self.tcombo.readValue()
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def onVisualDiffFileRevs(self):
revs = self.selection
if len(revs) != 2:
self.textView.showMessage.emit(_('You must select two revisions to diff'))
return
paths = [self.filerevmodel.graph.filename(revs[0])]
opts = dict(rev=['rev(%d)' % rev for rev in revs])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)
if dlg:
dlg.exec_()
def vdiff(self):
repo, filenames, rev = self._findsub(self._selectedfiles)
if not filenames:
return
if rev in repo.thgmqunappliedpatches:
QMessageBox.warning(self.parent(),
_("Cannot display visual diff"),
_("Visual diffs are not supported for unapplied patches"))
return
opts = {'change': rev}
dlg = visdiff.visualdiff(repo.ui, repo, filenames, opts)
if dlg:
dlg.exec_()
def vdiff(self):
repo, filenames, rev = self._findsub(self._selectedfiles)
if not filenames:
return
if rev in repo.thgmqunappliedpatches:
QMessageBox.warning(
self.parent(), _("Cannot display visual diff"),
_("Visual diffs are not supported for unapplied patches"))
return
opts = {'change': rev}
dlg = visdiff.visualdiff(repo.ui, repo, filenames, opts)
if dlg:
dlg.exec_()
def vdiff(parent, ui, repo, files):
dlg = visdiff.visualdiff(ui, repo, files, {})
if dlg:
dlg.exec_()
def onVisualDiffToLocal(self):
opts = dict(rev=['rev(%d)' % self.selection[0]])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
if dlg:
dlg.exec_()
dlg.deleteLater()
def onVisualDiff(self):
opts = dict(change=self.selection[0])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
if dlg:
dlg.exec_()
dlg.deleteLater()
def _visualDiff(self, fds, filenames, **opts):
repo = self._repoAgentFor(fds[0]).rawRepo()
dlg = visdiff.visualdiff(repo.ui, repo, filenames, opts)
if dlg:
dlg.exec_()
def vdiff(parent, ui, repo, files):
dlg = visdiff.visualdiff(ui, repo, files, {})
if dlg:
dlg.exec_()
def onVisualDiff(self):
opts = dict(change=self.selection[0])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
if dlg:
dlg.exec_()
dlg.deleteLater()
def onVisualDiffToLocal(self):
opts = dict(rev=['rev(%d)' % self.selection[0]])
dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts)
if dlg:
dlg.exec_()
dlg.deleteLater()
