Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

history: accept files/dir drop in MQ pane

Uses drop signal of MQWidget.

Changeset fc45fa1c1252…

Parent 6d8714e1f4b6…

by Yuki KODAMA

Changes to one file · Browse files at fc45fa1c1252 Showing diff from parent 6d8714e1f4b6 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
821
822
823
 
 
 
824
825
826
 
1517
1518
1519
1520
1521
 
 
1522
1523
 
1524
1525
1526
 
1939
1940
1941
1942
 
1943
1944
1945
 
1952
1953
1954
1955
 
1956
1957
1958
 
2016
2017
2018
2019
 
2020
2021
2022
 
821
822
823
824
825
826
827
828
829
 
1520
1521
1522
 
 
1523
1524
1525
1526
1527
1528
1529
1530
 
1943
1944
1945
 
1946
1947
1948
1949
 
1956
1957
1958
 
1959
1960
1961
1962
 
2020
2021
2022
 
2023
2024
2025
2026
@@ -821,6 +821,9 @@
  def repo_invalidated(self, mqwidget):   self.reload_log()   + def files_dropped(self, mqwidget, files, *args): + self.import_clicked(None, thgimport.DEST_MQ, files) +   def prepare_display(self):   'Called at end of display() method'   self.ready = True @@ -1517,10 +1520,11 @@
  # MQ widget   if 'mq' in self.exs:   # create MQWidget - self.mqwidget = thgmq.MQWidget( - self.repo, accelgroup, self.tooltips) + self.mqwidget = thgmq.MQWidget(self.repo, + accelgroup, self.tooltips)   self.mqwidget.connect('patch-selected', self.patch_selected)   self.mqwidget.connect('repo-invalidated', self.repo_invalidated) + self.mqwidget.connect('files-dropped', self.files_dropped)     def wrapframe(widget):   frame = gtk.Frame() @@ -1939,7 +1943,7 @@
  def stop_clicked(self, toolbutton):   self.runner.stop()   - def import_clicked(self, widget, paths=None): + def import_clicked(self, widget, dest=thgimport.DEST_REPO, paths=None):   oldlen = len(self.repo)   enabled = hasattr(self, 'mqpaned')   if enabled: @@ -1952,7 +1956,7 @@
  if enabled and oldnum < self.mqwidget.get_num_patches():   self.mqwidget.refresh()   self.enable_mqpanel(enable=True) - dialog = thgimport.ImportDialog(self.repo, sources=paths) + dialog = thgimport.ImportDialog(self.repo, dest, paths)   dialog.set_notify_func(import_completed)   self.show_dialog(dialog)   @@ -2016,7 +2020,7 @@
  else:   self.pathentry.set_text(path)   elif dest == DND_DEST_GRAPHVIEW: - self.import_clicked(None, paths) + self.import_clicked(None, thgimport.DEST_REPO, paths)   else:   raise _('unknown dnd dest: %s') % dest