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

rename: avoid module name conflicts

Changeset 079de4857711…

Parent 3bb172e216bd…

by Steve Borho

Changes to one file · Browse files at 079de4857711 Showing diff from parent 3bb172e216bd Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​rename.py Stacked
 
13
14
15
16
17
18
19
20
 
29
30
31
32
33
34
 
 
 
35
36
 
37
38
 
39
40
41
42
43
44
 
45
46
47
 
48
49
50
 
58
59
60
61
 
62
63
64
 
65
66
67
68
69
70
71
 
72
73
 
 
13
14
15
 
 
16
17
18
 
27
28
29
 
 
 
30
31
32
33
 
34
35
 
36
37
38
39
40
41
 
42
43
44
 
45
46
47
48
 
56
57
58
 
59
60
61
 
62
63
64
65
66
67
68
 
69
70
 
71
@@ -13,8 +13,6 @@
 from thgutil.i18n import _  from thgutil import hglib, paths   -import dialog -  def run(ui, *pats, **opts):   fname, target = '', ''   try: @@ -29,22 +27,22 @@
  else:   target = hglib.toutf(fname)   title = 'Rename ' + hglib.toutf(fname) - dialog = entry_dialog(None, title, True, target, rename_resp) - dialog.orig = fname - return dialog + dlg = entry_dialog(None, title, True, target, rename_resp) + dlg.orig = fname + return dlg   -def rename_resp(dialog, response): +def rename_resp(dlg, response):   if response != gtk.RESPONSE_OK: - dialog.destroy() + dlg.destroy()   return   try:   root = paths.find_root()   repo = hg.repository(ui.ui(), root)   except (ImportError, hglib.RepoError): - dialog.destroy() + dlg.destroy()   return   - new_name = hglib.fromutf(dialog.entry.get_text()) + new_name = hglib.fromutf(dlg.entry.get_text())   opts = {}   opts['force'] = False # Checkbox? Nah.   opts['after'] = False @@ -58,16 +56,16 @@
  repo.ui.pushbuffer()   repo.ui.quiet = True   try: - commands.rename(repo.ui, repo, dialog.orig, new_name, **opts) + commands.rename(repo.ui, repo, dlg.orig, new_name, **opts)   toquit = True   except (util.Abort, hglib.RepoError), inst: - dialog.error_dialog(None, _('rename error'), str(inst)) + dlg.error_dialog(None, _('rename error'), str(inst))   toquit = False   finally:   sys.stderr = saved   textout = errors.getvalue() + repo.ui.popbuffer()   errors.close()   if len(textout) > 1: - dialog.error_dialog(None, _('rename error'), textout) + dlg.error_dialog(None, _('rename error'), textout)   elif toquit: - dialog.destroy() + dlg.destroy()