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.
# history.py - Changelog dialog for TortoiseHg## Copyright 2007 Brad Schick, brad at gmail . com# Copyright 2008 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.importosimportgtkimportgobjectimportpangoimportStringIOfrommercurialimportui,hg,cmdutil,commands,extensions,utilfromthgutil.i18nimport_fromthgutilimporthglib,pathsfromhggtk.logview.treeviewimportTreeViewasLogTreeViewfromhggtkimportgdialog,gtklib,hgcmd,datamine,logfilter,gorevfromhggtkimportbackout,status,hgemail,tagadd,update,merge,archivefromhggtkimportchangeset,thgconfig,thgmq,histdetailsdefcreate_menu(label,callback):menuitem=gtk.MenuItem(label,True)menuitem.connect('activate',callback)menuitem.set_border_width(1)returnmenuitemclassGLog(gdialog.GDialog):'GTK+ based dialog for displaying repository logs'definit(self):self.filter='all'self.lastrevid=Noneself.currevid=Noneself.origtip=len(self.repo)self.ready=Falseself.filterbox=Noneself.details_model=Noneos.chdir(self.repo.root)# Load extension support for commands which need itextensions.loadall(self.ui)self.exs=[nameforname,moduleinextensions.extensions()]defget_title(self):return_('%s log')%self.get_reponame()defget_icon(self):return'menulog.ico'defget_default_setting(self):return'tortoisehg.authorcolor'defparse_opts(self):# Disable quiet to get full log infoself.ui.quiet=Falsedefget_tbbuttons(self):tbar=[self.make_toolbutton(gtk.STOCK_FIND,_('_DataMine'),self.datamine_clicked,tip=_('Search Repository History')),gtk.SeparatorToolItem(),self.make_toolbutton(gtk.STOCK_JUMP_TO,_('Select Revision'),self.goto_clicked,menu=self.gorev_menu(),tip=_('Select revision')),gtk.SeparatorToolItem(),self.make_toolbutton(gtk.STOCK_REFRESH,_('Re_fresh'),self.refresh_clicked,tip=_('Reload revision history')),gtk.SeparatorToolItem(),]ifnotself.opts.get('from-synch'):self.synctb=self.make_toolbutton(gtk.STOCK_NETWORK,_('Synchronize'),self.synch_clicked,tip=_('Launch synchronize tool'))tbar+=[self.synctb,gtk.SeparatorToolItem()]if'mq'inself.exs:self.mqtb=self.make_toolbutton(gtk.STOCK_DIRECTORY,_('MQ'),self.mq_clicked,tip=_('Toggle MQ panel'),toggle=True,icon='menupatch.ico')tbar+=[self.mqtb,gtk.SeparatorToolItem()]returntbardefget_menu_list(self):fnc=self.toggle_view_columnreturn[(_('View'),[(_('Filter Bar'),True,self.toggle_show_filterbar,[],self.show_filterbar),('----',None,None,None,None),(_('Choose Details...'),False,self.details_clicked,[],None),('----',None,None,None,None),(_('Compact Graph'),True,self.toggle_compactgraph,[],self.compactgraph),(_('Color by Branch'),True,self.toggle_branchcolor,[],self.branch_color),])]defsynch_clicked(self,toolbutton,data):defsync_closed(dialog):self.synctb.set_sensitive(True)defsynch_callback(parents):self.repo.invalidate()newparents=[x.node()forxinself.repo.parents()]iflen(self.repo)!=self.origtip:ifself.newbutton.get_active():self.reload_log()else:self.newbutton.set_active(True)elifnotparents==newparents:self.refresh_model()fromhggtkimportsynchparents=[x.node()forxinself.repo.parents()]dlg=synch.SynchDialog([],False,True)dlg.set_notify_func(synch_callback,parents)dlg.connect('destroy',sync_closed)dlg.show_all()self.synctb.set_sensitive(False)deftoggle_view_column(self,button,property):active=button.get_active()self.graphview.set_property(property,active)deftoggle_branchcolor(self,button):active=button.get_active()ifself.branch_color!=active:self.graphview.set_property('branch-color',active)self.branch_color=activeself.reload_log()deftoggle_graphcol(self,button):active=button.get_active()ifself.graphcol!=active:self.graphcol=activeself.reload_log()# TODO: this could be tricky#self.compactgraph_button.set_sensitive(self.graphcol)deftoggle_compactgraph(self,button):active=button.get_active()ifself.compactgraph!=active:self.compactgraph=activeself.reload_log()deftoggle_show_filterbar(self,button):self.show_filterbar=button.get_active()ifself.filterboxisnotNone:self.filterbox.set_property('visible',self.show_filterbar)defmore_clicked(self,button,data=None):self.graphview.next_revision_batch(self.limit)defload_all_clicked(self,button,data=None):self.graphview.load_all_revisions()self.loadnextbutton.set_sensitive(False)self.loadallbutton.set_sensitive(False)defselection_changed(self,graphview):'Graphview reports a new row selected'treeview=graphview.treeview(model,paths)=treeview.get_selection().get_selected_rows()ifnotpaths:self.currevid=NonereturnFalseself.currevid=graphview.get_revid_at_path(paths[0])self.ancestrybutton.set_sensitive(True)ifself.currevid!=self.lastrevid:self.lastrevid=self.currevidself.changeview.opts['rev']=[str(self.currevid)]self.changeview.load_details(self.currevid)returnFalsedefrevisions_loaded(self,graphview):'Graphview reports log generator has exited'ifnotgraphview.graphdata:self.changeview._buffer.set_text('')self.changeview._filelist.clear()self.loadnextbutton.set_sensitive(False)self.loadallbutton.set_sensitive(False)defdatamine_clicked(self,toolbutton,data=None):dlg=datamine.DataMineDialog(self.ui,self.repo,self.cwd,[],{})dlg.display()defdetails_clicked(self,toolbutton,data=None):self.show_details_dialog()defshow_details_dialog(self):defclose(dialog,response_id):dialog.destroy()model=gtk.ListStore(gobject.TYPE_BOOLEAN,gobject.TYPE_STRING,gobject.TYPE_STRING)model.append([self.graphcol,_('Graph'),'graphcol'])defcolumn(col,default,text):prop=col+'-column-visible'vis=self.graphview.get_property(prop)model.append([vis,text,prop])column('rev',True,_('Revision Number'))column('id',False,_('Changeset ID'))column('branch',False,_('Branch Name'))column('date',False,_('Local Date'))column('utc',False,_('UTC Date'))column('age',True,_('Age'))column('tag',False,_('Tags'))self.details_model=modeldlg=histdetails.LogDetailsDialog(model,self.apply_details)dlg.connect('response',close)dlg.show()defapply_details(self):ifself.details_model:reload=Falseforshow,uitext,propertyinself.details_model:ifproperty=='graphcol':ifself.graphcol!=show:self.graphcol=showreload=Trueelse:self.graphview.set_property(property,show)self.showcol[property]=showifreload:self.reload_log()deffilter_entry_activated(self,entry,combo):'User pressed enter in the filter entry'opts={}mode=combo.get_active()text=entry.get_text()ifmode==0:# Rev Rangetry:opts['revs']=cmdutil.revrange(self.repo,[text])exceptException,e:gdialog.Prompt(_('Invalid revision range'),str(e),self).run()returnelifmode==1:# File Patternsopts['pats']=[w.strip()forwintext.split(',')]elifmode==2:# Keywordsopts['keyword']=[w.strip()forwintext.split(',')]elifmode==3:# Datetry:# return of matchdate not used, just sanity checkingutil.matchdate(text)opts['date']=textexcept(ValueError,util.Abort),e:gdialog.Prompt(_('Invalid date specification'),str(e),self).run()returnelse:returnself.custombutton.set_active(True)self.filter='custom'self.reload_log(**opts)deffilter_selected(self,widget,type):ifnotwidget.get_active():returniftype=='branch':self.select_branch(self.branchcombo)else:self.filter=typeself.reload_log()defpatch_selected(self,mqwidget,revid,patchname):ifrevid<0:patchfile=os.path.join(self.repo.root,'.hg','patches',patchname)self.currevid=self.lastrevid=Noneself.changeview.load_patch_details(patchfile)else:self.currevid=revidifself.currevid!=self.lastrevid:self.lastrevid=self.currevidself.changeview.opts['rev']=[str(self.currevid)]self.changeview.load_details(self.currevid)defrepo_invalidated(self,mqwidget):self.reload_log()defprepare_display(self):'Called at end of display() method'self.ready=Trueroot=self.repo.rootos.chdir(root)# for paths relative to repo rootself.origtip=self.opts['orig-tip']orlen(self.repo)self.graphview.set_property('branch-color',self.branch_color)# ignore file patterns that imply repo rootiflen(self.pats)==1andself.pats[0]in(root,root+os.sep,''):self.pats=[]opts=self.optsifopts['filehist']:self.custombutton.set_active(True)self.filter='custom'self.filtercombo.set_active(1)self.filterentry.set_text(opts['filehist'])opts['pats']=[opts['filehist']]elifself.pats:self.custombutton.set_active(True)self.filter='custom'self.filtercombo.set_active(1)self.filterentry.set_text(', '.join(self.pats))opts['pats']=self.patsself.reload_log(**opts)self.filterbox.set_property('visible',self.show_filterbar)self.filterbox.set_no_show_all(True)forcolin('rev','date','id','branch','utc','age','tag'):self.graphview.set_property(col+'-column-visible',self.showcol[col])# enable MQ panelself.enable_mqpanel()defget_graphlimit(self,suggestion):limit_opt=self.repo.ui.config('tortoisehg','graphlimit','500')l=0forlimitin(suggestion,limit_opt):try:l=int(limit)ifl>0:returnlexcept(TypeError,ValueError):passreturnlor500defsave_settings(self):settings=gdialog.GDialog.save_settings(self)settings['glog-vpane']=self.vpaned.get_position()settings['glog-hpane']=self.hpaned.get_position()settings['branch-color']=self.graphview.get_property('branch-color')settings['show-filterbar']=self.show_filterbarsettings['graphcol']=self.graphcolsettings['compactgraph']=self.compactgraphforcolin('rev','date','id','branch','utc','age','tag'):vis=self.graphview.get_property(col+'-column-visible')settings['glog-vis-'+col]=visreturnsettingsdefload_settings(self,settings):'Called at beginning of display() method'gdialog.GDialog.load_settings(self,settings)self.setting_vpos=-1self.setting_hpos=-1self.branch_color=Falseself.show_filterbar=Trueself.graphcol=Trueself.compactgraph=Falseself.showcol={}try:self.setting_vpos=settings['glog-vpane']self.setting_hpos=settings['glog-hpane']self.branch_color=settings.get('branch-color',False)self.show_filterbar=settings.get('show-filterbar',True)forcolin('rev','date','id','branch','utc','age','tag'):vis=settings.get('glog-vis-'+col,False)self.showcol[col]=visself.graphcol=settings['graphcol']self.compactgraph=settings['compactgraph']exceptKeyError:passdefrefresh_model(self):'Refresh data in the history model, without reloading graph'ifself.graphview.model:self.graphview.model.refresh()# refresh MQ widget if existsifhasattr(self,'mqwidget'):self.mqwidget.refresh()defreload_log(self,**kwopts):'Send refresh event to treeview object'opts={'date':None,'no_merges':False,'only_merges':False,'keyword':[],'branch':None,'pats':[],'filehist':None,'revrange':[],'revlist':[],'noheads':False,'branch-view':self.compactgraph,'rev':[]}opts.update(kwopts)# handle strips, rebases, etcself.origtip=min(len(self.repo),self.origtip)opts['orig-tip']=self.origtipself.loadnextbutton.set_sensitive(True)self.loadallbutton.set_sensitive(True)self.newbutton.set_sensitive(self.origtip!=len(self.repo))self.ancestrybutton.set_sensitive(False)pats=opts.get('pats',[])self.changeview.pats=patsself.lastrevid=Nonedefftitle(filtername):t=self.get_title()iffilternameisnotNone:t=t+' - '+filternameself.set_title(t)ifself.filter=='branch':branch=opts.get('branch',None)self.graphview.refresh(self.graphcol,branch,opts)ftitle(_('%s branch')%branch)elifself.filter=='custom':ftitle(_('custom filter'))iflen(pats)==1andnotos.path.isdir(pats[0]):opts['filehist']=pats[0]self.graphview.refresh(self.graphcol,pats,opts)else:self.graphview.refresh(False,pats,opts)elifself.filter=='all':ftitle(None)self.graphview.refresh(self.graphcol,None,opts)elifself.filter=='new':ftitle(_('new revisions'))assertlen(self.repo)>self.origtipopts['revrange']=[len(self.repo)-1,self.origtip]self.graphview.refresh(self.graphcol,None,opts)elifself.filter=='only_merges':ftitle(_('merges'))opts['only_merges']=Trueself.graphview.refresh(False,[],opts)elifself.filter=='ancestry':ftitle(_('revision ancestry'))range=[self.currevid,0]opts['noheads']=Trueopts['revrange']=rangeself.graphview.refresh(self.graphcol,None,opts)elifself.filter=='tagged':ftitle(_('tagged revisions'))tagged=[]fort,rinself.repo.tagslist():hr=self.repo[r].rev()ifhrnotintagged:tagged.insert(0,hr)opts['revlist']=taggedself.graphview.refresh(False,[],opts)elifself.filter=='parents':ftitle(_('working parents'))repo_parents=[x.rev()forxinself.repo.parents()]opts['revlist']=[str(x)forxinrepo_parents]self.graphview.refresh(False,[],opts)elifself.filter=='heads':ftitle(_('heads'))heads=[self.repo[x].rev()forxinself.repo.heads()]opts['revlist']=[str(x)forxinheads]self.graphview.refresh(False,[],opts)# refresh MQ widget if existsifhasattr(self,'mqwidget'):self.mqwidget.refresh()deftree_context_menu(self):m=gtk.Menu()m.append(create_menu(_('visualize change'),self.vdiff_change)) m.append(create_menu(_('di_splay change'), self.show_status))
m.append(create_menu(_('diff to local'), self.vdiff_local))
m.append(create_menu(_('_update'), self.checkout))
- self.cmenu_merge = create_menu(_('_merge with'), self.merge)
+ self.cmenu_merge = create_menu(_('_merge with'), self.domerge)
m.append(self.cmenu_merge)
m.append(create_menu(_('_copy hash'), self.copy_hash))
m.append(create_menu(_('_export patch'), self.export_patch))
m.append(create_menu(_('e_mail patch'),self.email_patch))m.append(create_menu(_('_bundle rev:tip'),self.bundle_rev_to_tip))m.append(create_menu(_('add/remove _tag'),self.add_tag))self.cmenu_backout=create_menu(_('backout revision'),self.backout_rev)m.append(self.cmenu_backout)m.append(create_menu(_('_revert'),self.revert))m.append(create_menu(_('_archive'),self.archive))# need transplant extension for transplant commandif'transplant'inself.exs:m.append(create_menu(_('transp_lant to local'),self.transplant_rev))# need mq extension for strip commandif'mq'inself.exs:m.append(create_menu(_('qimport'),self.qimport_rev))m.append(create_menu(_('strip revision'),self.strip_rev))m.show_all()returnmdefrestore_original_selection(self,widget,*args):self.tree.get_selection().set_mode(gtk.SELECTION_SINGLE)self.tree.get_selection().select_path(self.origsel)deftree_diff_context_menu(self):m=gtk.Menu()m.append(create_menu(_('_diff with selected'),self.diff_revs))m.append(create_menu(_('visual diff with selected'),self.vdiff_selected))m.append(create_menu(_('email from here to selected'),self.email_revs))m.append(create_menu(_('bundle from here to selected'), self.bundle_revs))
m.append(create_menu(_('export patches from here to selected'),
self.export_revs))
- self.cmenu_merge2 = create_menu(_('_merge with'), self.merge)
+ self.cmenu_merge2 = create_menu(_('_merge with'), self.domerge)
m.append(self.cmenu_merge2)
# need transplant extension for transplant command
if'transplant'inself.exs:m.append(create_menu(_('transplant revision range to local'),self.transplant_revs))# need rebase extension for rebase commandif'rebase'inself.exs:m.append(create_menu(_('rebase on top of selected'),self.rebase_selected))# need MQ extension for qimport commandif'mq'inself.exs:m.append(create_menu(_('qimport from here to selected'),self.qimport_revs))m.connect_after('selection-done',self.restore_original_selection)m.show_all()returnmdefgorev_menu(self):m=gtk.Menu()defgoto_tip(menuitem):self.goto_rev(self.repo['tip'].node())m.append(create_menu(_('tip'),goto_tip))defgoto_parent(menuitem):self.goto_rev(self.repo['.'].node())m.append(create_menu(_('parent'),goto_parent))# TODO: last merged, qtip, qparent, qbase, tagsm.show_all()returnmdefget_body(self):self.gorev_dialog=Noneself._menu=self.tree_context_menu()self._menu2=self.tree_diff_context_menu()self.stbar=gtklib.StatusBar()self.limit=self.get_graphlimit(None)# Allocate TreeView instance to use internallyifself.opts['limit']:firstlimit=self.get_graphlimit(self.opts['limit'])self.graphview=LogTreeView(self.repo,firstlimit,self.stbar)else:self.graphview=LogTreeView(self.repo,self.limit,self.stbar)# Allocate ChangeSet instance to use internallyself.changeview=changeset.ChangeSet(self.ui,self.repo,self.cwd,[],self.opts,self.stbar)self.changeview.display(False)self.changeview.glog_parent=self# Add extra toolbar buttonssep=gtk.SeparatorToolItem()sep.set_expand(True)sep.set_draw(False)self.loadnextbutton=self.make_toolbutton(gtk.STOCK_GO_DOWN,_('Load more'),self.more_clicked,tip=_('load more revisions'))self.loadallbutton=self.make_toolbutton(gtk.STOCK_GOTO_BOTTOM,_('Load all'),self.load_all_clicked,tip=_('load all revisions'))tbar=self.changeview.get_tbbuttons()tbar+=[sep,self.loadnextbutton,self.loadallbutton]fortbuttonintbar:self.toolbar.insert(tbutton,-1)# PyGtk 2.6 and below did not automatically register typesifgobject.pygtk_version<(2,8,0):gobject.type_register(LogTreeView)self.tree=self.graphview.treeviewself.graphview.connect('revision-selected',self.selection_changed)self.graphview.connect('revisions-loaded',self.revisions_loaded)self.tree.connect('popup-menu',self.tree_popup_menu)self.tree.connect('button-press-event',self.tree_button_press)self.tree.connect('row-activated',self.tree_row_act)accelgroup=gtk.AccelGroup()self.add_accel_group(accelgroup)mod=gtklib.get_thg_modifier()key,modifier=gtk.accelerator_parse(mod+'d')self.tree.add_accelerator('thg-diff',accelgroup,key,modifier,gtk.ACCEL_VISIBLE)self.tree.connect('thg-diff',self.thgdiff)key,modifier=gtk.accelerator_parse(mod+'p')self.tree.add_accelerator('thg-parent',accelgroup,key,modifier,gtk.ACCEL_VISIBLE)self.tree.connect('thg-parent',self.thgparent)self.connect('thg-refresh',self.thgrefresh)self.filterbox=gtk.HBox()filterbox=self.filterboxall=gtk.RadioButton(None,_('all'))all.set_active(True)all.connect('toggled',self.filter_selected,'all')filterbox.pack_start(all,False)self.newbutton=gtk.RadioButton(all,_('new'))self.newbutton.connect('toggled',self.filter_selected,'new')filterbox.pack_start(self.newbutton,False)tagged=gtk.RadioButton(all,_('tagged'))tagged.connect('toggled',self.filter_selected,'tagged')filterbox.pack_start(tagged,False)ancestry=gtk.RadioButton(all,_('ancestry'))ancestry.connect('toggled',self.filter_selected,'ancestry')filterbox.pack_start(ancestry,False)self.ancestrybutton=ancestryparents=gtk.RadioButton(all,_('parents'))parents.connect('toggled',self.filter_selected,'parents')filterbox.pack_start(parents,False)heads=gtk.RadioButton(all,_('heads'))heads.connect('toggled',self.filter_selected,'heads')filterbox.pack_start(heads,False)merges=gtk.RadioButton(all,_('merges'))merges.connect('toggled',self.filter_selected,'only_merges')filterbox.pack_start(merges,False)branches=gtk.RadioButton(all,_('branch'))branches.connect('toggled',self.filter_selected,'branch')branches.set_sensitive(False)self.branchbutton=branchesfilterbox.pack_start(branches,False)dblist=self.repo.ui.config('tortoisehg','deadbranch','')deadbranches=[x.strip()forxindblist.split(',')]branchcombo=gtk.combo_box_new_text()fornameinself.repo.branchtags().keys():ifnamenotindeadbranches:branchcombo.append_text(name)branchcombo.connect('changed',self.select_branch)self.lastbranchrow=Nonefilterbox.pack_start(branchcombo,False)self.branchcombo=branchcomboself.custombutton=gtk.RadioButton(all,_('custom'))self.custombutton.set_sensitive(False)filterbox.pack_start(self.custombutton,False)filtercombo=gtk.combo_box_new_text()forfin(_('Rev Range'),_('File Patterns'),_('Keywords'),_('Date')):filtercombo.append_text(f)filtercombo.set_active(1)self.filtercombo=filtercombofilterbox.pack_start(filtercombo,False)entry=gtk.Entry()entry.connect('activate',self.filter_entry_activated,filtercombo)self.filterentry=entryfilterbox.pack_start(entry,True)midpane=gtk.VBox()midpane.pack_start(filterbox,False,False,0)midpane.pack_start(self.graphview,True,True,0)midpane.show_all()if'mq'inself.exs:# create MQWidgetself.mqwidget=thgmq.MQWidget(self.repo,accelgroup,self.tooltips)self.mqwidget.connect('patch-selected',self.patch_selected)self.mqwidget.connect('repo-invalidated',self.repo_invalidated)defwrapframe(widget):frame=gtk.Frame()frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)frame.add(widget)returnframeself.mqpaned=gtk.HPaned()self.mqpaned.add1(wrapframe(self.mqwidget))self.mqpaned.add2(wrapframe(midpane))midpane=self.mqpaned# Add ChangeSet instance to bottom half of vpaneself.changeview.graphview=self.graphviewself.hpaned=self.changeview.get_body()self.vpaned=gtk.VPaned()self.vpaned.pack1(midpane,True,False)self.vpaned.pack2(self.hpaned)gobject.idle_add(self.realize_settings)vbox=gtk.VBox()vbox.pack_start(self.vpaned,True,True)# Append status barvbox.pack_start(gtk.HSeparator(),False,False)vbox.pack_start(self.stbar,False,False)returnvboxdefrealize_settings(self):self.vpaned.set_position(self.setting_vpos)self.hpaned.set_position(self.setting_hpos)defthgdiff(self,treeview):'ctrl-d handler'self.vdiff_change(None)defthgparent(self,treeview):'ctrl-p handler'parent=self.repo['.'].rev()self.graphview.set_revision_id(parent)defgoto_clicked(self,toolbutton,data=None):ifself.gorev_dialog:self.gorev_dialog.show()self.gorev_dialog.present()else:self.show_goto_dialog()defselect_branch(self,combo):row=combo.get_active()ifrow>=0androw!=self.lastbranchrow:self.filter='branch'self.lastbranchrow=rowself.branchbutton.set_active(True)self.branchbutton.set_sensitive(True)self.reload_log(branch=combo.get_model()[row][0])else:self.lastbranchrow=Noneself.branchbutton.set_sensitive(False)defshow_goto_dialog(self):'Launch a modeless goto revision dialog'defgoto_rev_(rev):self.goto_rev(rev)defresponse_(dialog,response_id):dialog.hide()defdelete_event(dialog,event,data=None):# return True to prevent the dialog from being destroyedreturnTruedlg=gorev.GotoRevDialog(goto_rev_)dlg.connect('response',response_)dlg.connect('delete-event',delete_event)dlg.set_modal(False)dlg.show()self.gorev_dialog=dlgdefgoto_rev(self,revision):rid=self.repo[revision].rev()self.graphview.set_revision_id(rid,load=True)defstrip_rev(self,menuitem):rev=self.currevidres=gdialog.Confirm(_('Confirm Strip Revision(s)'),[],self,_('Remove revision %d and all descendants?')%rev).run()ifres!=gtk.RESPONSE_YES:returncmdline=['hg','strip',str(rev)]dlg=hgcmd.CmdDialog(cmdline)dlg.show_all()dlg.run()dlg.hide()self.repo.invalidate()self.reload_log()self.changeview._buffer.set_text('')self.changeview._filelist.clear()defbackout_rev(self,menuitem):oldlen=len(self.repo)hash=str(self.repo[self.currevid])parents=[x.node()forxinself.repo.parents()]defrefresh(*args):self.repo.invalidate()iflen(self.repo)!=oldlen:self.reload_log()dlg=backout.BackoutDialog(hash)dlg.set_transient_for(self)dlg.connect('destroy',refresh)dlg.show_all()dlg.present()dlg.set_transient_for(None)defrevert(self,menuitem):rev=self.currevidres=gdialog.Confirm(_('Confirm Revert All Files'),[],self,_('Revert all files to revision %d?\nThis will overwrite your ''local changes')%rev).run()ifres!=gtk.RESPONSE_YES:returncmdline=['hg','revert','--verbose','--all','--rev',str(rev)]dlg=hgcmd.CmdDialog(cmdline)dlg.show_all()dlg.run()dlg.hide()defvdiff_change(self,menuitem,pats=[]):self._do_diff(pats,{'change':str(self.currevid)})defvdiff_local(self,menuitem,pats=[]):self._do_diff(pats,{'rev':[str(self.currevid)]})defdiff_revs(self,menuitem):rev0,rev1=self.revrangestatopts=self.merge_opts(commands.table['^status|st'][1],('include','exclude','git'))statopts['rev']=['%u:%u'%(rev0,rev1)]statopts['modified']=Truestatopts['added']=Truestatopts['removed']=Truedialog=status.GStatus(self.ui,self.repo,self.cwd,self.pats,statopts)dialog.display()returnTruedefvdiff_selected(self,menuitem):strrevs=[str(r)forrinself.revrange]self._do_diff(self.pats,{'rev':strrevs})defemail_revs(self,menuitem):revrange=list(self.revrange)revrange.sort()opts=['--rev',str(revrange[0])+':'+str(revrange[1])]dlg=hgemail.EmailDialog(self.repo.root,opts)dlg.set_transient_for(self)dlg.show_all()dlg.present()dlg.set_transient_for(None)defexport_revs(self,menuitem):result=gtklib.NativeFolderSelectDialog(title=_('Save patches to'),initial=self.repo.root).run()ifresult:revs=list(self.revrange)revs.sort()rev='%d:%d'%(revs[0],revs[1])# In case new export args are added in the future, merge the# hg defaultsopts=self.merge_opts(commands.table['^export'][1],())opts['output']=os.path.join(result,'%b_rev%R.patch')defdohgexport():commands.export(self.ui,self.repo,rev,**opts)s,o=self._hg_call_wrapper('Export',dohgexport,False)defbundle_revs(self,menuitem):revrange=list(self.revrange)revrange.sort()parent=self.repo[revrange[0]].parents()[0].rev()# Special case for revision 0's parent.ifparent==-1:parent='null'filename="%s_rev%d_to_rev%s.hg"%(os.path.basename(self.repo.root),revrange[0],revrange[1])result=gtklib.NativeSaveFileDialogWrapper(Title=_('Write bundle to'),InitialDir=self.repo.root,FileName=filename).run()ifresult:cmdline=['hg','bundle','--base',str(parent),'--rev',str(revrange[1]),result]dlg=hgcmd.CmdDialog(cmdline)dlg.show_all()dlg.run()dlg.hide()defqimport_rev(self,menuitem):"""QImport selected revision."""rev=str(self.currevid)self.qimport_revs(menuitem,rev)defqimport_revs(self,menuitem,rev=None):"""QImport revision range."""ifrev==None:revs=list(self.revrange)revs.sort()rev='%s:%s'%(str(revs[0]),str(revs[1]))cmdline=['hg','qimport','--rev',rev]dialog=hgcmd.CmdDialog(cmdline)dialog.show_all()dialog.run()dialog.hide()self.repo.invalidate()self.reload_log()self.changeview._buffer.set_text('')self.changeview._filelist.clear()self.enable_mqpanel()defrebase_selected(self,menuitem):"""Rebase revision on top of selection (1st on top of 2nd)."""revs=self.revrangeres=gdialog.Confirm(_('Confirm Rebase Revision'),[],self,_('Rebase revision %d on top of %d?')%(revs[0],revs[1])).run()ifres!=gtk.RESPONSE_YES:returncmdline=['hg','rebase','--source',str(revs[0]),'--dest',str(revs[1])]dialog=hgcmd.CmdDialog(cmdline)dialog.show_all()dialog.run()dialog.hide()self.repo.invalidate()self.reload_log()self.changeview._buffer.set_text('')self.changeview._filelist.clear()deftransplant_revs(self,menuitem):"""Transplant revision range on top of current revision."""revs=list(self.revrange)revs.sort()cmdline=['hg','transplant','%d:%d'%(revs[0],revs[1])]dialog=hgcmd.CmdDialog(cmdline)dialog.show_all()dialog.run()dialog.hide()self.repo.invalidate()self.reload_log()self.changeview._buffer.set_text('')self.changeview._filelist.clear()defadd_tag(self,menuitem):# save tag info for detecting new tags addedoldtags=self.repo.tagslist()oldlen=len(self.repo)rev=self.curreviddefrefresh(*args):self.repo.invalidate()iflen(self.repo)!=oldlen:self.reload_log()else:newtags=self.repo.tagslist()ifnewtags!=oldtags:self.refresh_model()dialog=tagadd.TagAddDialog(self.repo,rev=str(rev))dialog.set_transient_for(self)dialog.connect('destroy',refresh)dialog.show_all()dialog.present()dialog.set_transient_for(None)defshow_status(self,menuitem):rev=self.currevidstatopts=self.merge_opts(commands.table['^status|st'][1],('include','exclude','git'))ifself.changeview.parent_toggle.get_active():parent=self.repo[rev].parents()[1].rev()else:parent=self.repo[rev].parents()[0].rev()statopts['rev']=[str(parent),str(rev)]statopts['modified']=Truestatopts['added']=Truestatopts['removed']=Truedialog=status.GStatus(self.ui,self.repo,self.cwd,self.pats,statopts)dialog.display()defcopy_hash(self,menuitem):hash=self.repo[self.currevid].hex()sel=(os.name=='nt')and'CLIPBOARD'or'PRIMARY'clipboard=gtk.Clipboard(selection=sel)clipboard.set_text(hash)defexport_patch(self,menuitem):rev=self.currevidfilename="%s_rev%s.patch"%(os.path.basename(self.repo.root),rev)result=gtklib.NativeSaveFileDialogWrapper(Title=_('Save patch to'),InitialDir=self.repo.root,FileName=filename).run()ifresult:ifos.path.exists(result):res=gdialog.Confirm(_('Confirm Overwrite'),[],self,_('The file "%s" already exists!\n\n''Do you want to overwrite it?')%result).run()ifres!=gtk.RESPONSE_YES:returnos.remove(result)# In case new export args are added in the future, merge the# hg defaultsexportOpts=self.merge_opts(commands.table['^export'][1],())exportOpts['output']=resultdefdohgexport():commands.export(self.ui,self.repo,str(rev),**exportOpts)success,outtext=self._hg_call_wrapper("Export",dohgexport,False)defbundle_rev_to_tip(self,menuitem):try:rev=self.currevidparent=self.repo[rev].parents()[0].rev()# Special case for revision 0's parent.ifparent==-1:parent='null'except(ValueError,hglib.LookupError):returnfilename="%s_rev%d_to_tip.hg"%(os.path.basename(self.repo.root),rev)result=gtklib.NativeSaveFileDialogWrapper(Title=_('Write bundle to'),InitialDir=self.repo.root,FileName=filename).run()ifresult:ifos.path.exists(result):res=gdialog.Confirm(_('Confirm Overwrite'),[],self,_('The file "%s" already exists!\n\n''Do you want to overwrite it?')%result).run()ifres!=gtk.RESPONSE_YES:returnos.remove(result)cmdline=['hg','bundle','--base',str(parent),result]dlg=hgcmd.CmdDialog(cmdline)dlg.show_all()dlg.run()dlg.hide()defemail_patch(self,menuitem):rev=self.curreviddlg=hgemail.EmailDialog(self.repo.root,['--rev',str(rev)])dlg.set_transient_for(self)dlg.show_all()dlg.present()dlg.set_transient_for(None)defcheckout(self,menuitem):rev=self.currevidparents=[x.node()forxinself.repo.parents()]dialog=update.UpdateDialog(rev)dialog.set_transient_for(self)dialog.show_all()dialog.set_notify_func(self.checkout_completed,parents)dialog.present()dialog.set_transient_for(None)defcheckout_completed(self,oldparents):self.repo.invalidate()self.repo.dirstate.invalidate()newparents=[x.node()forxinself.repo.parents()] if not oldparents == newparents:
self.refresh_model()
- def merge(self, menuitem):
+ def domerge(self, menuitem):
rev = self.currevid
parents = [x.node() for x in self.repo.parents()]
if rev == self.repo.parents()[0].rev():
rev=self.revrange[1]dialog=merge.MergeDialog(rev)dialog.set_transient_for(self)dialog.show_all()dialog.set_notify_func(self.merge_completed,parents,len(self.repo))dialog.present()dialog.set_transient_for(None)defmerge_completed(self,args):self.repo.invalidate()self.repo.dirstate.invalidate()oldparents,repolen=argsnewparents=[x.node()forxinself.repo.parents()]iflen(self.repo)!=repolen:self.reload_log()elifnotoldparents==newparents:self.refresh_model()defarchive(self,menuitem):rev=self.currevidparents=[x.node()forxinself.repo.parents()]dialog=archive.ArchiveDialog(rev)dialog.set_transient_for(self)dialog.show_all()dialog.present()dialog.set_transient_for(None)deftransplant_rev(self,menuitem):"""Transplant selection on top of current revision."""rev=self.currevidcmdline=['hg','transplant',str(rev)]dialog=hgcmd.CmdDialog(cmdline)dialog.show_all()dialog.run()dialog.hide()self.repo.invalidate()self.reload_log()self.changeview._buffer.set_text('')self.changeview._filelist.clear()defthgrefresh(self,window):self.reload_log()defrefresh_clicked(self,toolbutton,data=None):self.reload_log()returnTruedefenable_mqpanel(self,enable=None):ifnothasattr(self,'mqpaned'):returnifenable==None:enable=self.mqwidget.has_patch()self.mqpaned.set_position(enableand180or0)# set the state of MQ toolbuttonifhasattr(self,'mqtb'):self.mqtb.handler_block_by_func(self.mq_clicked)self.mqtb.set_active(enable)self.mqtb.handler_unblock_by_func(self.mq_clicked)defmq_clicked(self,toolbutton,data=None):self.enable_mqpanel(self.mqtb.get_active())deftree_button_press(self,tree,event):ifevent.button==3andnot(event.state&(gtk.gdk.SHIFT_MASK|gtk.gdk.CONTROL_MASK)):path=tree.get_path_at_pos(int(event.x),int(event.y))ifnotpath:returnFalsecrow=path[0](model,pathlist)=tree.get_selection().get_selected_rows()ifpathlist==[]:returnFalsesrow=pathlist[0]ifsrow==crow:self.tree_popup_menu(tree,event.button,event.time)else:tree.get_selection().set_mode(gtk.SELECTION_MULTIPLE)tree.get_selection().select_path(crow)self.origsel=srowrev0=self.graphview.get_revid_at_path(srow)rev1=self.graphview.get_revid_at_path(crow)self.revrange=(rev0,rev1)self.tree_popup_menu_diff(tree,event.button,event.time)returnTruereturnFalsedeftree_popup_menu(self,treeview,button=0,time=0):# disable/enable menus as requiredparents=[x.rev()forxinself.repo.parents()]can_merge=self.currevidnotinparentsandlen(parents)<2self.cmenu_merge.set_sensitive(can_merge)op1,op2=self.repo.dirstate.parents()node=self.repo[self.currevid].node()a=self.repo.changelog.ancestor(op1,node)self.cmenu_backout.set_sensitive(a==node)# display the context menuself._menu.popup(None,None,None,button,time)returnTruedeftree_popup_menu_diff(self,treeview,button=0,time=0):# disable/enable menus as requiredparents=[x.rev()forxinself.repo.parents()]can_merge=self.currevidinparentsandlen(parents)<2self.cmenu_merge2.set_sensitive(can_merge)# display the context menuself._menu2.popup(None,None,None,button,time)returnTruedeftree_row_act(self,tree,path,column):'Default action is the first entry in the context menu'self._menu.get_children()[0].activate()returnTruedefrun(ui,*pats,**opts):cmdoptions={'follow':False,'follow-first':False,'copies':False,'keyword':[],'limit':0,'rev':[],'removed':False,'no_merges':False,'date':None,'only_merges':None,'prune':[],'git':False,'verbose':False,'include':[],'exclude':[],'from-synch':False,'orig-tip':None,'filehist':None,'canonpats':[]}cmdoptions.update(opts)pats=hglib.canonpaths(pats)+cmdoptions['canonpats']returnGLog(ui,None,None,pats,cmdoptions)
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.