Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 547e51865271

Parents 2b5ba0e075b9

Parents 03708ea6ee24

by Steve Borho

Changes to one file · Browse files at 547e51865271 Showing diff from parent 2b5ba0e075b9 03708ea6ee24 Diff from another changeset...

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
 
 
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
 
 
 
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
 # hginit.py - TortoiseHg dialog to initialize a repo  #  # Copyright 2008 Steve Borho <steve@borho.org>  # Copyright 2010 Johan Samyn <johan.samyn@gmail.com>  #  # 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    from mercurial import hg, ui, error, util    from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib  from tortoisehg.util import hglib, shlib    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class InitDialog(QDialog):   """TortoiseHg init dialog"""     def __init__(self, destdir=[], opts={}, parent=None):   super(InitDialog, self).__init__(parent)     # main layout   self.vbox = QVBoxLayout()   self.vbox.setSpacing(6)   self.grid = QGridLayout()   self.grid.setSpacing(6)   self.vbox.addLayout(self.grid)     # dest widgets   self.dest_lbl = QLabel(_('Destination path:'))   self.dest_edit = QLineEdit()   self.dest_edit.setMinimumWidth(300)   self.dest_btn = QPushButton(_('Browse...'))   self.dest_btn.setAutoDefault(False)   self.grid.addWidget(self.dest_lbl, 0, 0)   self.grid.addWidget(self.dest_edit, 0, 1)   self.grid.addWidget(self.dest_btn, 0, 2)     # options checkboxes   self.add_files_chk = QCheckBox(   _('Add special files (.hgignore, ...)'))   self.make_pre_1_7_chk = QCheckBox(   _('Make repo compatible with Mercurial <1.7'))   self.run_wb_chk = QCheckBox(   _('Show in Workbench after init'))   self.grid.addWidget(self.add_files_chk, 1, 1)   self.grid.addWidget(self.make_pre_1_7_chk, 2, 1)   if not self.parent():   self.grid.addWidget(self.run_wb_chk, 3, 1)     # buttons   self.init_btn = QPushButton(_('Create'))   self.init_btn.setDefault(True)   self.close_btn = QPushButton(_('&Close'))   self.close_btn.setAutoDefault(False)   self.hbox = QHBoxLayout()   self.hbox.addStretch(0)   self.hbox.addWidget(self.init_btn)   self.hbox.addWidget(self.close_btn)   self.vbox.addLayout(self.hbox)     # some extras   self.hgcmd_lbl = QLabel(_('Hg command:'))   self.hgcmd_lbl.setAlignment(Qt.AlignRight)   self.hgcmd_txt = QLineEdit()   self.hgcmd_txt.setReadOnly(True)   self.grid.addWidget(self.hgcmd_lbl, 4, 0)   self.grid.addWidget(self.hgcmd_txt, 4, 1)     # init defaults   self.cwd = os.getcwd()   path = os.path.abspath(destdir and destdir[0] or self.cwd)   if os.path.isfile(path):   path = os.path.dirname(path)   self.dest_edit.setText(hglib.tounicode(path))   self.add_files_chk.setChecked(True)   self.make_pre_1_7_chk.setChecked(False)   self.compose_command()     # dialog settings   self.setWindowTitle(_('Init'))   self.setWindowIcon(qtlib.geticon('hg-init'))   self.setWindowFlags(   self.windowFlags() & ~Qt.WindowContextHelpButtonHint)   self.setLayout(self.vbox)   self.layout().setSizeConstraint(QLayout.SetFixedSize)   self.dest_edit.setFocus()     # connecting slots   self.dest_edit.textChanged.connect(self.compose_command)   self.dest_btn.clicked.connect(self.browse_clicked)   self.init_btn.clicked.connect(self.init)   self.close_btn.clicked.connect(self.close)   self.make_pre_1_7_chk.toggled.connect(self.compose_command)     def browse_clicked(self):   """Select the destination directory"""   dest = hglib.fromunicode(self.dest_edit.text())   if not os.path.exists(dest):   dest = os.path.dirname(dest)   FD = QFileDialog   caption = _('Select Destination Folder')   path = FD.getExistingDirectory(parent=self, caption=caption,   options=FD.ShowDirsOnly | FD.ReadOnly) - response = str(path) - if response: - self.dest_edit.setText(response) + if path: + self.dest_edit.setText(path)     def compose_command(self):   # just a stub for extension with extra options (--mq, --ssh, ...)   cmd = ['hg', 'init']   if self.make_pre_1_7_chk.isChecked():   cmd.append('--config format.dotencode=False')   cmd.append(self.getPath())   self.hgcmd_txt.setText(hglib.tounicode(' '.join(cmd)))     def getPath(self):   return hglib.fromunicode(self.dest_edit.text()).strip()     def init(self):   dest = self.getPath()     if dest == '':   qtlib.ErrorMsgBox(_('Error executing init'),   _('Destination path is empty'),   _('Please enter the directory path'))   self.dest_edit.setFocus()   return False     dest = os.path.normpath(dest)   self.dest_edit.setText(hglib.tounicode(dest))   udest = self.dest_edit.text()     if not os.path.exists(dest):   p = dest   l = 0   while not os.path.exists(p):   l += 1   p, t = os.path.split(p)   if not t:   break # already root path   if l > 1:   res = qtlib.QuestionMsgBox(_('Init'),   _('Are you sure about adding the new repository '   '%d extra levels deep?') % l,   _('Path exists up to:\n%s\nand you asked for:\n%s')   % (p, udest),   defaultbutton=QMessageBox.No)   if not res:   self.dest_edit.setFocus()   return   try:   # create the folder, just like Hg would   os.makedirs(dest)   except:   qtlib.ErrorMsgBox(_('Error executing init'),   _('Cannot create folder %s') % udest)   return False     _ui = ui.ui()     # dotencode is the new default repo format in Mercurial 1.7   if self.make_pre_1_7_chk.isChecked():   _ui.setconfig('format', 'dotencode', 'False')     try:   # create the new repo   hg.repository(_ui, dest, create=1)   except error.RepoError, inst:   qtlib.ErrorMsgBox(_('Error executing init'),   _('Unable to create new repository'),   hglib.tounicode(str(inst)))   return False   except util.Abort, e:   if e.hint:   err = _('%s (hint: %s)') % (hglib.tounicode(str(e)),   hglib.tounicode(e.hint))   else:   err = hglib.tounicode(str(e))   qtlib.ErrorMsgBox(_('Error executing init'),   _('Error when creating repository'), err)   return False   except:   import traceback   qtlib.ErrorMsgBox(_('Error executing init'),   _('Error when creating repository'),   traceback.format_exc())   return False     # Create the .hg* file, mainly to workaround   # Explorer's problem in creating files with a name   # beginning with a dot.   if (self.add_files_chk.isChecked() and   os.path.exists(os.path.sep.join([dest, '.hg']))):   hgignore = os.path.join(dest, '.hgignore')   if not os.path.exists(hgignore):   try:   open(hgignore, 'wb')   except:   pass     if self.run_wb_chk.isChecked():   from tortoisehg.hgqt import run   try:   run.log(ui.ui(), root=dest)   except Exception, e:   qtlib.WarningMsgBox(_('Init'),   _('<p>Repository successfully created at</p><p>%s</p>') % dest,   _('<p>But could not run Workbench for it.</p><p>%s</p>')   % hglib.tounicode(str(e)))   else:   if not self.parent():   qtlib.InfoMsgBox(_('Init'),   _('<p>Repository successfully created at</p><p>%s</p>') % udest)     self.accept()     def reject(self):   super(InitDialog, self).reject()    def run(ui, *pats, **opts):   return InitDialog(pats, opts)