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

hgignore: introduce Qt version of hgignore file

Still needs work

Changeset ee4271bd2579

Parent 1d7144018fcf

by Steve Borho

Changes to 2 files · Browse files at ee4271bd2579 Showing diff from parent 1d7144018fcf Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
@@ -0,0 +1,188 @@
+# hgignore.py - TortoiseHg's dialog for editing .hgignore +# +# Copyright 2010 Steve Borho <steve@borho.org> +# +# 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 +import re + +from PyQt4.QtCore import * +from PyQt4.QtGui import * + +from mercurial import hg, ui, match, util, error + +from tortoisehg.util.i18n import _ +from tortoisehg.util import shlib, hglib, paths + +from tortoisehg.hgqt import qtlib + +class HgignoreDialog(QDialog): + 'Edit a reposiory .hgignore file' + + ignoreFilterUpdated = pyqtSignal() + + def __init__(self, parent=None, fileglob='', *pats): + 'Initialize the Dialog' + QDialog.__init__(self, parent) + + try: + repo = hg.repository(ui.ui(), path=paths.find_root()) + except error.RepoError: + QDialog.reject(self) + return + + self.repo = repo + self.setWindowTitle(_('Ignore filter - %s') % hglib.get_reponame(repo)) + + vbox = QVBoxLayout() + self.setLayout(vbox) + + # layer 1 + hbox = QHBoxLayout() + vbox.addLayout(hbox) + recombo = QComboBox() + recombo.addItems([_('Glob'), _('Regexp')]) + hbox.addWidget(recombo) + + le = QLineEdit() + hbox.addWidget(le, 1) + le.setText(hglib.tounicode(fileglob)) + le.returnPressed.connect(self.addEntry) + + add = QPushButton(_('Add')) + add.clicked.connect(self.addEntry) + hbox.addWidget(add, 0) + + # layer 2 + hbox = QHBoxLayout() + vbox.addLayout(hbox) + ignorefiles = [repo.wjoin('.hgignore')] + for name, value in repo.ui.configitems('ui'): + if name == 'ignore' or name.startswith('ignore.'): + ignorefiles.append(os.path.expanduser(value)) + + filecombo = QComboBox() + hbox.addWidget(filecombo) + for f in ignorefiles: + filecombo.addItem(hglib.tounicode(f)) + filecombo.currentIndexChanged.connect(self.fileselect) + self.ignorefile = ignorefiles[0] + + edit = QPushButton(_('Edit File')) + edit.clicked.connect(self.editClicked) + hbox.addWidget(edit) + hbox.addStretch(1) + + # layer 3 - main widgets + split = QSplitter() + vbox.addWidget(split, 1) + + ignorelist = QListWidget(split) + unknownlist = QListWidget(split) + + # layer 4 - dialog buttons + BB = QDialogButtonBox + bb = QDialogButtonBox(BB.Ok|BB.Cancel) + self.connect(bb, SIGNAL("accepted()"), self, SLOT("accept()")) + self.connect(bb, SIGNAL("rejected()"), self, SLOT("reject()")) + vbox.addWidget(bb) + self.bb = bb + + le.setFocus() + self.le, self.recombo, self.filecombo = le, recombo, filecombo + self.ignorelist, self.unknownlist = ignorelist, unknownlist + QTimer.singleShot(0, self.refresh) + + s = QSettings() + self.restoreGeometry(s.value('hgignore/geom').toByteArray()) + + + def fileselect(self): + 'user selected another ignore file' + self.ignorefile = hglib.fromunicode(self.filecombo.getCurrentText()) + self.refresh() + + def editClicked(self): + if qtlib.fileEditor(self.ignorefile) == QDialog.Accepted: + self.refresh() + + def addEntry(self): + newfilter = hglib.fromunicode(self.le.text()).strip() + if newfilter == '': + return + if self.recombo.currentIndex() == 0: + newfilter = 'glob:' + newfilter + try: + match.match(self.repo.root, '', [], [newfilter]) + except util.Abort, inst: + qtlib.WarningMsgBox(_('Invalid glob expression'), str(inst), + parent=self) + return + else: + newfilter = 'relre:' + newfilter + try: + match.match(self.repo.root, '', [], [newfilter]) + re.compile(newfilter) + except (util.Abort, re.error), inst: + qtlib.WarningMsgBox(_('Invalid regexp expression'), str(inst), + parent=self) + return + self.ignorelines.append(newfilter) + self.writeIgnoreFile() + self.le.clear() + self.refresh() + + def refresh(self): + uni = hglib.tounicode + try: + hglib.invalidaterepo(self.repo) + wctx = self.repo[None] + wctx.status(unknown=True) + except util.Abort, error.RepoError: + qtlib.WarningMsgBox(_('Unable to read repository status'), + uni(str(e)), parent=self) + + self.unknown = wctx.unknown() + self.unknownlist.clear() + self.unknownlist.addItems([uni(u) for u in self.unknown]) + + try: + l = open(self.ignorefile, 'rb').readlines() + self.doseoln = l[0].endswith('\r\n') + except (IOError, ValueError, IndexError): + self.doseoln = os.name == 'nt' + l = [] + self.ignorelines = [line.strip() for line in l] + self.ignorelist.clear() + self.ignorelist.addItems([uni(l) for l in self.ignorelines]) + + def writeIgnoreFile(self): + eol = self.doseoln and '\r\n' or '\n' + out = eol.join(self.ignorelines) + eol + + try: + f = util.atomictempfile(self.ignorefile, 'wb', createmode=None) + f.write(out) + f.rename() + shlib.shell_notify([self.ignorefile]) + self.emit(SIGNAL('ignoreFilterUpdated')) + except IOError, e: + qtlib.WarningMsgBox(_('Unable to write .hgignore file'), + hglib.tounicode(str(e)), parent=self) + + def accept(self): + s = QSettings() + s.setValue('hgignore/geom', self.saveGeometry()) + QDialog.accept(self) + + def reject(self): + s = QSettings() + s.setValue('hgignore/geom', self.saveGeometry()) + QDialog.reject(self) + +def run(_ui, *pats, **opts): + if pats and pats[0].endswith('.hgignore'): + pats = [] + return HgignoreDialog(None, *pats)
 
392
393
394
 
 
 
 
 
395
396
397
 
656
657
658
 
659
660
661
 
392
393
394
395
396
397
398
399
400
401
402
 
661
662
663
664
665
666
667
@@ -392,6 +392,11 @@
  from tortoisehg.hgqt.quickop import run   qtrun(run, ui, *pats, **opts)   +def hgignore(ui, *pats, **opts): + """ignore filter editor""" + from tortoisehg.hgqt.hgignore import run + qtrun(run, ui, *pats, **opts) +  def shellconfig(ui, *pats, **opts):   """explorer extension configuration editor"""   from tortoisehg.hgqt.shellconf import run @@ -656,6 +661,7 @@
  ('d', 'date', '', _('record datecode as commit date'))],   _('thg commit [OPTIONS] [FILE]...')),   "^grep|search": (grep, [], _('thg grep')), + "^hgignore|ignore|filter": (hgignore, [], _('thg hgignore [FILE]')),   "^email":   (email,   [('r', 'rev', [], _('a revision to send')),],