We are currently indexing your data, so search results may be incomplete until we finish.
|
|
# merge.py - TortoiseHg's dialog for merging revisions
#
# Copyright 2007 TK Soh <teekaysoh@gmail.com>
# Copyright 2007 Steve Borho <steve@borho.org>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
import gobject
from mercurial import hg, ui
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths
from tortoisehg.hgtk import changesetinfo, gtklib, commit, gdialog, hgcmd
class MergeDialog(gtk.Window):
""" Dialog to merge revisions of a Mercurial repo """
def __init__(self, rev=None):
""" Initialize the Dialog """
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
gtklib.set_tortoise_icon(self, 'menumerge.ico')
gtklib.set_tortoise_keys(self)
self.notify_func = None
if not rev:
gdialog.Prompt(_('Unable to merge'),
_('Must supply a target revision'), self).run()
gobject.idle_add(self.destroy)
return
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
except hglib.RepoError:
gobject.idle_add(self.destroy)
return
title = _("Merging in ") + hglib.toutf(os.path.basename(repo.root))
self.set_title(title)
self.set_default_size(350, 120)
vbox = gtk.VBox()
self.add(vbox)
frame = gtk.Frame(_('Merge target (other)'))
other, desc = changesetinfo.changesetinfo(repo, rev, True)
frame.add(desc)
frame.set_border_width(5)
vbox.pack_start(frame, False, False, 2)
frame = gtk.Frame(_('Current revision (local)'))
local, desc = changesetinfo.changesetinfo(repo, '.', True)
frame.add(desc)
frame.set_border_width(5)
vbox.pack_start(frame, False, False, 2)
accelgroup = gtk.AccelGroup()
self.add_accel_group(accelgroup)
mod = gtklib.get_thg_modifier()
hbbox = gtk.HButtonBox()
hbbox.set_layout(gtk.BUTTONBOX_END)
vbox.pack_start(hbbox, False, False, 2)
close = gtk.Button(_('Close'))
close.connect('clicked', lambda x: self.destroy())
key, modifier = gtk.accelerator_parse('Escape')
close.add_accelerator('clicked', accelgroup, key, 0,
gtk.ACCEL_VISIBLE)
undo = gtk.Button(_('Undo'))
undo.set_sensitive(False)
commit = gtk.Button(_('Commit'))
commit.set_sensitive(False)
merge = gtk.Button(_('Merge'))
key, modifier = gtk.accelerator_parse(mod+'Return')
merge.add_accelerator('clicked', accelgroup, key, modifier,
gtk.ACCEL_VISIBLE)
hbbox.add(merge)
hbbox.add(commit)
hbbox.add(undo)
hbbox.add(close)
vlist = gtk.ListStore(str, bool)
combo = gtk.ComboBoxEntry(vlist, 0)
self.mergetool = combo
combo.set_row_separator_func(lambda model, path: model[path][1])
combo.child.set_width_chars(8)
lbl = gtk.Label(_('mergetool:'))
hbbox.add(lbl)
hbbox.add(combo)
vlist.append(('', False))
for tool in hglib.mergetools(repo.ui):
vlist.append((hglib.toutf(tool), False))
commit.connect('clicked', self.docommit)
undo.connect('clicked', self.undo, local, merge, commit)
merge.connect('clicked', self.merge, other, commit, undo)
merge.grab_focus()
def set_notify_func(self, func, *args):
self.notify_func = func
self.notify_args = args
def merge(self, button, other, commit, undo):
cmdline = ['hg', 'merge', '--rev', other]
tool = hglib.fromutf(self.mergetool.child.get_text())
if tool:
oldmergeenv = os.environ.get('HGMERGE')
os.environ['HGMERGE'] = tool
dlg = hgcmd.CmdDialog(cmdline, False)
dlg.run()
dlg.hide()
repo = hg.repository(ui.ui(), path=paths.find_root())
if len(repo.parents()) == 1:
return
if tool:
if oldmergeenv:
os.environ['HGMERGE'] = oldmergeenv
else:
del os.environ['HGMERGE']
if self.notify_func:
self.notify_func(self.notify_args)
button.set_sensitive(False)
self.mergetool.set_sensitive(False)
undo.set_sensitive(True)
commit.set_sensitive(True)
commit.grab_focus()
def docommit(self, button):
dlg = commit.run(ui.ui())
dlg.set_transient_for(self)
dlg.set_modal(True)
dlg.set_notify_func(self.commit_notify, dlg)
dlg.display()
def commit_notify(self, dlg):
# refresh the log tool
if self.notify_func:
self.notify_func(self.notify_args)
# hide merge dialog
self.hide()
# hide commit tool
dlg.ready = False # disables refresh
dlg.hide()
gobject.timeout_add(50, self.destroy)
def undo(self, button, local, merge, commit):
response = gdialog.Confirm(_('Confirm undo merge'), [], self,
_('Clean checkout of original revision?')).run()
if response != gtk.RESPONSE_YES:
return
cmdline = ['hg', 'update', '--rev', local, '--clean']
dlg = hgcmd.CmdDialog(cmdline)
dlg.run()
dlg.hide()
if self.notify_func:
self.notify_func(self.notify_args)
button.set_sensitive(False)
commit.set_sensitive(False)
merge.set_sensitive(True)
self.mergetool.set_sensitive(True)
merge.grab_focus()
def run(ui, *pats, **opts):
return MergeDialog(opts.get('rev'))
|
Loading...