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

Merge with stable

Changeset 292c137cbea2…

Parents c448d4165020…

Parents bff1dcfebb51…

by Steve Borho

Changes to 3 files · Browse files at 292c137cbea2 Showing diff from parent c448d4165020 bff1dcfebb51 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​annotate.py Stacked
 
241
242
243
 
 
244
245
246
 
241
242
243
244
245
246
247
248
@@ -241,6 +241,8 @@
  """Update the lexer according to the given file"""   lex = lexers.get_lexer(fctx.path(), hglib.tounicode(fctx.data()), self)   self.setLexer(lex) + if lex is None: + self.setFont(qtlib.getfont('fontlog').font())     def _updaterevmargin(self):   """Update the content of margin area showing revisions"""
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
19
20
21
22
 
23
24
25
 
19
20
21
 
22
23
24
25
@@ -19,7 +19,7 @@
 from tortoisehg.util import hglib, patchctx  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui, rejects, commit, qscilib -from tortoisehg.hgqt import qqueue, fileview +from tortoisehg.hgqt import qqueue, fileview, thgimport  from tortoisehg.hgqt.qtlib import geticon    # TODO
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
297
298
299
300
301
 
 
302
303
304
 
297
298
299
 
 
300
301
302
303
304
@@ -297,8 +297,8 @@
  ui.quiet = True     if cmd not in nonrepo_commands.split() and not path: - error.RepoError(_("There is no Mercurial repository here" - " (.hg not found)")) + raise error.RepoError(_("There is no Mercurial repository here" + " (.hg not found)"))     cmdoptions['mainapp'] = True   d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)