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

commit: use cur-message.txt again

Using last-message.txt turned out to be counterproductive. Mercurial wrote
to the file during imports and other operations and it is rarely empty. So I'm
switching back to our own file again for storing the message in-progress. But
the commit tool reads cur-message.txt and includes it in the message history so
the user may use the message found there.

Changeset f20da3057df1…

Parent 69142b289e89…

by Steve Borho

Changes to 2 files · Browse files at f20da3057df1 Showing diff from parent 69142b289e89 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
440
441
442
 
 
 
 
 
443
444
 
 
445
446
447
 
458
459
460
461
 
462
463
464
465
466
467
468
 
469
470
471
 
627
628
629
630
 
 
 
631
632
633
 
440
441
442
443
444
445
446
447
448
 
449
450
451
452
453
 
464
465
466
 
467
468
469
470
 
 
 
 
471
472
473
474
 
630
631
632
 
633
634
635
636
637
638
@@ -440,8 +440,14 @@
  self.userhist = s.value('commit/userhist').toStringList()   self.userhist = [u for u in self.userhist if u]   try: + curmsg = self.repo.opener('cur-message.txt').read() + self.setMessage(hglib.tounicode(curmsg)) + except EnvironmentError: + pass + try:   curmsg = self.repo.opener('last-message.txt').read() - self.setMessage(hglib.tounicode(curmsg)) + if curmsg: + self.addMessageToHistory(hglib.tounicode(curmsg))   except EnvironmentError:   pass   @@ -458,14 +464,11 @@
  else:   # current message is stored in local encoding   msg = self.getMessage() - self.repo.opener('last-message.txt', 'w').write(msg) + self.repo.opener('cur-message.txt', 'w').write(msg)   except EnvironmentError:   pass   - def addMessageToHistory(self): - umsg = self.msgte.text() - if not umsg: - return + def addMessageToHistory(self, umsg):   if umsg in self.msghistory:   self.msghistory.remove(umsg)   self.msghistory.insert(0, umsg) @@ -627,7 +630,9 @@
  def commandFinished(self, ret):   self.repo.decrementBusyCount()   if ret == 0: - self.addMessageToHistory() + umsg = self.msgte.text() + if umsg: + self.addMessageToHistory(umsg)   if not self.qref:   self.msgte.clear()   self.msgte.setModified(False)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​compress.py Stacked
 
131
132
133
134
 
135
136
137
 
131
132
133
 
134
135
136
137
@@ -131,7 +131,7 @@
  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('last-message.txt', 'w').write('\n* * *\n'.join(descs)) + self.repo.opener('cur-message.txt', 'w').write('\n* * *\n'.join(descs))     dlg = commit.CommitDialog([], dict(root=self.repo.root), self)   dlg.finished.connect(dlg.deleteLater)