Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

thgimport: add to workbench Repository menu

Changeset 947b5876f249…

Parent b1de131ae3c7…

by David Wilhelm

Changes to 2 files · Browse files at 947b5876f249 Showing diff from parent b1de131ae3c7 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
18
19
20
21
 
22
23
24
 
128
129
130
 
 
 
 
131
132
133
 
18
19
20
 
21
22
23
24
 
128
129
130
131
132
133
134
135
136
137
@@ -18,7 +18,7 @@
 from tortoisehg.hgqt.qtlib import CustomPrompt  from tortoisehg.hgqt.repomodel import HgRepoListModel  from tortoisehg.hgqt import cmdui, update, tag, backout, merge -from tortoisehg.hgqt import archive, thgstrip, run +from tortoisehg.hgqt import archive, thgimport, thgstrip, run    from tortoisehg.hgqt.repoview import HgRepoView  from tortoisehg.hgqt.revdetailswidget import RevDetailsWidget @@ -128,6 +128,10 @@
  def forward(self):   self.repoview.forward()   + def thgimport(self): + dlg = thgimport.ImportDialog(repo=self.repo, parent=self) + dlg.exec_() +   def verify(self):   cmdline = ['--repository', self.repo.root, 'verify']   dlg = cmdui.Dialog(cmdline, self)
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
255
256
257
 
258
259
260
 
286
287
288
 
 
289
290
291
 
579
580
581
 
582
583
584
 
683
684
685
 
 
 
 
 
686
687
688
 
255
256
257
258
259
260
261
 
287
288
289
290
291
292
293
294
 
582
583
584
585
586
587
588
 
687
688
689
690
691
692
693
694
695
696
697
@@ -255,6 +255,7 @@
  self.actionShowLog = a     self.actionServe = QAction(_("Web Server"), self) + self.actionImport = QAction(_("Import"), self)   self.actionVerify = QAction(_("Verify"), self)   self.actionRecover = QAction(_("Recover"), self)   self.actionRollback = QAction(_("Rollback/Undo"), self) @@ -286,6 +287,8 @@
  self.menuRepository = m = QMenu(_("&Repository"), self.menubar)   m.addAction(self.actionServe)   m.addSeparator() + m.addAction(self.actionImport) + m.addSeparator()   m.addAction(self.actionVerify)   m.addAction(self.actionRecover)   m.addSeparator() @@ -579,6 +582,7 @@
  self.actionQuit.triggered.connect(self.close)   self.actionBack.triggered.connect(self.back)   self.actionForward.triggered.connect(self.forward) + self.actionImport.triggered.connect(self.thgimport)   self.actionLoadAll.triggered.connect(self.loadall)   self.actionSelectColumns.triggered.connect(self.setHistoryColumns)   self.actionShowPaths.toggled.connect(self.actionShowPathsToggled) @@ -683,6 +687,11 @@
  from tortoisehg.hgqt import run   run.serve(self.ui, root=w.repo.root)   + def thgimport(self): + w = self.repoTabsWidget.currentWidget() + if w: + w.thgimport() +   def verify(self):   w = self.repoTabsWidget.currentWidget()   if w: