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

backout: simplified process for backing out working parent

Changeset 8f813b82b3d3…

Parent 74b2958ed85b…

by Steve Borho

Changes to one file · Browse files at 8f813b82b3d3 Showing diff from parent 74b2958ed85b Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
68
69
70
 
71
72
73
 
77
78
79
 
 
 
 
 
 
 
 
 
80
81
82
 
112
113
114
115
116
117
118
119
 
147
148
149
150
 
 
 
 
151
152
153
 
175
176
177
 
178
179
180
 
190
191
192
 
 
193
194
195
196
197
198
 
68
69
70
71
72
73
74
 
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
 
122
123
124
 
 
125
126
127
 
155
156
157
 
158
159
160
161
162
163
164
 
186
187
188
189
190
191
192
 
202
203
204
205
206
207
208
 
209
210
211
@@ -68,6 +68,7 @@
  self.merge_chk = QCheckBox(_('Commit backout before merging with '   'current working parent'))   self.merge_chk.toggled.connect(self.merge_toggled) + self.merge_chk.setChecked(bool(opts.get('merge')))   self.msg_text.setEnabled(False)   obox.addWidget(self.merge_chk)   @@ -77,6 +78,15 @@
  repo.ui.configbool('tortoisehg', 'autoresolve', False))   obox.addWidget(self.autoresolve_chk)   + if repo[revhex] == repo.parents()[0]: + # backing out the working parent is a one-step process + self.msg_text.setEnabled(True) + self.merge_chk.setVisible(False) + self.autoresolve_chk.setVisible(False) + self.backoutParent = True + else: + self.backoutParent = False +   self.reslabel = QLabel()   self.reslabel.linkActivated.connect(self.link_activated)   box.addWidget(self.reslabel) @@ -112,8 +122,6 @@
  self.setWindowTitle(_("Backout '%s' - %s") % (revhex,   self.repo.displayname))   - self.merge_chk.setChecked(bool(opts.get('merge'))) -   # prepare to show   self.cmd.setHidden(True)   self.cancel_btn.setHidden(True) @@ -147,7 +155,10 @@
  cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root]   cmdline += ['--tool=internal:' +   (self.autoresolve_chk.isChecked() and 'merge' or 'fail')] - if self.merge_chk.isChecked(): + if self.backoutParent: + msg = self.msg_text.toPlainText() + cmdline += ['--message', hglib.fromunicode(msg)] + elif self.merge_chk.isChecked():   cmdline += ['--merge']   msg = self.msg_text.toPlainText()   cmdline += ['--message', hglib.fromunicode(msg)] @@ -175,6 +186,7 @@
    def command_started(self):   self.cmd.setShown(True) + self.merge_chk.setVisible(False)   self.close_btn.setHidden(True)   self.cancel_btn.setShown(True)   self.detail_btn.setShown(True) @@ -190,9 +202,10 @@
  self.close_btn.setShown(True)   self.close_btn.setAutoDefault(True)   self.close_btn.setFocus() + elif self.backoutParent: + self.accept()   elif self.cmdline[0] == 'backout':   self.didbackout = True - self.merge_chk.setEnabled(False)   self.msg_text.setEnabled(True)   self.backout_btn.setText(_('Commit'))   self.backout_btn.clicked.disconnect(self.backout)