Mercurial and Git clients can push and pull from this alias URL to interact with this repository. You can change to which repository an alias points by going to the Aliases link on the project page.
# 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.importosimportgtkimportgobjectfrommercurialimporthg,uifromtortoisehg.util.i18nimport_fromtortoisehg.utilimporthglib,pathsfrom tortoisehg.hgtk import changesetinfo, gtklib, commit, gdialog, hgcmd
+RES_MERGE = 1+RES_COMMIT = 2+RES_UNDO = 3+class MergeDialog(gtk.Dialog):
""" Dialog to merge revisions of a Mercurial repo """
def __init__(self, rev=None):
""" Initialize the Dialog """gtk.Dialog.__init__(self)gtklib.set_tortoise_icon(self,'menumerge.ico') gtklib.set_tortoise_keys(self)
self.set_default_size(350, 120)
self.set_has_separator(False)
+ self.connect('response', self.dialog_response) self.notify_func = None
if not rev:
gdialog.Prompt(_('Unable to merge'),_('Must supply a target revision'),self).run()gobject.idle_add(self.destroy)returntry:repo=hg.repository(ui.ui(),path=paths.find_root())excepthglib.RepoError:gobject.idle_add(self.destroy)returnself.set_title(_('Merging in %s')%hglib.get_reponame(repo))frame=gtk.Frame(_('Merge target (other)'))self.otherrev,desc=changesetinfo.changesetinfo(repo,rev,True)frame.add(desc)frame.set_border_width(5)self.vbox.pack_start(frame,False,False)frame=gtk.Frame(_('Current revision (local)'))self.localrev,desc=changesetinfo.changesetinfo(repo,'.',True)frame.add(desc)frame.set_border_width(5)self.vbox.pack_start(frame,False,False)accelgroup=gtk.AccelGroup()self.add_accel_group(accelgroup)mod=gtklib.get_thg_modifier()self.closebtn=gtk.Button(_('Close'))self.closebtn.connect('clicked',lambdax:self.destroy())self.undobtn=gtk.Button(_('Undo'))self.undobtn.set_sensitive(False)self.commitbtn=gtk.Button(_('Commit'))self.commitbtn.set_sensitive(False)self.mergebtn=gtk.Button(_('Merge'))self.action_area.add(self.mergebtn)self.action_area.add(self.commitbtn)self.action_area.add(self.undobtn)self.action_area.add(self.closebtn)vlist=gtk.ListStore(str,bool)combo=gtk.ComboBoxEntry(vlist,0)self.mergetool=combocombo.set_row_separator_func(lambdamodel,path:model[path][1])combo.child.set_width_chars(8)lbl=gtk.Label(_('Merge tool:'))lbl.set_alignment(1,0.5)self.action_area.add(lbl)self.action_area.add(combo)vlist.append(('',False)) for tool in hglib.mergetools(repo.ui):
vlist.append((hglib.toutf(tool), False))
- self.mergebtn.connect('clicked', lambda b: self.domerge())
- self.commitbtn.connect('clicked', lambda b: self.docommit())
- self.undobtn.connect('clicked', lambda b: self.doundo())
+ self.mergebtn.connect('clicked', lambda b: self.response(RES_MERGE))
+ self.commitbtn.connect('clicked', lambda b: self.response(RES_COMMIT))
+ self.undobtn.connect('clicked', lambda b: self.response(RES_UNDO))
self.mergebtn.grab_focus()
+ def dialog_response(self, dialog, response_id):+ # Merge button+ if response_id == RES_MERGE:+ self.domerge()+ # Commit button+ elif response_id == RES_COMMIT:+ self.docommit()+ # Undo button+ elif response_id == RES_UNDO:+ self.doundo()+ def set_notify_func(self, func, *args):
self.notify_func = func
self.notify_args = args
defdomerge(self):cmdline=['hg','merge','--rev',self.otherrev]tool=hglib.fromutf(self.mergetool.child.get_text())iftool:oldmergeenv=os.environ.get('HGMERGE')os.environ['HGMERGE']=tooldlg=hgcmd.CmdDialog(cmdline,False)dlg.run()dlg.hide()repo=hg.repository(ui.ui(),path=paths.find_root())iflen(repo.parents())==1:returniftool:ifoldmergeenv:os.environ['HGMERGE']=oldmergeenvelse:delos.environ['HGMERGE']ifself.notify_func:self.notify_func(self.notify_args)self.mergetool.set_sensitive(False)self.mergebtn.set_sensitive(False)self.undobtn.set_sensitive(True)self.commitbtn.set_sensitive(True)self.commitbtn.grab_focus()defdocommit(self):dlg=commit.run(ui.ui())dlg.set_transient_for(self)dlg.set_modal(True)dlg.set_notify_func(self.commit_notify,dlg)dlg.display()defcommit_notify(self,dlg):# refresh the log toolifself.notify_func:self.notify_func(self.notify_args)# hide merge dialogself.hide()# hide commit tooldlg.ready=False# disables refreshdlg.hide()gobject.timeout_add(50,self.destroy)defdoundo(self):response=gdialog.Confirm(_('Confirm undo merge'),[],self,_('Clean checkout of original revision?')).run()ifresponse!=gtk.RESPONSE_YES:returncmdline=['hg','update','--rev',self.localrev,'--clean']dlg=hgcmd.CmdDialog(cmdline)dlg.run()dlg.hide()ifself.notify_func:self.notify_func(self.notify_args)self.mergetool.set_sensitive(True)self.mergebtn.set_sensitive(True)self.mergebtn.grab_focus()self.undobtn.set_sensitive(False)self.commitbtn.set_sensitive(False)defrun(ui,*pats,**opts):returnMergeDialog(opts.get('rev'))
Attach a Trello Card
Add a tag
Your session has expired
You are no longer logged in. Please log in and try your request again.
Filter RSS Feed
This RSS feed URL allows you to see the contents of your current filter using any feed reader.
This link includes a special authentication token. If you share the URL with anyone else, they can see this RSS feed's activity. You can disable these tokens when needed.
Your current filter is unsaved; changing it won't affect this RSS feed.