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

compress: add missing argument in mercurial.revset.match

mercurial.revset.match requires two arguments since 9f5a0acb0056

Changeset 947f5fed5f91…

Parent 0071bcebb8eb…

by André Sintzoff

Changes to one file · Browse files at 947f5fed5f91 Showing diff from parent 0071bcebb8eb Diff from another changeset...

Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​compress.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
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
 # compress.py - History compression dialog for TortoiseHg  #  # 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.    from PyQt4.QtCore import *  from PyQt4.QtGui import *    import os    from mercurial import revset, merge as mergemod    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, csinfo, cmdui, commit, thgrepo    BB = QDialogButtonBox    class CompressDialog(QDialog):   showMessage = pyqtSignal(QString)     def __init__(self, repo, revs, parent):   super(CompressDialog, self).__init__(parent)   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)   self.repo = repo   self.revs = revs     box = QVBoxLayout()   box.setSpacing(8)   box.setContentsMargins(*(6,)*4)   self.setLayout(box)     style = csinfo.panelstyle(selectable=True)     srcb = QGroupBox( _('Compress changesets up to and including'))   srcb.setLayout(QVBoxLayout())   srcb.layout().setContentsMargins(*(2,)*4)   source = csinfo.create(self.repo, revs[0], style, withupdate=True)   srcb.layout().addWidget(source)   self.layout().addWidget(srcb)     destb = QGroupBox( _('Onto destination'))   destb.setLayout(QVBoxLayout())   destb.layout().setContentsMargins(*(2,)*4)   dest = csinfo.create(self.repo, revs[1], style, withupdate=True)   destb.layout().addWidget(dest)   self.destcsinfo = dest   self.layout().addWidget(destb)     self.cmd = cmdui.Widget(True, True, self)   self.cmd.commandFinished.connect(self.commandFinished)   self.cmd.setShowOutput(True)   self.showMessage.connect(self.cmd.stbar.showMessage)   self.cmd.stbar.linkActivated.connect(self.linkActivated)   self.layout().addWidget(self.cmd, 2)     bbox = QDialogButtonBox()   self.cancelbtn = bbox.addButton(QDialogButtonBox.Cancel)   self.cancelbtn.clicked.connect(self.reject)   self.compressbtn = bbox.addButton(_('Compress'),   QDialogButtonBox.ActionRole)   self.compressbtn.clicked.connect(self.compress)   self.layout().addWidget(bbox)   self.bbox = bbox     self.showMessage.emit(_('Checking...'))   QTimer.singleShot(0, self.checkStatus)     self.setMinimumWidth(480)   self.setMaximumHeight(800)   self.resize(0, 340)   self.setWindowTitle(_('Compress - %s') % repo.displayname)     def checkStatus(self):   repo = self.repo   class CheckThread(QThread):   def __init__(self, parent):   QThread.__init__(self, parent)   self.dirty = False     def run(self):   wctx = repo[None]   if len(wctx.parents()) > 1:   self.dirty = True   elif wctx.dirty():   self.dirty = True   else:   for root, path, status in thgrepo.recursiveMergeStatus(repo):   if status == 'u':   self.dirty = True   break   def completed():   self.th.wait()   if self.th.dirty:   self.compressbtn.setEnabled(False)   txt = _('Before compress, you must <a href="commit">'   '<b>commit</b></a> or <a href="discard">'   '<b>discard</b></a> changes.')   else:   self.compressbtn.setEnabled(True)   txt = _('You may continue the compress')   self.showMessage.emit(txt)   self.th = CheckThread(self)   self.th.finished.connect(completed)   self.th.start()     def compress(self):   self.cancelbtn.setShown(False)   uc = ['update', '--repository', self.repo.root, '--clean', '--rev',   str(self.revs[1])]   rc = ['revert', '--repository', self.repo.root, '--all', '--rev',   str(self.revs[0])]   self.repo.incrementBusyCount()   self.cmd.run(uc, rc)     def commandFinished(self, ret):   self.repo.decrementBusyCount()   self.showMessage.emit(_('Changes have been moved, you must now commit'))   self.compressbtn.setText(_('Commit', 'action button'))   self.compressbtn.clicked.disconnect(self.compress)   self.compressbtn.clicked.connect(self.commit)     def commit(self):   tip, base = self.revs - func = revset.match('%s::%s' % (base, tip)) + func = revset.match(self.repo.ui, '%s::%s' % (base, tip))   revcount = len(self.repo)   revs = [c for c in func(self.repo, range(revcount)) if c != base]   descs = [self.repo[c].description() for c in revs]   self.repo.opener('cur-message.txt', 'w').write('\n* * *\n'.join(descs))     dlg = commit.CommitDialog(self.repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.showMessage.emit(_('Compress is complete, old history untouched'))   self.compressbtn.setText(_('Close'))   self.compressbtn.clicked.disconnect(self.commit)   self.compressbtn.clicked.connect(self.accept)     def linkActivated(self, cmd):   if cmd == 'commit':   dlg = commit.CommitDialog(self.repo, [], {}, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.checkStatus()   elif cmd == 'discard':   labels = [(QMessageBox.Yes, _('&Discard')),   (QMessageBox.No, _('Cancel'))]   if not qtlib.QuestionMsgBox(_('Confirm Discard'),   _('Discard outstanding changes to working directory?'),   labels=labels, parent=self):   return   def finished(ret):   self.repo.decrementBusyCount()   if ret == 0:   self.checkStatus()   cmdline = ['update', '--clean', '--repository', self.repo.root,   '--rev', '.']   self.runner = cmdui.Runner(False, self)   self.runner.commandFinished.connect(finished)   self.repo.incrementBusyCount()   self.runner.run(cmdline)