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

backout: eliminate some underscores

Changeset 74b2958ed85b…

Parent f8d746a31975…

by Steve Borho

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

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
35
36
37
38
39
 
 
40
41
42
43
44
45
 
46
47
48
 
143
144
145
146
 
147
148
149
 
35
36
37
 
 
38
39
40
41
42
43
44
 
45
46
47
48
 
143
144
145
 
146
147
148
149
@@ -35,14 +35,14 @@
  box.addWidget(target_sep)     style = csinfo.panelstyle(selectable=True) - self.target_info = csinfo.create(self.repo, rev, style, withupdate=True) - box.addWidget(self.target_info) + self.targetinfo = csinfo.create(self.repo, rev, style, withupdate=True) + box.addWidget(self.targetinfo)     ## backout message   msg_sep = qtlib.LabeledSeparator(_('Backout commit message'))   box.addWidget(msg_sep)   - revhex = self.target_info.get_data('revid') + revhex = self.targetinfo.get_data('revid')   self.msgset = keep._('Backed out changeset: ')   self.msgset['id'] += revhex   self.msgset['str'] += revhex @@ -143,7 +143,7 @@
    def backout(self):   # prepare command line - revhex = self.target_info.get_data('revid') + revhex = self.targetinfo.get_data('revid')   cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root]   cmdline += ['--tool=internal:' +   (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]