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

thgimport: support shelf import and working dir import (--no-commit)

Changeset 08a03aa1c9d7…

Parent 494ca32d2c68…

by Steve Borho

Changes to one file · Browse files at 08a03aa1c9d7 Showing diff from parent 494ca32d2c68 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​thgimport.py Stacked
 
6
7
8
9
 
 
 
10
11
12
 
30
31
32
33
34
35
36
 
75
76
77
78
79
80
 
 
 
 
 
81
82
83
84
 
 
85
86
87
 
198
199
200
201
202
203
204
205
206
 
 
207
208
 
209
210
211
 
246
247
248
249
250
251
252
253
 
 
 
 
 
 
 
 
 
 
 
254
255
256
 
6
7
8
 
9
10
11
12
13
14
 
32
33
34
 
35
36
37
 
76
77
78
 
 
 
79
80
81
82
83
84
85
 
 
86
87
88
89
90
 
201
202
203
 
 
 
 
 
 
204
205
206
 
207
208
209
210
 
245
246
247
 
 
 
 
 
248
249
250
251
252
253
254
255
256
257
258
259
260
261
@@ -6,7 +6,9 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -import os, tempfile +import os +import shutil +import tempfile    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -30,7 +32,6 @@
    self.tempfiles = []   self.repo = repo - self.mqloaded = 'mq' in repo.extensions()     # base layout box   box = QVBoxLayout() @@ -75,13 +76,15 @@
  statbox = QHBoxLayout()   self.status = QLabel("")   statbox.addWidget(self.status) - self.patchq = QComboBox() - self.patchq.currentIndexChanged.connect(self.updatestatus) - self.patchq.addItem('repository') + self.targetcombo = QComboBox() + self.targetcombo.currentIndexChanged.connect(self.updatestatus) + self.targetcombo.addItem(_('Repository')) + self.targetcombo.addItem(_('Shelf')) + self.targetcombo.addItem(_('Working Directory'))   cur = self.repo.getcurrentqqueue()   if cur: - self.patchq.addItem(cur) - statbox.addWidget(self.patchq) + self.targetcombo.addItem(hglib.tounicode(cur)) + statbox.addWidget(self.targetcombo)   grid.addItem(statbox, 3, 1)     ## command widget @@ -198,14 +201,10 @@
  count = items and len(items) or 0   countstr = qtlib.markup(_("%s patches") % count, weight='bold')   if count: - if self.mqloaded: - self.patchq.setVisible(True) - text = _('%s will be imported to ') % countstr - else: - self.patchq.setVisible(False) - text = _('%s will be imported to the repository') % countstr + self.targetcombo.setVisible(True) + text = _('%s will be imported to ') % countstr   else: - self.patchq.setVisible(False) + self.targetcombo.setVisible(False)   text = qtlib.markup(_('Nothing to import'), weight='bold',   fg='red')   self.status.setText(text) @@ -246,11 +245,17 @@
  os.pathsep.join(hglib.tounicode(p) for p in paths))     def thgimport(self): - if self.mqloaded and self.patchq.currentText() != 'repository': - hgcmd = 'qimport' - else: - hgcmd = 'import' - cmdline = [hgcmd, '--repository', self.repo.root] + idx = self.targetcombo.currentIndex() + if idx == 1: + # import to shelf + existing = self.repo.thgshelves() + if not os.path.exists(self.repo.shelfdir): + os.mkdir(self.repo.shelfdir) + for file in self.cslist.curitems: + shutil.copy(file, self.repo.shelfdir) + return + hgcmd = ('import', 'copy', 'import --no-commit', 'qimport')[idx] + cmdline = hgcmd.split(' ') + ['--repository', self.repo.root]   if self.p0chk.isChecked():   cmdline.append('-p0')   cmdline.extend(['--verbose', '--'])