Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset a24455313952…

Parents 9892876e93f3…

Parents d5ec833936a0…

by Steve Borho

Changes to 3 files · Browse files at a24455313952 Showing diff from parent 9892876e93f3 d5ec833936a0 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​setup.cfg Stacked
 
3
4
5
6
 
 
3
4
5
 
6
@@ -3,4 +3,4 @@
 includes=cairo, pango, pangocairo, atk, gobject, dbhash, gtk.keysyms, gio  packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.hgtk, tortoisehg.hgtk.logview, tortoisehg.util, iniparse, pygments, dulwich   -dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll, libgio-2.0-0.dll, mswsock.dll, powrprof.dll +dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll, libgio-2.0-0.dll, mswsock.dll, powrprof.dll, shfolder.dll, credui.dll
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
153
154
155
 
 
 
156
157
158
 
475
476
477
 
 
 
 
 
478
479
480
 
153
154
155
156
157
158
159
160
161
 
478
479
480
481
482
483
484
485
486
487
488
@@ -153,6 +153,9 @@
  # update dialog title   self.set_title(title)   + if self.clipboard: + self.clipboard.set_text(str(ctx)) +   pats = self.pats   if self.graphview:   (path, focus) = self.graphview.treeview.get_cursor() @@ -475,6 +478,11 @@
  'tortoisehg', 'changeset-expander')     self.curfile = '' + if self.repo.ui.configbool('tortoisehg', 'copyhash'): + sel = (os.name == 'nt') and 'CLIPBOARD' or 'PRIMARY' + self.clipboard = gtk.Clipboard(selection=sel) + else: + self.clipboard = None   self.filemenu = self.file_context_menu()     details_frame_parent = gtk.VBox()
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
21
22
23
24
 
25
26
27
 
787
788
789
 
790
791
792
 
21
22
23
 
24
25
26
27
 
787
788
789
790
791
792
793
@@ -21,7 +21,7 @@
 from tortoisehg.util.i18n import _  from tortoisehg.util import settings, hglib, paths, shlib   -from tortoisehg.hgtk import gtklib, hgcmd +from tortoisehg.hgtk import gtklib    class SimpleMessage(gtklib.MessageDialog):   def run(self): @@ -787,6 +787,7 @@
  ### Internal Functions ###     def after_init(self): + from tortoisehg.hgtk import hgcmd   self.get_extras(self.vbox)     # CmdWidget