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

hglib: add dispatch function

see mercurial changes 08bfec2ef031, 80c599eee3f3

Changeset c4a0fc68dc0b…

Parent f3d41f688074…

by Adrian Buehlmann

Changes to 3 files · Browse files at c4a0fc68dc0b Showing diff from parent f3d41f688074 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​thread.py Stacked
 
15
16
17
18
 
19
20
21
 
271
272
273
274
 
275
276
277
 
15
16
17
 
18
19
20
21
 
271
272
273
 
274
275
276
277
@@ -15,7 +15,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -from mercurial import util, error, dispatch +from mercurial import util, error  from mercurial import ui as uimod    from tortoisehg.util import thread2, hglib @@ -271,7 +271,7 @@
  for k, v in ui.configitems('defaults'):   ui.setconfig('defaults', k, '')   self.ret = 255 - self.ret = dispatch._dispatch(ui, self.cmdline) or 0 + self.ret = hglib.dispatch(ui, self.cmdline) or 0   except util.Abort, e:   ui.write_err(local._('abort: ') + str(e) + '\n')   if e.hint:
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgthread.py Stacked
 
174
175
176
177
 
178
179
180
 
174
175
176
 
177
178
179
180
@@ -174,7 +174,7 @@
  for k, v in self.ui.configitems('defaults'):   self.ui.setconfig('defaults', k, '')   l = 'control' - ret = hglib.dispatch._dispatch(self.ui, self.args) + ret = hglib.dispatch(self.ui, self.args)   if ret:   self.ui.write(_('[command returned code %d ') % int(ret), label=l)   else:
Change 1 of 3 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
12
13
14
15
 
16
 
17
18
19
 
512
513
514
515
 
516
517
518
 
709
710
711
 
 
 
 
 
 
 
 
 
 
12
13
14
 
15
16
17
18
19
20
 
513
514
515
 
516
517
518
519
 
710
711
712
713
714
715
716
717
718
719
720
721
@@ -12,8 +12,9 @@
 import urllib    from mercurial import ui, util, extensions, match, bundlerepo, cmdutil -from mercurial import dispatch, encoding, templatefilters, filemerge, error +from mercurial import encoding, templatefilters, filemerge, error  from mercurial import demandimport, revset +from mercurial import dispatch as hgdispatch    demandimport.disable()  try: @@ -512,7 +513,7 @@
  u = Qui()   oldterm = os.environ.get('TERM')   os.environ['TERM'] = 'dumb' - ret = dispatch._dispatch(u, list(args)) + ret = dispatch(u, list(args))   if oldterm:   os.environ['TERM'] = oldterm   return ret @@ -709,3 +710,12 @@
  linesep = sep   break   return linesep + +def dispatch(ui, args): + if hasattr(hgdispatch, 'request'): + # hg >= 1.9, see mercurial changes 08bfec2ef031, 80c599eee3f3 + req = hgdispatch.request(args, ui) + hgdispatch._dispatch(req) + else: + # hg <= 1.8 + hgdispatch._dispatch(ui, args)