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

commit: get username and date for qref from applied patches

* use displaytime instead of utctime
* fix reading of opts['user']

Changeset c1a47c3895c6…

Parent 89ed955ac047…

by Steve Borho

Changes to one file · Browse files at c1a47c3895c6 Showing diff from parent 89ed955ac047 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
161
162
163
164
165
166
167
 
176
177
178
179
 
 
180
181
182
183
 
 
 
184
185
186
187
188
189
 
 
190
191
192
 
620
621
622
623
 
624
625
626
 
660
661
662
663
 
664
665
666
 
161
162
163
 
164
165
166
 
175
176
177
 
178
179
180
181
182
 
183
184
185
186
187
188
189
190
191
192
193
194
195
196
 
624
625
626
 
627
628
629
630
 
664
665
666
 
667
668
669
670
@@ -161,7 +161,6 @@
  ptext = _('<b>Parent: </b>') + ptext   if i > len(self.parentlabels):   lbl = QLabel(ptext) - #lbl.minimumSizeHint = lambda: QSize(0, 0)   self.parentvbox.addWidget(lbl)   self.parentlabels.append(lbl)   else: @@ -176,17 +175,22 @@
  def initQRefreshMode(self):   'Working parent is a patch. Is it refreshable?'   repo = self.stwidget.repo - if repo['qtip'] != repo['.']: + qtip = repo['qtip'] + if qtip != repo['.']:   self.showMessage.emit(_('Cannot refresh non-tip patch'))   self.commitButtonName.emit(_('N/A'))   return - self.msgte.setPlainText(hglib.tounicode(repo['qtip'].description())) + self.opts['user'] = qtip.user() + self.opts['date'] = hglib.displaytime(qtip.date()) + self.msgte.setPlainText(hglib.tounicode(qtip.description()))   self.msgte.document().setModified(False)   self.msgte.moveCursor(QTextCursor.End)   self.qref = True     def endQRefreshMode(self):   self.msgte.clear() + self.opts['user'] = '' + self.opts['date'] = ''   self.qref = False     def msgChanged(self): @@ -620,7 +624,7 @@
    l = []   if opts.get('user'): - val = hglib.tounicode(self.opts['user']) + val = hglib.tounicode(opts['user'])   self.usercb.setChecked(True)   l.append(val)   try: @@ -660,7 +664,7 @@
  curdate.setEnabled(False)   self.datecb.toggled.connect(curdate.setEnabled)   curdate.clicked.connect( lambda: self.datele.setText( - hglib.tounicode(hglib.utctime(util.makedate())))) + hglib.tounicode(hglib.displaytime(util.makedate()))))   if opts.get('date'):   self.datele.setText(opts['date'])   self.datecb.setChecked(True)