Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hgtk: avoid dispatch name conflict

Changeset b3e40faf0872…

Parent 5f246c386b3d…

by Steve Borho

Changes to one file · Browse files at b3e40faf0872 Showing diff from parent 5f246c386b3d Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hgtk.py Stacked
 
233
234
235
236
237
 
 
238
239
240
 
252
253
254
255
 
256
257
 
258
259
260
 
233
234
235
 
 
236
237
238
239
240
 
252
253
254
 
255
256
 
257
258
259
260
@@ -233,8 +233,8 @@
   def add(ui, *pats, **opts):   """add files""" - from mercurial import dispatch - dispatch.dispatch(['add'] + list(pats)) + from mercurial import dispatch as _dispatch + _dispatch.dispatch(['add'] + list(pats))   shlib.update_thgstatus(ui, paths.find_root())   shlib.shell_notify([os.getcwd()])   @@ -252,9 +252,9 @@
  """commit tool"""   ct = ui.config('tortoisehg', 'extcommit', None)   if ct == 'qct': - from mercurial import dispatch + from mercurial import dispatch as _dispatch   try: - dispatch.dispatch(ct, *pats, **opts) + _dispatch.dispatch(ct, *pats, **opts)   except SystemExit:   pass   return