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

stable backout: prompt for a username if none defined before performing backout

Changeset 1a96d59246db…

Parent 1163436d43b1…

by André Sintzoff

Changes to one file · Browse files at 1a96d59246db Showing diff from parent 1163436d43b1 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
152
153
154
 
 
 
155
156
157
 
 
158
159
160
 
152
153
154
155
156
157
158
159
 
160
161
162
163
164
@@ -152,9 +152,13 @@
  self.msgTextEdit.setText(newmsg)     def backout(self): + user = qtlib.getCurrentUsername(self, self.repo) + if not user: + return   # prepare command line   revhex = self.targetinfo.get_data('revid') - cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root] + cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root, + '--user', user]   cmdline += ['--tool=internal:' +   (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]   if self.backoutParent: