We are currently indexing your data, so search results may be incomplete until we finish.
hggtk: another round of pychecker cleanups
Changeset 053ed8ed2f22…
Parent 11460338b5c5…
by
Changes to 12 files · Browse files at 053ed8ed2f22 Showing diff from parent 11460338b5c5 Diff from another changeset...
|
@@ -13,7 +13,7 @@ import threading, thread2
import time
from mercurial import hg, ui, util, revlog
-from hglib import hgcmd_toq, toutf, fromutf, gettabwidth, displaytime, LookupError
+from hglib import hgcmd_toq, toutf, fromutf, gettabwidth, displaytime, LookupError, rootpath
from gdialog import *
from vis import treemodel
from vis.colormap import AnnotateColorMap, AnnotateColorSaturation
@@ -545,8 +545,8 @@
def log_activate(self, treeview, path, column, objs):
model = treeview.get_model()
- iter = model.get_iter(path)
- rev = model.get_value(iter, treemodel.REVID)
+ logiter = model.get_iter(path)
+ rev = model.get_value(logiter, treemodel.REVID)
self.trigger_annotate(rev, objs)
def revisions_loaded(self, graphview, rev):
@@ -635,10 +635,10 @@ (path, focus) = treeview.get_cursor()
model = treeview.get_model()
if path is not None and model is not None:
- iter = model.get_iter(path)
- self.currev = model[iter][self.COL_REVID]
+ anniter = model.get_iter(path)
+ self.currev = model[anniter][self.COL_REVID]
self.path = model.path
- self.stbar.set_status_text(model[iter][self.COL_TOOLTIP])
+ self.stbar.set_status_text(model[anniter][self.COL_TOOLTIP])
def _ann_button_release(self, widget, event):
if event.button == 3 and not (event.state & (gtk.gdk.SHIFT_MASK |
@@ -677,8 +677,8 @@ if os.path.isfile(f):
cf.append(util.canonpath(root, cwd, f))
elif os.path.isdir(f):
- Prompt('Invalid path', "Can't annotate directory: %s" % f,
- dialog).run()
+ Prompt('Invalid path',
+ 'Cannot annotate directory: %s' % f, None).run()
dialog = DataMineDialog(u, repo, cwd, files, cmdoptions, True)
dialog.display()
@@ -695,9 +695,8 @@
if __name__ == "__main__":
import sys
- import hglib
opts = {}
opts['cwd'] = os.getcwd()
- opts['root'] = hglib.rootpath()
+ opts['root'] = rootpath()
opts['files'] = sys.argv[1:] or []
run(**opts)
|
||
|
@@ -313,7 +313,6 @@ gtk.gdk.threads_leave()
if __name__ == "__main__":
- import sys
opts = {}
opts['root'] = len(sys.argv) > 1 and sys.argv[1] or os.getcwd()
run(**opts)
|
||
|
@@ -183,13 +183,6 @@ pass
shell_notify(self.repo.wjoin('.hgignore'))
if self.notify_func: self.notify_func()
-
- def _toolbutton(self, stock, label, handler, tip):
- tbutton = gtk.ToolButton(stock)
- tbutton.set_label(label)
- tbutton.set_tooltip(self.tips, tip)
- tbutton.connect('clicked', handler)
- return tbutton
def run(root='', **opts):
dialog = HgIgnoreDialog(root)
|
||
|
@@ -7,7 +7,6 @@ import pygtk
pygtk.require("2.0")
import os
-import sys
import gtk
import pango
from dialog import error_dialog, info_dialog
|
||
|
@@ -65,8 +65,8 @@ ] + self.changeview.get_tbbuttons()
def toggle_view_column(self, button, property):
- bool = button.get_active()
- self.graphview.set_property(property, bool)
+ active = button.get_active()
+ self.graphview.set_property(property, active)
def _more_clicked(self, button):
self.graphview.next_revision_batch(self.limit)
@@ -254,12 +254,12 @@
GDialog.load_settings(self, settings)
if settings:
- set = settings['glog']
- if type(set) == int:
- self._setting_vpos = set
+ data = settings['glog']
+ if type(data) == int:
+ self._setting_vpos = data
self._setting_hpos = -1
else:
- (self._setting_vpos, self._setting_hpos) = set
+ (self._setting_vpos, self._setting_hpos) = data
else:
self._setting_vpos = -1
self._setting_hpos = -1
@@ -282,8 +282,8 @@ if 'revrange' in filteropts or 'branch' in filteropts:
self.graphview.refresh(True, branch, self.opts)
else:
- filter = filteropts.get('pats', [])
- self.graphview.refresh(False, filter, self.opts)
+ pattern = filteropts.get('pats', [])
+ self.graphview.refresh(False, pattern, self.opts)
elif self._filter == "all":
self.graphview.refresh(True, None, self.opts)
elif self._filter == "only_merges":
|
||
|
@@ -119,8 +119,8 @@ model, selpaths = tv.get_selection().get_selected_rows()
if not selpaths: return
cs = model[selpaths[0]][1]
- rev, id = cs.split(':')
- self.selected = (rev, id)
+ rev, csid = cs.split(':')
+ self.selected = (rev, csid)
def _get_hg_history(self, rev=None, limit=10):
# get history
|
||
|
|
|
@@ -15,7 +15,7 @@ import threading, thread2
from dialog import error_dialog
from mercurial import hg, ui, mdiff, cmdutil, match, util, commands
-from hglib import toutf, diffexpand
+from hglib import toutf, diffexpand, rootpath
import gtklib
try:
from mercurial.repo import RepoError
@@ -145,13 +145,13 @@ scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
diffframe.add(scroller)
- buffer = gtk.TextBuffer()
- buffer.create_tag('removed', foreground='#900000')
- buffer.create_tag('added', foreground='#006400')
- buffer.create_tag('position', foreground='#FF8000')
- buffer.create_tag('header', foreground='#000090')
+ buf = gtk.TextBuffer()
+ buf.create_tag('removed', foreground='#900000')
+ buf.create_tag('added', foreground='#006400')
+ buf.create_tag('position', foreground='#FF8000')
+ buf.create_tag('header', foreground='#000090')
- diffview = gtk.TextView(buffer)
+ diffview = gtk.TextView(buf)
diffview.modify_font(pango.FontDescription('monospace'))
diffview.set_wrap_mode(gtk.WRAP_NONE)
diffview.set_editable(False)
@@ -175,7 +175,7 @@
unknowntree.get_selection().connect('changed', self.unknown_sel_change, fr, fc)
ctree.connect('row-activated', self.candidate_row_act, unknowntree, stbar)
- ctree.get_selection().connect('changed', self.show_diff, buffer, ac)
+ ctree.get_selection().connect('changed', self.show_diff, buf, ac)
self.connect('map_event', self.on_window_map_event, unkmodel)
self.connect('delete-event', self.save_settings,
settings, hpaned, vpaned, adjustment)
@@ -322,7 +322,7 @@ fr.set_sensitive(sensitive)
fc.set_sensitive(sensitive)
- def show_diff(self, selection, buffer, ac):
+ def show_diff(self, selection, buf, ac):
'User selected a row in the candidate tree'
model, paths = selection.get_selected_rows()
sensitive = paths and True or False
@@ -333,8 +333,8 @@ except RepoError:
return
- buffer.set_text('')
- iter = buffer.get_start_iter()
+ buf.set_text('')
+ bufiter = buf.get_start_iter()
for path in paths:
row = model[path]
src, dest, percent, sensitive = row
@@ -347,24 +347,24 @@ difftext = mdiff.unidiff(rr, '', aa, '', src, dest, None, opts=opts)
if not difftext:
l = '== %s and %s have identical contents ==\n\n' % (src, dest)
- buffer.insert(iter, l)
+ buf.insert(bufiter, l)
continue
difflines = difftext.splitlines(True)
for line in difflines:
line = toutf(line)
if line.startswith('---') or line.startswith('+++'):
- buffer.insert_with_tags_by_name(iter, line, 'header')
+ buf.insert_with_tags_by_name(bufiter, line, 'header')
elif line.startswith('-'):
line = diffexpand(line)
- buffer.insert_with_tags_by_name(iter, line, 'removed')
+ buf.insert_with_tags_by_name(bufiter, line, 'removed')
elif line.startswith('+'):
line = diffexpand(line)
- buffer.insert_with_tags_by_name(iter, line, 'added')
+ buf.insert_with_tags_by_name(bufiter, line, 'added')
elif line.startswith('@@'):
- buffer.insert_with_tags_by_name(iter, line, 'position')
+ buf.insert_with_tags_by_name(bufiter, line, 'position')
else:
line = diffexpand(line)
- buffer.insert(iter, line)
+ buf.insert(bufiter, line)
def run(fname='', target='', detect=True, root='', **opts):
if detect:
@@ -388,8 +388,7 @@ gtk.main_quit()
return
try:
- import hglib
- root = hglib.rootpath()
+ root = rootpath()
repo = hg.repository(ui.ui(), root)
except ImportError, RepoError:
gtk.main_quit()
@@ -403,30 +402,29 @@
saved = sys.stderr
errors = cStringIO.StringIO()
- quit = False
+ toquit = False
try:
sys.stderr = errors
repo.ui.pushbuffer()
try:
commands.rename(repo.ui, repo, dialog.orig, new_name, **opts)
- quit = True
+ toquit = True
except util.Abort, inst:
error_dialog(None, 'rename error', str(inst))
- quit = False
+ toquit = False
finally:
sys.stderr = saved
textout = errors.getvalue() + repo.ui.popbuffer()
errors.close()
if len(textout) > 1:
error_dialog(None, 'rename error', textout)
- elif quit:
+ elif toquit:
gtk.main_quit()
if __name__ == "__main__":
opts = {'fname' : sys.argv[1]}
if '--detect' in sys.argv:
- import hglib
- opts['root'] = hglib.rootpath()
+ opts['root'] = rootpath()
opts['detect'] = True
elif len(sys.argv) == 3:
opts['target'] = sys.argv[2]
|
|
@@ -139,7 +139,7 @@ return tbutton
def _delete(self, widget, event):
- if self._server_stopped() == True:
+ if self._server_stopped():
gtk.main_quit()
else:
return True
|
||
|
@@ -42,11 +42,11 @@
def compact(self):
''' remove duplicate in list '''
- list = []
+ newlist = []
for v in self._list:
- if v not in list:
- list.append(v)
- self._list[:] = list
+ if v not in newlist:
+ newlist.append(v)
+ self._list[:] = newlist
class Settings(object):
@@ -62,7 +62,7 @@ def get_value(self, key, default=None, create=False):
if key in self._data:
return self._data[key]
- elif create == True:
+ elif create:
self._data[key] = default
return default
@@ -128,8 +128,8 @@ t = (t[0], t[1], t[2], t[3], time.clock())
return t
-def set_tortoise_icon(window, icon):
- window.set_icon_from_file(get_tortoise_icon(icon))
+def set_tortoise_icon(window, thgicon):
+ window.set_icon_from_file(get_tortoise_icon(thgicon))
# Global keybindings for TortoiseHg
window.connect('key-press-event', window_key)
@@ -138,26 +138,26 @@ devent = gtk.gdk.Event(gtk.gdk.DELETE)
window.emit('delete_event', devent)
-def get_tortoise_icon(icon):
+def get_tortoise_icon(thgicon):
'''Find a tortoise icon, apply to PyGtk window'''
# The context menu should set this variable
var = os.environ.get('THG_ICON_PATH', None)
paths = var and [ var ] or []
try:
# Else try relative paths from hggtk, the repository layout
- dir = os.path.dirname(__file__)
- paths.append(os.path.join(dir, '..', 'icons'))
+ fdir = os.path.dirname(__file__)
+ paths.append(os.path.join(fdir, '..', 'icons'))
# ... or the source installer layout
- paths.append(os.path.join(dir, '..', '..', '..',
+ paths.append(os.path.join(fdir, '..', '..', '..',
'share', 'tortoisehg', 'icons'))
except NameError: # __file__ is not always available
pass
for p in paths:
- path = os.path.join(p, 'tortoise', icon)
+ path = os.path.join(p, 'tortoise', thgicon)
if os.path.isfile(path):
return path
else:
- print 'icon not found', icon
+ print 'icon not found', thgicon
return None
def version():
|
||
|
|
|
@@ -133,12 +133,12 @@ for check in self._show_checks.values():
check.set_active(True)
else:
- set = False
+ wasset = False
for opt in self.opts :
if opt in self._show_checks and self.opts[opt]:
- set = True
+ wasset = True
self._show_checks[opt].set_active(True)
- if not set:
+ if not wasset:
for check in [item[1] for item in self._show_checks.iteritems()
if item[0] in ('modified', 'added', 'removed',
'deleted', 'unknown')]:
@@ -436,11 +436,11 @@ if self.count_revs() <= 1:
checks += ('deleted', 'unknown', 'clean', 'ignored')
- for type in checks:
- check = gtk.CheckButton('_' + type)
- check.connect('toggled', self._show_toggle, type)
+ for ctype in checks:
+ check = gtk.CheckButton('_' + ctype)
+ check.connect('toggled', self._show_toggle, ctype)
table.attach(check, col, col+1, row, row+1)
- self._show_checks[type] = check
+ self._show_checks[ctype] = check
col += row
row = not row
@@ -547,7 +547,7 @@ # List of the currently checked and selected files to pass on to the new data
model, paths = self.filetree.get_selection().get_selected_rows()
recheck = [entry[FM_PATH_UTF8] for entry in model if entry[FM_CHECKED]]
- reselect = [model[iter][FM_PATH_UTF8] for iter in paths]
+ reselect = [model[path][FM_PATH_UTF8] for path in paths]
# merge-state of files
ms = merge_.mergestate(self.repo)
@@ -633,8 +633,8 @@ row[DM_DISPLAYED] = row[DM_MARKUP]
- def _show_toggle(self, check, type):
- self.opts[type] = check.get_active()
+ def _show_toggle(self, check, toggletype):
+ self.opts[toggletype] = check.get_active()
self.reload_status()
return True
@@ -654,8 +654,8 @@ return min(max(result, -1), 1)
- def _text_color(self, column, text_renderer, list, row_iter):
- stat = list[row_iter][FM_STATUS]
+ def _text_color(self, column, text_renderer, model, row_iter):
+ stat = model[row_iter][FM_STATUS]
if stat == 'M':
text_renderer.set_property('foreground', '#000090')
elif stat == 'A':
@@ -775,28 +775,28 @@ match=matcher, opts=patch.diffopts(self.ui, self.opts)):
difftext.extend(s.splitlines(True))
- buffer = gtk.TextBuffer()
- buffer.create_tag('removed', foreground='#900000')
- buffer.create_tag('added', foreground='#006400')
- buffer.create_tag('position', foreground='#FF8000')
- buffer.create_tag('header', foreground='#000090')
+ buf = gtk.TextBuffer()
+ buf.create_tag('removed', foreground='#900000')
+ buf.create_tag('added', foreground='#006400')
+ buf.create_tag('position', foreground='#FF8000')
+ buf.create_tag('header', foreground='#000090')
- iter = buffer.get_start_iter()
+ bufiter = buf.get_start_iter()
for line in difftext:
line = toutf(line)
if line.startswith('---') or line.startswith('+++'):
- buffer.insert_with_tags_by_name(iter, line, 'header')
+ buf.insert_with_tags_by_name(bufiter, line, 'header')
elif line.startswith('-'):
line = diffexpand(line)
- buffer.insert_with_tags_by_name(iter, line, 'removed')
+ buf.insert_with_tags_by_name(bufiter, line, 'removed')
elif line.startswith('+'):
line = diffexpand(line)
- buffer.insert_with_tags_by_name(iter, line, 'added')
+ buf.insert_with_tags_by_name(bufiter, line, 'added')
elif line.startswith('@@'):
- buffer.insert_with_tags_by_name(iter, line, 'position')
+ buf.insert_with_tags_by_name(bufiter, line, 'position')
else:
line = diffexpand(line)
- buffer.insert(iter, line)
+ buf.insert(bufiter, line)
self.merge_diff_text.set_buffer(buffer)
@@ -1199,9 +1199,9 @@ selection = self.filetree.get_selection()
assert(selection.count_selected_rows() == 1)
- list, paths = selection.get_selected_rows()
+ model, paths = selection.get_selected_rows()
path = paths[0]
- handler(list[path][1], list[path][3])
+ handler(model[path][1], model[path][3])
return True
@@ -1235,17 +1235,17 @@ if selection.count_selected_rows() != 1:
return False
- list, paths = selection.get_selected_rows()
- menu = self._get_file_context_menu(list[paths[0]])
+ model, paths = selection.get_selected_rows()
+ menu = self._get_file_context_menu(model[paths[0]])
menu.popup(None, None, None, button, time)
return True
def _tree_key_press(self, tree, event):
if event.keyval == 32:
- def toggler(list, path, iter):
- list[path][FM_CHECKED] = not list[path][FM_CHECKED]
- self._update_chunk_state(list[path])
+ def toggler(model, path, bufiter):
+ model[path][FM_CHECKED] = not model[path][FM_CHECKED]
+ self._update_chunk_state(model[path])
selection = self.filetree.get_selection()
selection.selected_foreach(toggler)
@@ -1266,8 +1266,8 @@ if selection.count_selected_rows() != 1:
return False
- list, paths = selection.get_selected_rows()
- menu = self._get_file_context_menu(list[paths[0]])
+ model, paths = selection.get_selected_rows()
+ menu = self._get_file_context_menu(model[paths[0]])
menu.get_children()[0].activate()
return True
|
|
@@ -116,18 +116,18 @@ # revisions combo box
self.pathlist = gtk.ListStore(str, str, bool)
self._pathbox = gtk.ComboBoxEntry(self.pathlist, 0)
- self._pathbox.set_row_separator_func(lambda model, iter: model[iter][2])
+ self._pathbox.set_row_separator_func(lambda model, i: model[i][2])
self._pathtext = self._pathbox.get_child()
self.fill_path_combo()
defrow = None
defpushrow = None
- for iter, (path, name, sep) in enumerate(self.pathlist):
+ for i, (path, name, sep) in enumerate(self.pathlist):
if name == 'default':
- defrow = iter
+ defrow = i
if defpushrow is None:
- defpushrow = iter
+ defpushrow = i
elif name == 'default-push':
- defpushrow = iter
+ defpushrow = i
if repos:
self._pathtext.set_text(repos[0])
@@ -354,10 +354,10 @@ gtk.STOCK_OPEN,gtk.RESPONSE_OK))
dialog.set_default_response(gtk.RESPONSE_OK)
dialog.set_current_folder(self.root)
- filter = gtk.FileFilter()
- filter.set_name("Bundle (*.hg)")
- filter.add_pattern("*.hg")
- dialog.add_filter(filter)
+ filefilter = gtk.FileFilter()
+ filefilter.set_name("Bundle (*.hg)")
+ filefilter.add_pattern("*.hg")
+ dialog.add_filter(filefilter)
response = dialog.run()
if response == gtk.RESPONSE_OK:
self._pathtext.set_text(dialog.get_filename())
|
||
|
@@ -10,7 +10,6 @@ except:
pass
-import sys
import gtk
import gobject
from mercurial import hg, ui, cmdutil, util, node
|
||
Add a tag
Loading...