Changeset b3eaebd77fd1…
Parent 811aa6b2626b…
by
Changes to 38 files · Browse files at b3eaebd77fd1 Showing diff from parent 811aa6b2626b Diff from another changeset...
@@ -26,20 +26,20 @@ def __init__(self):
self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.window.set_title("Python Trace Collector")
-
+
# construct window
self.window.set_default_size(700, 400)
self.main_area = gtk.VBox()
self.window.add(self.main_area)
-
+
# mimic standard dialog widgets
self.action_area = gtk.HBox()
self.main_area.pack_end(self.action_area, False, False, 5)
sep = gtk.HSeparator()
self.main_area.pack_end(sep, False, False, 0)
self.vbox = gtk.VBox()
- self.main_area.pack_end(self.vbox)
-
+ self.main_area.pack_end(self.vbox)
+
# add python trace ouput window
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
@@ -55,7 +55,7 @@ # add buttons
self._button_quit = gtk.Button("Quit")
self._button_quit.connect('clicked', self._on_ok_clicked)
- self.action_area.pack_end(self._button_quit, False, False, 5)
+ self.action_area.pack_end(self._button_quit, False, False, 5)
self._button_clear = gtk.Button("Clear")
self._button_clear.connect('clicked', self._on_clear_clicked)
@@ -68,24 +68,24 @@ def _on_ok_clicked(self, button):
self._stop_read_thread()
gtk.main_quit()
-
+
def _on_clear_clicked(self, button):
self.write("", False)
-
+
def _on_window_close_clicked(self, event, param):
self._stop_read_thread()
gtk.main_quit()
-
+
def _on_window_map_event(self, event, param):
self._begin_trace()
-
+
def _begin_trace(self):
self.queue = Queue.Queue()
win32trace.InitRead()
self.write("Collecting Python Trace Output...\n")
gobject.timeout_add(10, self._process_queue)
self._start_read_thread()
-
+
def _start_read_thread(self):
self._read_trace = True
self.thread1 = threading.Thread(target=self._do_read_trace)
@@ -95,8 +95,8 @@ self._read_trace = False
# wait for worker thread to to fix Unhandled exception in thread
- self.thread1.join()
-
+ self.thread1.join()
+
def _process_queue(self):
"""
Handle all the messages currently in the queue (if any).
@@ -109,9 +109,9 @@ self.write(ts + line)
except Queue.Empty:
pass
-
+
return True
-
+
def _do_read_trace(self):
"""
print buffer collected in win32trace
@@ -120,7 +120,7 @@ msg = win32trace.read()
if msg:
self.queue.put(msg)
-
+
def write(self, msg, append=True):
msg = toutf(msg)
if append:
@@ -132,11 +132,11 @@ def main(self):
self.window.show_all()
gtk.main()
-
+
def run():
dlg = TraceLog()
dlg.main()
-
+
if __name__ == "__main__":
run()
|
@@ -24,7 +24,7 @@ def start_browser():
if os.name == 'nt':
import win32api, win32con
- win32api.ShellExecute(0, "open", url, None, "",
+ win32api.ShellExecute(0, "open", url, None, "",
win32con.SW_SHOW)
else:
import gconf
@@ -36,13 +36,13 @@
def url_handler(dialog, link, user_data):
browse_url(link)
-
+
gtk.about_dialog_set_url_hook(url_handler, None)
def make_version(tuple):
vers = ".".join([str(x) for x in tuple])
return vers
-
+
class AboutDialog(gtk.AboutDialog):
def __init__(self):
super(AboutDialog, self).__init__()
@@ -54,7 +54,7 @@ "PyGTK-%s" % make_version(gtk.pygtk_version),
"GTK-%s" % make_version(gtk.gtk_version),
])
-
+
comment = _("Several icons are courtesy of the TortoiseSVN project")
self.set_website("http://bitbucket.org/tortoisehg/stable/")
|
@@ -23,7 +23,7 @@ self.set_title(_('Backout changeset - ') + rev)
self.set_default_size(600, 400)
self.notify_func = None
-
+
self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
@@ -67,7 +67,7 @@ frame = gtk.Frame(_('Backout commit message'))
frame.set_border_width(4)
frame.add(scrolledwindow)
- self.tips.set_tip(frame,
+ self.tips.set_tip(frame,
_('Commit message text for new changeset that reverses the'
' effect of the change being backed out.'))
vbox.pack_start(frame, True, True, 4)
@@ -90,7 +90,7 @@ tbutton.set_tooltip(self.tips, tip)
tbutton.connect('clicked', handler)
return tbutton
-
+
def _backout_clicked(self, button):
buf = self.logview.get_buffer()
start, end = buf.get_bounds()
|
@@ -103,7 +103,7 @@
def _fill_buffer(self, buf, rev, ctx, filelist):
self.stbar.begin('Retrieving changeset data...')
-
+
def title_line(title, text, tag):
pad = ' ' * (12 - len(title))
utext = toutf(title + pad + text)
@@ -197,7 +197,7 @@ i1 = buf.get_iter_at_offset(p1)
txt = buf.get_text(i0, i1)
buf.apply_tag_by_name(name, i0, i1)
-
+
# inserts the marks
for mark, offset, stats in fileoffs:
pos = buf.get_iter_at_offset(offset)
@@ -438,14 +438,14 @@ end.forward_char()
text = text_buffer.get_text(beg, end)
return text
-
+
def file_context_menu(self):
def create_menu(label, callback):
menuitem = gtk.MenuItem(label, True)
menuitem.connect('activate', callback)
menuitem.set_border_width(1)
return menuitem
-
+
_menu = gtk.Menu()
_menu.append(create_menu('_visual diff', self._diff_file_rev))
_menu.append(create_menu('diff to _local', self._diff_to_local))
@@ -473,7 +473,7 @@ scroller = gtk.ScrolledWindow()
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
details_frame.add(scroller)
-
+
details_text = gtk.TextView()
details_text.set_wrap_mode(gtk.WRAP_NONE)
details_text.set_editable(False)
|
|
|
@@ -38,21 +38,21 @@ self._dest_path = repos[1]
elif len(repos):
self._src_path = repos[0]
-
+
# build dialog
self._create()
def _create(self):
self.set_default_size(520, 180)
ewidth = 16
-
+
# add toolbar with tooltips
self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
-
+
self._btn_clone = self._toolbutton(
gtk.STOCK_COPY,
- _('clone'),
+ _('clone'),
self._btn_clone_clicked,
tip=_('Clone a repository'))
tbuttons = [
@@ -90,7 +90,7 @@ srcbox.pack_start(self._srclistbox, True, True)
srcbox.pack_end(self._btn_src_browse, False, False, 5)
vbox.pack_start(srcbox, False, False, 2)
-
+
# add pre-defined src paths to pull-down list
sympaths = [x[1] for x in ui.ui().configitems('paths')]
recent = [x for x in self._recent_src]
@@ -117,14 +117,14 @@ cell.set_property('ellipsize', pango.ELLIPSIZE_MIDDLE)
self._destlistbox.pack_start(cell)
self._destlistbox.add_attribute(cell, 'text', 0)
-
+
self._btn_dest_browse = gtk.Button(_('Browse...'))
self._btn_dest_browse.connect('clicked', self._btn_dest_clicked)
destbox.pack_start(lbl, False, False)
destbox.pack_start(self._destlistbox, True, True)
destbox.pack_end(self._btn_dest_browse, False, False, 5)
vbox.pack_start(destbox, False, False, 2)
-
+
# add most-recent dest paths to pull-down list
paths = list(self._recent_dest)
paths.sort()
@@ -160,7 +160,7 @@ option_box.pack_start(self._opt_proxy, False, False)
vbox.pack_start(option_box, False, False, 15)
- if ui.ui().config('http_proxy', 'host', ''):
+ if ui.ui().config('http_proxy', 'host', ''):
self._opt_proxy.set_active(True)
else:
self._opt_proxy.set_sensitive(False)
@@ -179,7 +179,7 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
tbutton.set_label(label)
if tip:
tbutton.set_tooltip(self.tips, tip)
@@ -197,7 +197,7 @@ if response == gtk.RESPONSE_OK:
self._dest_input.set_text(dialog.get_filename())
dialog.destroy()
-
+
def _btn_src_clicked(self, button):
""" select source folder to clone """
dialog = gtk.FileChooserDialog(title=None,
@@ -242,21 +242,21 @@ # save path to recent list in history
self._recent_dest.add(dest)
self._settings.write()
-
+
# update drop down list
paths = list(self._recent_dest)
paths.sort()
self._destlist.clear()
for p in paths:
self._destlist.append([p])
-
+
def _btn_clone_clicked(self, toolbutton, data=None):
# gather input data
src = self._src_input.get_text()
dest = self._dest_input.get_text() or os.path.basename(src)
remotecmd = self._remote_cmd.get_text()
rev = self._rev_input.get_text()
-
+
# verify input
if src == '':
error_dialog(self, _('Source path is empty'), _('Please enter'))
@@ -276,9 +276,9 @@ dest = None
else:
dest = '.'
-
- # start cloning
- try:
+
+ # start cloning
+ try:
cmdline = ['hg', 'clone']
if self._opt_update.get_active():
cmdline.append('--noupdate')
@@ -289,10 +289,10 @@ if not (self._opt_proxy.get_active() and
ui.ui().config('http_proxy', 'host', '')):
cmdline += ["--config", "http_proxy.host="]
- if remotecmd:
+ if remotecmd:
cmdline.append('--remotecmd')
cmdline.append(remotecmd)
- if not self._opt_allrev.get_active() and rev:
+ if not self._opt_allrev.get_active() and rev:
cmdline.append('--rev')
cmdline.append(rev)
|
|
|
@@ -118,7 +118,7 @@
def auto_check(self):
if self.test_opt('check'):
- for entry in self.filemodel :
+ for entry in self.filemodel :
if entry[FM_STATUS] in 'MAR':
entry[FM_CHECKED] = True
self._update_check_count()
@@ -225,19 +225,19 @@ mbox.pack_start(self.msg_cbbox)
vbox.pack_start(mbox, False, False)
self._mru_messages = self.settings.mrul('recent_messages')
-
+
frame = gtk.Frame()
frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)
scroller = gtk.ScrolledWindow()
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
frame.add(scroller)
vbox.pack_start(frame)
-
+
self.text = gtk.TextView()
self.text.set_wrap_mode(gtk.WRAP_WORD)
self.text.modify_font(pango.FontDescription(self.fontcomment))
scroller.add(self.text)
-
+
self._vpaned = gtk.VPaned()
self._vpaned.add1(vbox)
self._vpaned.add2(status_body)
@@ -313,12 +313,12 @@ def _check_merge(self):
# disable the checkboxes on the filelist if repo in merging state
merged = len(self.repo.changectx(None).parents()) > 1
-
+
self.get_toolbutton(_('Re_vert')).set_sensitive(not merged)
self.get_toolbutton(_('_Add')).set_sensitive(not merged)
self.get_toolbutton(_('_Remove')).set_sensitive(not merged)
self.get_toolbutton(_('Move')).set_sensitive(not merged)
-
+
if merged:
# select all changes if repo is merged
for entry in self.filemodel:
@@ -499,18 +499,18 @@
def _undo_clicked(self, toolbutton, data=None):
- response = Confirm(_('Undo commit'), [], self, _('Undo last commit')).run()
+ response = Confirm(_('Undo commit'), [], self, _('Undo last commit')).run()
if response != gtk.RESPONSE_YES:
return
-
+
tip = self._get_tip_rev(True)
if not tip == self._last_commit_id:
- Prompt(_('Undo commit'),
+ Prompt(_('Undo commit'),
_('Unable to undo!\n\n'
'Tip revision differs from last commit.'),
self).run()
return
-
+
try:
self.repo.rollback()
self._last_commit_id = None
@@ -523,7 +523,7 @@ if self.test_opt('addremove'):
return True
else:
- response = Confirm(_('Add/Remove'), files, self).run()
+ response = Confirm(_('Add/Remove'), files, self).run()
if response == gtk.RESPONSE_YES:
# This will stay set for further commits (meaning no more prompts). Problem?
self.opts['addremove'] = True
@@ -552,7 +552,7 @@
# bring up the config dialog for user to enter their username.
# But since we can't be sure they will do it right, we will
- # have them to retry, to re-trigger the checking mechanism.
+ # have them to retry, to re-trigger the checking mechanism.
from thgconfig import ConfigDialog
dlg = ConfigDialog(False)
dlg.show_all()
@@ -651,7 +651,7 @@ 'user':opts.get('user', ''), 'date':opts.get('date', ''),
'logfile':'', 'message':'',
'modified':True, 'added':True, 'removed':True, 'deleted':True,
- 'unknown':True, 'ignored':False,
+ 'unknown':True, 'ignored':False,
'exclude':[], 'include':[],
'check': True, 'git':False, 'addremove':False,
}
|
@@ -37,10 +37,10 @@ pass
def get_tbbuttons(self):
- self.stop_button = self.make_toolbutton(gtk.STOCK_STOP, _('Stop'),
+ self.stop_button = self.make_toolbutton(gtk.STOCK_STOP, _('Stop'),
self._stop_current_search, tip=_('Stop operation on current tab'))
return [
- self.make_toolbutton(gtk.STOCK_FIND, _('New Search'),
+ self.make_toolbutton(gtk.STOCK_FIND, _('New Search'),
self._search_clicked, tip=_('Open new search tab')),
self.stop_button
]
@@ -71,7 +71,7 @@ # settings['datamine']
def get_body(self):
- """ Initialize the Dialog. """
+ """ Initialize the Dialog. """
self.grep_cmenu = self.grep_context_menu()
self.ann_cmenu = self.annotate_context_menu()
self.changedesc = {}
@@ -278,7 +278,7 @@ objs = (includes, excludes, follow)
includes.connect('changed', self._update_following_possible, objs)
excludes.connect('changed', self._update_following_possible, objs)
-
+
if hasattr(self.notebook, 'set_tab_reorderable'):
self.notebook.set_tab_reorderable(frame, True)
self.notebook.set_current_page(num)
@@ -296,7 +296,7 @@ return True
def trigger_search(self, button, objs):
- (model, frame, regexp, follow, ignorecase,
+ (model, frame, regexp, follow, ignorecase,
excludes, includes, linenum, showall, search_hbox) = objs
retext = regexp.get_text()
if not retext:
@@ -304,7 +304,7 @@ _('You must provide a search expression'), self).run()
regexp.grab_focus()
return
-
+
q = Queue.Queue()
args = [self.repo.root, q, 'grep']
if follow.get_active(): args.append('--follow')
@@ -523,7 +523,7 @@ hbox.pack_start(lbl, True, True, 2)
hbox.pack_start(close, False, False)
hbox.show_all()
- num = self.notebook.append_page_menu(frame,
+ num = self.notebook.append_page_menu(frame,
hbox, gtk.Label(toutf(path + '@' + revid)))
if hasattr(self.notebook, 'set_tab_reorderable'):
|
@@ -21,9 +21,9 @@ def _message_dialog(parent, type, primary, secondary, buttons=gtk.BUTTONS_OK,
title="TortoiseHg"):
""" Display a given type of MessageDialog with the given message.
-
+
:param type: message dialog type
-
+
:param message: the message you want to display.
"""
dialog = MessageDialog(parent, flags=gtk.DIALOG_MODAL, type=type,
|
|
|
@@ -4,7 +4,7 @@ #
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
-#
+#
import gtk
import gobject
@@ -40,7 +40,7 @@ self.set_markup('<b>' + hglib.toutf(message) + '</b>')
class Confirm(SimpleMessage):
- """Dialog returns gtk.RESPONSE_YES or gtk.RESPONSE_NO
+ """Dialog returns gtk.RESPONSE_YES or gtk.RESPONSE_NO
"""
def __init__(self, title, files, parent, primary=None):
SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,
@@ -53,7 +53,7 @@ message = ''
for i, f in enumerate(files):
message += ' ' + f + '\n'
- if i == 9:
+ if i == 9:
message += ' ...\n'
break
self.format_secondary_text(hglib.toutf(message))
@@ -61,9 +61,9 @@ self.add_accel_group(accel_group)
buttons = self.get_children()[0].get_children()[1].get_children()
buttons[1].add_accelerator("clicked", accel_group, ord("y"),
- 0, gtk.ACCEL_VISIBLE)
+ 0, gtk.ACCEL_VISIBLE)
buttons[0].add_accelerator("clicked", accel_group, ord("n"),
- 0, gtk.ACCEL_VISIBLE)
+ 0, gtk.ACCEL_VISIBLE)
class GDialog(gtk.Window):
@@ -121,7 +121,7 @@
def get_defsize(self):
- return self._setting_defsize
+ return self._setting_defsize
def get_tbbuttons(self):
@@ -188,7 +188,7 @@ return opt in self.opts and self.opts[opt]
def _parse_config(self):
- # defaults
+ # defaults
self.fontcomment = 'monospace 10'
self.fontdiff = 'monospace 10'
self.fontlist = 'monospace 9'
@@ -282,7 +282,7 @@ self.lastpos = self._setting_winpos
self.connect('window-state-event', self.windowstate)
self.connect('set-focus', self.setfocus)
-
+
# Minimum size
minx, miny = self.get_minsize()
self.set_size_request(minx, miny)
@@ -295,7 +295,7 @@
vbox = gtk.VBox(False, 0)
self.add(vbox)
-
+
self.tooltips = gtk.Tooltips()
toolbar = gtk.Toolbar()
tbuttons = self.get_tbbuttons()
@@ -307,7 +307,7 @@ # Subclass returns the main body
body = self.get_body()
vbox.pack_start(body, True, True, 0)
-
+
# Subclass provides extra stuff in bottom hbox
extras = self.get_extras()
if extras:
@@ -334,7 +334,7 @@
def _hg_call_wrapper(self, title, command, showoutput=True):
"""Run the specified command and display any resulting aborts,
- messages, and errors
+ messages, and errors
"""
textout = ''
saved = sys.stderr
@@ -349,7 +349,7 @@ return False, ''
finally:
sys.stderr = saved
- textout = self.ui.popbuffer()
+ textout = self.ui.popbuffer()
prompttext = ''
if showoutput:
prompttext = textout + '\n'
@@ -372,7 +372,7 @@
def _view_file(self, stat, file, force_left=False):
import atexit
-
+
def cleanup():
shutil.rmtree(self.tmproot)
@@ -429,7 +429,7 @@ util.system("%s \"%s\"" % (editor, file_path),
environ={'HGUSER': self.ui.username()},
onerr=util.Abort, errprefix=_('edit failed'))
-
+
editor = (self.ui.config('tortoisehg', 'editor') or
self.ui.config('gtools', 'editor') or
os.environ.get('HGEDITOR') or
@@ -447,7 +447,7 @@ self.ui = ui.ui()
self._parse_config()
return
-
+
file = util.localpath(file)
thread = threading.Thread(target=doedit, name='edit:'+file)
thread.setDaemon(True)
@@ -456,7 +456,7 @@class NativeSaveFileDialogWrapper:
"""Wrap the windows file dialog, or display default gtk dialog if
that isn't available"""
- def __init__(self, InitialDir = None, Title = _('Save File'),
+ def __init__(self, InitialDir = None, Title = _('Save File'),
Filter = {"All files": "*.*"}, FilterIndex = 1, FileName = ''):
import os.path
if InitialDir == None:
@@ -485,7 +485,7 @@ fname, customfilter, flags=win32gui.GetSaveFileNameW(
InitialDir=self.InitialDir,
Flags=win32con.OFN_EXPLORER,
- File=self.FileName,
+ File=self.FileName,
DefExt='py',
Title=self.Title,
Filter="",
|
@@ -20,14 +20,14 @@ self.pbox = gtk.HBox()
self.pbox.pack_start(gtk.VSeparator(), False, False)
self.pbox.pack_start(self.pbar, False, False)
-
+
self.pack_start(self.sttext, padding=1)
if extra:
self.pack_end(extra, False, False)
self.pack_end(self.pbox, False, False, padding=1)
self.pbox.set_child_visible(False)
self.show_all()
-
+
def _pulse_timer(self, now=False):
self.pbar.pulse()
return True
@@ -48,7 +48,7 @@
def set_status_text(self, msg):
self.sttext.set_text(str(msg))
-
+
def set_pulse_step(self, val):
self.pbar.set_pulse_step(val)
@@ -69,12 +69,12 @@ gtk.MESSAGE_QUESTION : gtk.STOCK_DIALOG_QUESTION,
gtk.MESSAGE_ERROR : gtk.STOCK_DIALOG_ERROR,
}
-
+
def __init__(self, parent=None, flags=0, type=gtk.MESSAGE_INFO,
buttons=gtk.BUTTONS_NONE, message_format=None):
gtk.Dialog.__init__(self,
parent=parent,
- flags=flags | gtk.DIALOG_NO_SEPARATOR,
+ flags=flags | gtk.DIALOG_NO_SEPARATOR,
buttons=MessageDialog.button_map[buttons])
self.set_resizable(False)
|
@@ -144,7 +144,7 @@ scroller = gtk.ScrolledWindow()
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
diffframe.add(scroller)
-
+
buf = gtk.TextBuffer()
buf.create_tag('removed', foreground='#900000')
buf.create_tag('added', foreground='#006400')
|
@@ -22,7 +22,7 @@ title = toutf(title.replace('\n', ' '))
gtk.Dialog.__init__(self,
title=title,
- flags=gtk.DIALOG_MODAL,
+ flags=gtk.DIALOG_MODAL,
#buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
)
@@ -38,7 +38,7 @@ self._button_stop = gtk.Button(_('Stop'))
self._button_stop.connect('clicked', self._on_stop_clicked)
self.action_area.pack_start(self._button_stop)
-
+
self._button_ok = gtk.Button(_('Close'))
self._button_ok.connect('clicked', self._on_ok_clicked)
self.action_area.pack_start(self._button_ok)
@@ -51,7 +51,7 @@ self.last_pbar_update = 0
hbox = gtk.HBox()
-
+
self.status_text = gtk.Label()
self.status_text.set_text(title)
self.status_text.set_alignment(0, 0.5)
@@ -62,7 +62,7 @@ align = gtk.Alignment(0.0, 0.0, 1, 0)
hbox.pack_end(align, False, False, 3)
align.show()
-
+
# create the progress bar
self.pbar = gtk.ProgressBar()
align.add(self.pbar)
@@ -79,7 +79,7 @@ self.textview.modify_font(pango.FontDescription('Monospace'))
scrolledwindow.add(self.textview)
self.textbuffer = self.textview.get_buffer()
-
+
self.vbox.pack_start(scrolledwindow, True, True)
self.connect('map_event', self._on_window_map_event)
@@ -92,22 +92,22 @@ def _on_stop_clicked(self, button):
if self.hgthread:
self.hgthread.terminate()
-
+
def _delete(self, widget, event):
return True
def _response(self, widget, response_id):
if self.hgthread and self.hgthread.isAlive():
widget.emit_stop_by_name('response')
-
+
def _on_window_map_event(self, event, param):
if self.hgthread is None:
self.hgthread = HgThread(self.cmdline[1:])
self.hgthread.start()
self._button_ok.set_sensitive(False)
- self._button_stop.set_sensitive(True)
+ self._button_stop.set_sensitive(True)
gobject.timeout_add(10, self.process_queue)
-
+
def write(self, msg, append=True):
msg = toutf(msg)
if append:
@@ -131,7 +131,7 @@ pass
self.update_progress()
if not self.hgthread.isAlive():
- self._button_stop.set_sensitive(False)
+ self._button_stop.set_sensitive(False)
self._button_ok.set_sensitive(True)
self._button_ok.grab_focus()
self.returncode = self.hgthread.return_code()
@@ -144,7 +144,7 @@ def update_progress(self):
if not self.pbar:
return # progress bar not enabled
-
+
if not self.hgthread.isAlive():
self.pbar.unmap()
else:
|
@@ -27,7 +27,7 @@ shlib.set_tortoise_keys(self)
self.root = root
self.revargs = revargs
-
+
self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
@@ -107,7 +107,7 @@ self.tooltips = gtk.Tooltips()
self._normal = gtk.RadioButton(None, _('Send changesets as HG patches'))
vbox.pack_start(self._normal, True, True, 4)
- self.tooltips.set_tip(self._normal,
+ self.tooltips.set_tip(self._normal,
_('HG patches (as generated by export command) are compatible'
' with most patch programs. They include a header which'
' contains the most important changeset metadata.'))
@@ -115,7 +115,7 @@ self._git = gtk.RadioButton(self._normal,
_('Use extended (git) patch format'))
vbox.pack_start(self._git, True, True, 4)
- self.tooltips.set_tip(self._git,
+ self.tooltips.set_tip(self._git,
_('Git patches can describe binary files, copies, and'
' permission changes, but recipients may not be able to'
' use them if they are not using git or Mercurial.'))
@@ -123,7 +123,7 @@ self._plain = gtk.RadioButton(self._normal,
_('Plain, do not prepend HG header'))
vbox.pack_start(self._plain, True, True, 4)
- self.tooltips.set_tip(self._plain,
+ self.tooltips.set_tip(self._plain,
_('Stripping Mercurial header removes username and parent'
' information. Only useful if recipient is not using'
' Mercurial (and does not like to see the headers).'))
@@ -131,7 +131,7 @@ self._bundle = gtk.RadioButton(self._normal,
_('Send single binary bundle, not patches'))
vbox.pack_start(self._bundle, True, True, 4)
- self.tooltips.set_tip(self._bundle,
+ self.tooltips.set_tip(self._bundle,
_('Bundles store complete changesets in binary form.'
' Upstream users can pull from them. This is the safest'
' way to send changes to recipient Mercurial users.'))
@@ -140,13 +140,13 @@ vbox.pack_start(hbox, False, False, 2)
self._attach = gtk.CheckButton(_('attach'))
- self.tooltips.set_tip(self._attach,
+ self.tooltips.set_tip(self._attach,
_('send patches as attachments'))
self._inline = gtk.CheckButton(_('inline'))
- self.tooltips.set_tip(self._inline,
+ self.tooltips.set_tip(self._inline,
_('send patches as inline attachments'))
self._diffstat = gtk.CheckButton(_('diffstat'))
- self.tooltips.set_tip(self._diffstat,
+ self.tooltips.set_tip(self._diffstat,
_('add diffstat output to messages'))
hbox.pack_start(self._attach, True, True, 2)
hbox.pack_start(self._inline, True, True, 2)
@@ -185,7 +185,7 @@ tbutton.set_tooltip(self.tips, tip)
tbutton.connect('clicked', handler)
return tbutton
-
+
def _refresh(self, initial):
def fill_history(history, vlist, cpath):
vlist.clear()
@@ -220,7 +220,7 @@ else:
addtip = ' ' + _('The description field is unused '
'when sending a single patch.')
- self.tooltips.set_tip(self._eventbox,
+ self.tooltips.set_tip(self._eventbox,
_('Patch series description is sent in initial summary'
' email with [PATCH 0 of N] subject. It should describe'
' the effects of the entire patch series. When emailing'
|
@@ -81,7 +81,7 @@ sel = pattree.get_selection()
sel.set_mode(gtk.SELECTION_SINGLE)
col = gtk.TreeViewColumn(_('Patterns'), gtk.CellRendererText(), text=0)
- pattree.append_column(col)
+ pattree.append_column(col)
pattree.set_headers_visible(False)
self.pattree = pattree
scrolledwindow = gtk.ScrolledWindow()
@@ -104,7 +104,7 @@ unknowntree = gtk.TreeView()
unknowntree.set_search_equal_func(self.unknown_search)
col = gtk.TreeViewColumn(_('Files'), gtk.CellRendererText(), text=0)
- unknowntree.append_column(col)
+ unknowntree.append_column(col)
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scrolledwindow.set_border_width(4)
@@ -222,7 +222,7 @@ pass
shlib.shell_notify([self.ignorefile])
if self.notify_func: self.notify_func()
-
+
def run(_ui, *pats, **opts):
if pats and pats[0].endswith('.hgignore'):
pats = []
|
@@ -19,7 +19,7 @@ gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
shlib.set_tortoise_icon(self, 'menucreaterepos.ico')
shlib.set_tortoise_keys(self)
-
+
# set dialog title and icon
self.cwd = os.getcwd()
title = 'hg init - %s' % toutf(self.cwd)
@@ -37,10 +37,10 @@ # add toolbar with tooltips
self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
-
+
self._btn_init = self._toolbutton(
gtk.STOCK_NEW,
- _('Create'),
+ _('Create'),
self._btn_init_clicked,
tip=_('Create a new repository in destination directory'))
tbuttons = [
@@ -70,7 +70,7 @@ srcbox.pack_start(self._dest_input, True, True)
srcbox.pack_end(self._btn_dest_browse, False, False, 5)
vbox.pack_start(srcbox, False, False, 2)
-
+
# options
option_box = gtk.VBox()
self._opt_specialfiles = gtk.CheckButton(
@@ -96,13 +96,13 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
tbutton.set_label(label)
if tip:
tbutton.set_tooltip(self.tips, tip)
tbutton.connect('clicked', handler, userdata)
return tbutton
-
+
def _btn_dest_clicked(self, button):
""" select source folder to clone """
dialog = gtk.FileChooserDialog(title=None,
@@ -120,17 +120,17 @@ def _btn_init_clicked(self, toolbutton, data=None):
# gather input data
dest = fromutf(self._dest_input.get_text())
-
+
# verify input
if dest == "":
error_dialog(self, _('Destination path is empty'),
_('Please enter the directory path'))
self._dest_input.grab_focus()
return False
-
+
# start
u = ui.ui()
-
+
# fncache is the new default repo format in Mercurial 1.1
if self._opt_oldrepoformat.get_active():
u.setconfig('format', 'usefncache', 'False')
@@ -145,7 +145,7 @@ return False
except:
import traceback
- error_dialog(self, _('Error when creating repository'),
+ error_dialog(self, _('Error when creating repository'),
traceback.format_exc())
return False
@@ -159,7 +159,7 @@ open(hgignore, 'wb')
except:
pass
-
+
info_dialog(self, _('New repository created'),
_('in directory %s') % toutf(os.path.abspath(dest)))
|
@@ -43,7 +43,7 @@ def toutf(s):
"""
Convert a string to UTF-8 encoding
-
+
Based on mercurial.util.tolocal()
"""
for e in ('utf-8', _encoding):
@@ -56,7 +56,7 @@def fromutf(s):
"""
Convert UTF-8 encoded string to local.
-
+
It's primarily used on strings converted to UTF-8 by toutf().
"""
try:
@@ -293,7 +293,7 @@ Replicate functionality of mercurial dispatch but force the use
of the passed in ui for all purposes
'''
-
+
# clear all user-defined command defaults
if nodefaults:
for k, v in ui.configitems('defaults'):
|
@@ -19,7 +19,7 @@ def internalpatch(patchobj, ui, strip, cwd, reverse=False, files={}):
"""use builtin patch to apply <patchobj> to the working directory.
returns whether patch was applied with fuzz factor.
-
+
Adapted from patch.internalpatch() to support reverse patching.
"""
try:
@@ -30,7 +30,7 @@ curdir = os.getcwd()
os.chdir(cwd)
try:
- ret = patch.applydiff(ui, fp, files, strip=strip,
+ ret = patch.applydiff(ui, fp, files, strip=strip,
reverse=reverse)
finally:
if cwd:
@@ -426,7 +426,7 @@ forced = opts['force'] or opts['append']
if os.path.exists(repo.join('shelve')) and not forced:
raise util.Abort(_('shelve data already exists'))
-
+
def shelvefunc(ui, repo, message, match, opts):
# If an MQ patch is applied, consider all qdiff changes
if hasattr(repo, 'mq') and repo.mq.applied:
@@ -441,7 +441,7 @@ diffopts = mdiff.diffopts(git=True, nodates=True)
patch_diff = ''.join(patch.diff(repo, basenode, match=match,
changes=changes, opts=diffopts))
-
+
fp = cStringIO.StringIO(patch_diff)
ac = parsepatch(fp)
fp.close()
@@ -466,7 +466,7 @@ try:
bkfiles = [f for f in newfiles if f in modified]
backups = makebackup(ui, repo, backupdir, bkfiles)
-
+
# patch to shelve
sp = cStringIO.StringIO()
for c in chunks:
@@ -559,7 +559,7 @@ else:
ui.status(_('restoring backup files\n'))
for realname, tmpname in backups.iteritems():
- ui.debug(_('restoring %r to %r\n') %
+ ui.debug(_('restoring %r to %r\n') %
(tmpname, realname))
util.copyfile(tmpname, repo.wjoin(realname))
finally:
@@ -575,7 +575,7 @@ ui.status(_('unshelve completed\n'))
except IOError:
ui.warn(_('nothing to unshelve\n'))
-
+
cmdtable = {
"shelve":
(shelve,
@@ -590,7 +590,7 @@ "unshelve":
(unshelve,
[('i', 'inspect', None, _('inspect shelved changes only')),
- ('f', 'force', None,
+ ('f', 'force', None,
_('proceed even if patches do not unshelve cleanly')),
],
_('hg unshelve [OPTION]... [FILE]...')),
|
@@ -128,7 +128,7 @@ help_(ui, 'shortlist')
except hglib.RepoError, inst:
ui.warn(_("abort: %s!\n") % inst)
-
+
return -1
def runcommand(ui, args):
@@ -324,7 +324,7 @@def synch(ui, *pats, **opts):
"""repository synchronization tool"""
from hggtk.synch import run
- cmd = sys.argv[1]
+ cmd = sys.argv[1]
if 'push'.startswith(cmd) or 'outgoing'.startswith(cmd):
opts['pushmode'] = True
else:
@@ -589,7 +589,7 @@ "^remove|rm": (revert, [], _('hgtk remove [FILE]...')),
"^rename|mv": (rename, [], _('hgtk rename SOURCE [DEST]')),
"^revert": (revert, [], _('hgtk revert [FILE]...')),
- "^serve":
+ "^serve":
(serve,
[('', 'webdir-conf', '', _('name of the webdir config file'))],
_('hgtk serve [OPTION]...')),
|
|
|
@@ -31,7 +31,7 @@ """GTK+ based dialog for displaying repository logs
"""
def get_title(self):
- return os.path.basename(self.repo.root) + ' log'
+ return os.path.basename(self.repo.root) + ' log'
def get_icon(self):
return 'menulog.ico'
@@ -104,12 +104,12 @@
def delete_event(dialog, event, data=None):
# return True to prevent the dialog from being destroyed
- return True
+ return True
revs = []
if self.currow is not None:
revs.append(self.currow[treemodel.REVID])
-
+
from logfilter import FilterDialog
dlg = FilterDialog(self.repo.root, revs, self.pats,
filterfunc=do_reload)
@@ -117,7 +117,7 @@ dlg.connect('delete-event', delete_event)
dlg.set_modal(False)
dlg.show()
-
+
self._filter_dialog = dlg
def _filter_selected(self, widget, data=None):
@@ -157,36 +157,36 @@
def _filter_menu(self):
menu = gtk.Menu()
-
+
button = gtk.RadioMenuItem(None, _('Show All Revisions'))
button.set_active(True)
button.connect('toggled', self._filter_selected, 'all')
menu.append(button)
-
+
button = gtk.RadioMenuItem(button, _('Show Tagged Revisions'))
button.connect('toggled', self._filter_selected, 'tagged')
menu.append(button)
-
+
button = gtk.RadioMenuItem(button, _('Show Parent Revisions'))
button.connect('toggled', self._filter_selected, 'parents')
menu.append(button)
-
+
button = gtk.RadioMenuItem(button, _('Show Head Revisions'))
button.connect('toggled', self._filter_selected, 'heads')
menu.append(button)
-
+
button = gtk.RadioMenuItem(button, _('Show Only Merge Revisions'))
button.connect('toggled', self._filter_selected, 'only_merges')
menu.append(button)
-
+
button = gtk.RadioMenuItem(button, _('Show Non-Merge Revisions'))
button.connect('toggled', self._filter_selected, 'no_merges')
menu.append(button)
-
+
self.custombutton = gtk.RadioMenuItem(button, _('Custom Filter'))
self.custombutton.set_sensitive(False)
menu.append(self.custombutton)
-
+
menu.show_all()
return menu
@@ -336,19 +336,19 @@ _menu.append(create_menu(_('add/remove _tag'), self._add_tag))
_menu.append(create_menu(_('backout revision'), self._backout_rev))
_menu.append(create_menu(_('_revert'), self._revert))
-
+
# need mq extension for strip command
extensions.loadall(self.ui)
extensions.load(self.ui, 'mq', None)
_menu.append(create_menu(_('strip revision'), self._strip_rev))
-
+
_menu.show_all()
return _menu
-
+
def _restore_original_selection(self, widget, *args):
self.tree.get_selection().set_mode(gtk.SELECTION_SINGLE)
self.tree.get_selection().select_path(self._orig_sel)
-
+
def tree_diff_context_menu(self):
_menu = gtk.Menu()
_menu.append(create_menu(_('_diff with selected'), self._diff_revs))
@@ -361,7 +361,7 @@ _menu.connect_after('selection-done', self._restore_original_selection)
_menu.show_all()
return _menu
-
+
def get_body(self):
self._filter_dialog = None
self._menu = self.tree_context_menu()
@@ -371,7 +371,7 @@ self.tree_frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)
# PyGtk 2.6 and below did not automatically register types
- if gobject.pygtk_version < (2, 8, 0):
+ if gobject.pygtk_version < (2, 8, 0):
gobject.type_register(TreeView)
self.tree = self.graphview.treeview
@@ -383,7 +383,7 @@ #self.tree.connect('popup-menu', self._tree_popup_menu)
self.tree.connect('row-activated', self._tree_row_act)
#self.tree.modify_font(pango.FontDescription(self.fontlist))
-
+
accelgroup = gtk.AccelGroup()
self.add_accel_group(accelgroup)
mod = shlib.get_thg_modifier()
@@ -574,7 +574,7 @@ # save tag info for detecting new tags added
oldtags = self.repo.tagslist()
rev = self.currow[treemodel.REVID]
-
+
def refresh(*args):
self.repo.invalidate()
newtags = self.repo.tagslist()
@@ -612,7 +612,7 @@ if result:
if os.path.exists(result):
os.remove(result)
-
+
# In case new export args are added in the future, merge the
# hg defaults
exportOpts= self.merge_opts(commands.table['^export'][1], ())
@@ -727,7 +727,7 @@
def _tree_popup_menu(self, treeview, button=0, time=0) :
selrev = self.currow[treemodel.REVID]
-
+
# disable/enable menus as required
parents = [self.repo.changelog.rev(x.node()) for x in
self.repo.changectx(None).parents()]
@@ -738,7 +738,7 @@ self._menu.popup(None, None, None, button, time)
return True
- def _tree_popup_menu_diff(self, treeview, button=0, time=0):
+ def _tree_popup_menu_diff(self, treeview, button=0, time=0):
# display the context menu
self._menu2.popup(None, None, None, button, time)
return True
|
|
|
@@ -23,7 +23,7 @@ gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
else:
buttons = (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
- super(HistoryDialog, self).__init__(flags=gtk.DIALOG_MODAL,
+ super(HistoryDialog, self).__init__(flags=gtk.DIALOG_MODAL,
buttons=buttons)
shlib.set_tortoise_icon(self, 'menulog.ico')
shlib.set_tortoise_keys(self)
@@ -44,15 +44,15 @@ # build dialog
self._create()
- # display history
+ # display history
self._generate_history()
def _create(self):
self.set_default_size(650, 400)
-
+
self._hbox = gtk.VBox()
self.vbox.pack_start(self._hbox, True, True)
-
+
# add treeview to list change files
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_shadow_type(gtk.SHADOW_IN)
@@ -62,7 +62,7 @@ self._create_treestore()
scrolledwindow.add(self.treeview)
self._hbox.pack_start(scrolledwindow, True, True)
-
+
self._button_box = gtk.HBox()
self._hbox.pack_start(self._button_box, False, False, 10)
@@ -75,7 +75,7 @@ self._button_box.pack_start(self._btn_goto_next, False, False)
self._btn_goto_first = gtk.Button('(0)')
self._button_box.pack_start(self._btn_goto_first, False, False)
-
+
self._btn_goto_tip.connect('clicked', self._on_goto_clicked, 'tip')
self._btn_goto_next.connect('clicked', self._on_goto_clicked, 'next')
self._btn_goto_prev.connect('clicked', self._on_goto_clicked, 'prev')
@@ -86,7 +86,7 @@ #self._button_box.pack_end(self._search_input, False, False)
#self._btn_search = gtk.Button("Search:")
#self._button_box.pack_end(self._btn_search, False, False, 3)
-
+
# show them all
self.vbox.show_all()
@@ -98,9 +98,9 @@ #self.treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
self.treeview.set_headers_visible(False)
self.treeview.set_model(self.model)
-
+
cell = gtk.CellRendererText()
-
+
column = gtk.TreeViewColumn()
column.pack_start(cell, expand=True)
column.add_attribute(cell, 'text', 0)
@@ -118,14 +118,14 @@ cs = self.history[index]['changeset'][0]
rev, csid = cs.split(':')
self.selected = (rev, csid)
-
- def _get_hg_history(self, rev=None, limit=10):
+
+ def _get_hg_history(self, rev=None, limit=10):
# get history
options = []
if rev: options += ['--rev', rev]
if limit: options += ['--limit', str(limit)]
self._do_hg_cmd('log', options)
-
+
# parse log output
import re
histlist = []
@@ -145,9 +145,9 @@ pass
if cs:
histlist.append(cs)
-
+
return histlist
-
+
def _generate_history(self):
# clear changed files display
self.model.clear()
@@ -167,13 +167,13 @@ self.model.append(titer, [ fld + ":", v ])
self.treeview.expand_all()
-
+
if self.start_rev == 'tip':
self.tip_rev = self._get_revision_on_page(0)
-
+
def _do_hg_cmd(self, cmd, options):
import os.path
-
+
try:
q = Queue.Queue()
args = [cmd] + options + [os.path.join(self.root, x) for x in self.files]
@@ -211,7 +211,7 @@ self.start_rev = next_start
self._generate_history()
-
+
def _get_revision_on_page(self, index):
import string
cs = self.history[index]
@@ -225,7 +225,7 @@ if 'tip' in tags:
return True
return False
-
+
def _is_first_revision(self, index):
rev = self._get_revision_on_page(index)
if rev == 0:
|
@@ -17,7 +17,7 @@ def __init__(self, root='', revs=[], files=[], filterfunc=None):
""" Initialize the Dialog """
buttons = (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
- super(FilterDialog, self).__init__(flags=gtk.DIALOG_MODAL,
+ super(FilterDialog, self).__init__(flags=gtk.DIALOG_MODAL,
buttons=buttons)
shlib.set_tortoise_icon(self, 'menucheckout.ico')
shlib.set_tortoise_keys(self)
@@ -38,7 +38,7 @@ self.set_default_size(350, 120)
self.tips = gtk.Tooltips()
-
+
# branch: combo box
hbox = gtk.HBox()
self.branchradio = gtk.RadioButton(None, _('Branch'))
@@ -101,7 +101,7 @@ vbox.pack_start(eventbox, False, False, 4)
if files:
self.filesentry.set_text(', '.join(files))
-
+
hbox = gtk.HBox()
self.kwentry = gtk.Entry()
self.kwentry.connect('activate', self._btn_apply_clicked)
@@ -165,13 +165,13 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
tbutton.set_label(label)
if tip:
tbutton.set_tooltip(self.tips, tip)
tbutton.connect('clicked', handler, userdata)
return tbutton
-
+
def _btn_apply_clicked(self, button, data=None):
opts = {}
if self.searchradio.get_active():
@@ -214,7 +214,7 @@
if self.filterfunc:
self.filterfunc(opts)
-
+
def _date_help(self, button):
from hgcmd import CmdDialog
dlg = CmdDialog(['hg', 'help', 'dates'], False)
|
|
|
@@ -40,11 +40,11 @@
def _create(self):
self.set_default_size(350, 120)
-
+
# add toolbar with tooltips
self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
-
+
self._btn_merge = self._toolbutton(
gtk.STOCK_CONNECT,
_('merge'),
@@ -67,7 +67,7 @@ vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
-
+
# repo parent revisions
parentbox = gtk.HBox()
lbl = gtk.Label(_('Parent revision(s):'))
@@ -83,11 +83,11 @@ self._rev_lbl = gtk.Label(_('Merge with revision:'))
self._rev_lbl.set_property('width-chars', 18)
self._rev_lbl.set_alignment(0, 0.5)
-
+
# revisions combo box
self._revlist = gtk.ListStore(str, str)
self._revbox = gtk.ComboBoxEntry(self._revlist, 0)
-
+
# add extra column to droplist for type of changeset
cell = gtk.CellRendererText()
self._revbox.pack_start(cell)
@@ -100,7 +100,7 @@ revbox.pack_start(self._revbox, False, False)
revbox.pack_start(self._btn_rev_browse, False, False, 5)
vbox.pack_start(revbox, False, False, 2)
-
+
# show them all
self._refresh()
@@ -111,13 +111,13 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
tbutton.set_label(label)
if tip:
tbutton.set_tooltip(self.tips, tip)
tbutton.connect('clicked', handler, userdata)
return tbutton
-
+
def _refresh(self):
""" update display on dialog with recent repo data """
try:
@@ -132,7 +132,7 @@ self._parent_revs.set_sensitive(True)
self._parent_revs.set_text(", ".join([short(x) for x in self._parents]))
self._parent_revs.set_sensitive(False)
-
+
# condition some widgets per state of working directory
is_merged = len(self._parents) > 1
if is_merged:
@@ -145,8 +145,8 @@ self._btn_unmerge.set_sensitive(False)
self._rev_lbl.set_text(_('Merge with revision:'))
self._btn_rev_browse.set_sensitive(True)
-
- # populate revision data
+
+ # populate revision data
heads = self.repo.heads()
tip = self.repo.changelog.node(nullrev+len(self.repo.changelog))
self._revlist.clear()
@@ -154,26 +154,26 @@ for i, node in enumerate(heads):
if node in self._parents and not is_merged:
continue
-
+
status = "head %d" % (i+1)
if node == tip:
status += ", tip"
-
+
self._revlist.append([short(node), "(%s)" %status])
self._rev_input.set_text(short(node))
if self.rev:
self._rev_input.set_text(str(self.rev))
-
+
def _merge_menu(self):
menu = gtk.Menu()
-
+
self._chbox_force = gtk.CheckMenuItem(_('Allow merge with uncommited changes'))
menu.append(self._chbox_force)
-
+
menu.show_all()
return menu
-
+
def _btn_rev_clicked(self, button):
""" select revision from history dialog """
rev = histselect.select(self.root)
@@ -182,13 +182,13 @@
def _btn_merge_clicked(self, toolbutton, data=None):
self._do_merge()
-
+
def _btn_unmerge_clicked(self, toolbutton, data=None):
self._do_unmerge()
-
+
def _do_unmerge(self):
rev = self._rev_input.get_text()
-
+
if not rev:
error_dialog(self, _('Cannot unmerge'),
_('please select revision to unmerge'))
@@ -208,17 +208,17 @@ self.notify_func(self.notify_args)
shlib.shell_notify([self.root])
self._refresh()
-
+
def _do_merge(self):
rev = self._rev_input.get_text()
force = self._chbox_force.get_active()
-
+
if not rev:
error_dialog(self, _('Cannot merge'),
_('please enter revision to merge'))
return
-
- response = question_dialog(self, _('Really want to merge?'),
+
+ response = question_dialog(self, _('Really want to merge?'),
_('with revision %s') % rev)
if response != gtk.RESPONSE_YES:
return
|
@@ -71,7 +71,7 @@ vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
-
+
# hg output window
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)
@@ -97,7 +97,7 @@ error_dialog(self, _('Cannot close now'), _('command is running'))
return True
return False
-
+
def _toolbutton(self, stock, label, handler,
menu=None, userdata=None, tip=None):
if menu:
@@ -105,13 +105,13 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
tbutton.set_label(label)
if tip:
tbutton.set_tooltip(self.tips, tip)
tbutton.connect('clicked', handler, userdata)
return tbutton
-
+
def _clean_clicked(self, toolbutton, data=None):
response = question_dialog(self, _('Clean repository'),
"%s ?" % os.path.basename(self.root))
@@ -138,15 +138,15 @@ return
cmd = ['rollback']
self._exec_cmd(cmd, postfunc=self._notify)
-
+
def _recover_clicked(self, toolbutton, data=None):
cmd = ['recover']
self._exec_cmd(cmd)
-
+
def _verify_clicked(self, toolbutton, data=None):
cmd = ['verify']
self._exec_cmd(cmd)
-
+
def _stop_clicked(self, toolbutton, data=None):
if self.hgthread and self.hgthread.isAlive():
self.hgthread.terminate()
@@ -163,7 +163,7 @@ cmdline.append('--verbose')
cmdline.append('--repository')
cmdline.append(self.root)
-
+
# show command to be executed
self.write("", False)
@@ -173,7 +173,7 @@ self.hgthread.start()
self.stbar.begin()
self.stbar.set_status_text('hg ' + ' '.join(cmdline))
-
+
def _cmd_running(self):
if self.hgthread and self.hgthread.isAlive():
return True
|
@@ -64,7 +64,7 @@ toquit = False
finally:
sys.stderr = saved
- textout = errors.getvalue() + repo.ui.popbuffer()
+ textout = errors.getvalue() + repo.ui.popbuffer()
errors.close()
if len(textout) > 1:
error_dialog(None, _('rename error'), textout)
|
|
|
@@ -48,7 +48,7 @@ self._webdirconf = webdir_conf
self._get_config()
self.set_default_size(500, 300)
-
+
# toolbar
self.tbar = gtk.Toolbar()
self.tooltips = gtk.Tooltips()
@@ -83,7 +83,7 @@ vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
-
+
# revision input
revbox = gtk.HBox()
lbl = gtk.Label(_('HTTP Port:'))
@@ -127,14 +127,14 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
if tip:
tbutton.set_tooltip(self.tooltips, tip)
-
+
tbutton.set_label(label)
tbutton.connect('clicked', handler, userdata)
return tbutton
-
+
def _delete(self, widget, event):
if not self.should_live():
self.destroy()
@@ -170,11 +170,11 @@ self._button_stop.set_sensitive(False)
self._button_browse.set_sensitive(False)
self._button_conf.set_sensitive(True)
-
+
def _on_start_clicked(self, *args):
self._start_server()
self._set_button_states()
-
+
def _on_stop_clicked(self, *args):
self._stop_server()
@@ -185,7 +185,7 @@ if os.name == 'nt':
try:
import win32api, win32con
- win32api.ShellExecute(0, "open", self._url, None, "",
+ win32api.ShellExecute(0, "open", self._url, None, "",
win32con.SW_SHOW)
except:
# Firefox likes to create exceptions at launch,
@@ -198,7 +198,7 @@ '/desktop/gnome/url-handlers/http/command') + '&'
os.system(browser % self._url)
threading.Thread(target=start_browser).start()
-
+
def _on_conf_clicked(self, *args):
from thgconfig import ConfigDialog
dlg = ConfigDialog(True)
@@ -217,7 +217,7 @@ except: port = 8000
error_dialog(self, _('Invalid port 2048..65535'),
_('Defaulting to ') + self.defport)
-
+
global gservice
gservice = None
@@ -236,7 +236,7 @@ # loopback addr directly
self._url = 'http://127.0.0.1:%d/' % (port)
gobject.timeout_add(10, self.process_queue)
-
+
def _stop_server(self):
if gservice and not gservice.stopped:
gservice.stop()
@@ -246,7 +246,7 @@
def write(self, msg):
self._queue.put(msg)
-
+
def _write(self, msg, append=True):
msg = hglib.toutf(msg)
if append:
@@ -271,7 +271,7 @@ return False # Stop polling this function
else:
return True
-
+
def thg_serve(ui, repo, **opts):
class service:
def init(self):
|
@@ -81,7 +81,7 @@ ls = self.get_value(key, [], True)
ml = SimpleMRUList(size=size, reflist=ls)
return ml
-
+
def get_keys(self):
return self._data.keys()
@@ -129,7 +129,7 @@ if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
t = (t[0], t[1], t[2], t[3], time.clock())
return t
-
+
def set_tortoise_icon(window, thgicon):
ico = get_tortoise_icon(thgicon)
if ico: window.set_icon_from_file(ico)
@@ -227,7 +227,7 @@ pidl, ignore = shell.SHILCreateFromPath(dir, 0)
if pidl is None:
continue
- shell.SHChangeNotify(shellcon.SHCNE_UPDATEITEM,
+ shell.SHChangeNotify(shellcon.SHCNE_UPDATEITEM,
shellcon.SHCNF_IDLIST | shellcon.SHCNF_FLUSH,
pidl, None)
else:
|
|
|
@@ -57,7 +57,7 @@ def init(self):
GDialog.init(self)
self.mode = 'status'
-
+
def auto_check(self):
if self.pats or self.opts.get('check'):
for entry in self.filemodel:
@@ -66,24 +66,24 @@
def get_menu_info(self):
"""Returns menu info in this order:
- merge, addrem, unknown, clean, ignored, deleted,
- unresolved, resolved
+ merge, addrem, unknown, clean, ignored, deleted,
+ unresolved, resolved
"""
return (
# merge
((_('_difference'), self._diff_file),
- (_('_view right'), self._view_file),
+ (_('_view right'), self._view_file),
(_('view _left'), self._view_left_file),
(_('_revert'), self._revert_file),
(_('l_og'), self._log_file)),
# addrem
((_('_difference'), self._diff_file),
- (_('_view'), self._view_file),
- (_('_revert'), self._revert_file),
+ (_('_view'), self._view_file),
+ (_('_revert'), self._revert_file),
(_('l_og'), self._log_file)),
# unknown
((_('_view'), self._view_file),
- (_('_delete'), self._delete_file),
+ (_('_delete'), self._delete_file),
(_('_add'), self._add_file),
(_('_guess rename'), self._guess_rename),
(_('_ignore'), self._ignore_file)),
@@ -98,12 +98,12 @@ (_('_delete'), self._delete_file)),
# deleted
((_('_view'), self._view_file),
- (_('_revert'), self._revert_file),
+ (_('_revert'), self._revert_file),
(_('re_move'), self._remove_file),
(_('l_og'), self._log_file)),
# unresolved
((_('_difference'), self._diff_file),
- (_('_view right'), self._view_file),
+ (_('_view right'), self._view_file),
(_('view _left'), self._view_left_file),
(_('_revert'), self._revert_file),
(_('l_og'), self._log_file),
@@ -111,7 +111,7 @@ (_('mark resolved'), self._mark_resolved)),
# resolved
((_('_difference'), self._diff_file),
- (_('_view right'), self._view_file),
+ (_('_view right'), self._view_file),
(_('view _left'), self._view_left_file),
(_('_revert'), self._revert_file),
(_('l_og'), self._log_file),
@@ -137,8 +137,8 @@ wasset = True
self._show_checks[opt].set_active(True)
if not wasset:
- for check in [item[1] for item in self._show_checks.iteritems()
- if item[0] in ('modified', 'added', 'removed',
+ for check in [item[1] for item in self._show_checks.iteritems()
+ if item[0] in ('modified', 'added', 'removed',
'deleted', 'unknown')]:
check.set_active(True)
@@ -284,31 +284,31 @@ col0.set_resizable(False)
self.filetree.append_column(col0)
self.selcb = self._add_header_checkbox(col0, self._sel_clicked)
-
+
col1 = gtk.TreeViewColumn(_('st'), stat_cell)
col1.add_attribute(stat_cell, 'text', FM_STATUS)
col1.set_cell_data_func(stat_cell, self._text_color)
col1.set_sort_column_id(1001)
col1.set_resizable(False)
self.filetree.append_column(col1)
-
+
col = gtk.TreeViewColumn(_('ms'), stat_cell)
col.add_attribute(stat_cell, 'text', FM_MERGE_STATUS)
col.set_sort_column_id(4)
col.set_resizable(False)
self.filetree.append_column(col)
-
+
col2 = gtk.TreeViewColumn(_('path'), path_cell)
col2.add_attribute(path_cell, 'text', FM_PATH_UTF8)
col2.set_cell_data_func(path_cell, self._text_color)
col2.set_sort_column_id(2)
col2.set_resizable(True)
self.filetree.append_column(col2)
-
+
scroller = gtk.ScrolledWindow()
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scroller.add(self.filetree)
-
+
tree_frame = gtk.Frame()
tree_frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)
tree_frame.add(scroller)
@@ -413,7 +413,7 @@
def thgdiff(self, treeview):
selection = treeview.get_selection()
- model, paths = selection.get_selected_rows()
+ model, paths = selection.get_selected_rows()
row = model[paths[0]]
self._diff_file(row[FM_STATUS], row[FM_PATH])
@@ -461,14 +461,14 @@ self._show_checks[ctype] = check
col += row
row = not row
-
+
self.counter = gtk.Label('')
self.counter.set_alignment(1.0, 0.0) # right up
hbox = gtk.HBox()
hbox.pack_start(table, expand=False)
hbox.pack_end(self.counter, expand=True, padding=2)
-
+
return hbox
def _add_header_checkbox(self, col, post=None, pre=None, toggle=False):
@@ -480,7 +480,7 @@ cb.set_active(not state)
if post:
post(not state)
-
+
cb = gtk.CheckButton(col.get_title())
cb.show()
col.set_widget(cb)
@@ -564,7 +564,7 @@ ('deleted', '!', deleted),
('unknown', '?', unknown),
('ignored', 'I', ignored))
-
+
explicit_changetypes = changetypes + (('clean', 'C', clean),)
# List of the currently checked and selected files to pass on to the new data
@@ -574,11 +574,11 @@
# merge-state of files
ms = merge_.mergestate(repo)
-
+
# Load the new data into the tree's model
self.filetree.hide()
self.filemodel.clear()
-
+
for opt, char, changes in ([ct for ct in explicit_changetypes
if self.test_opt(ct[0])] or changetypes) :
for wfile in changes:
@@ -686,11 +686,11 @@
result = order.find(lhs) - order.find(rhs)
return min(max(result, -1), 1)
-
+
def _text_color(self, column, text_renderer, model, row_iter):
stat = model[row_iter][FM_STATUS]
- if stat == 'M':
+ if stat == 'M':
text_renderer.set_property('foreground', '#000090')
elif stat == 'A':
text_renderer.set_property('foreground', '#006400')
@@ -749,7 +749,7 @@ def _hg_remove(self, files):
wfiles = [self.repo.wjoin(x) for x in files]
if self.count_revs() > 1:
- Prompt(_('Nothing Removed'),
+ Prompt(_('Nothing Removed'),
_('Remove is not enabled when multiple revisions are specified.'),
self).run()
return
@@ -1010,7 +1010,7 @@
self.showdiff_toggle.handler_unblock(self._showdiff_toggled_id)
return False
-
+
def _refresh_clicked(self, toolbutton, data=None):
self.reload_status()
@@ -1070,7 +1070,7 @@ def _hg_revert(self, files):
wfiles = [self.repo.wjoin(x) for x in files]
if self.count_revs() > 1:
- Prompt(_('Nothing Reverted'),
+ Prompt(_('Nothing Reverted'),
_('Revert not allowed when viewing revision range.'),
self).run()
return
@@ -1152,14 +1152,14 @@ dialog.destroy()
if response != gtk.RESPONSE_OK:
return True
-
+
# verify directory
destroot = rootpath(destdir)
if destroot != self.repo.root:
Prompt(_('Nothing Moved'),
_('Cannot move outside repo!'), self).run()
return True
-
+
# move the files to dest directory
move_list.append(fromutf(destdir))
self._hg_move(move_list)
@@ -1176,7 +1176,7 @@ if dialog.run() == gtk.RESPONSE_YES :
errors = ''
for wfile in files:
- try:
+ try:
os.unlink(self.repo.wjoin(wfile))
except Exception, inst:
errors += str(inst) + '\n\n'
@@ -1241,7 +1241,7 @@ self._update_chunk_state(entry)
self._update_check_count()
-
+
def _relevant_files(self, stats):
return [item[FM_PATH] for item in self.filemodel \
if item[FM_CHECKED] and item[FM_STATUS] in stats]
@@ -1251,7 +1251,7 @@ selection = self.filetree.get_selection()
assert(selection.count_selected_rows() == 1)
- model, paths = selection.get_selected_rows()
+ model, paths = selection.get_selected_rows()
path = paths[0]
handler(model[path][FM_STATUS], model[path][FM_PATH])
return True
@@ -1281,13 +1281,13 @@ else:
menu = self._menus[st]
return menu
-
+
def _tree_popup_menu(self, widget, button=0, time=0) :
selection = self.filetree.get_selection()
if selection.count_selected_rows() != 1:
return False
- model, paths = selection.get_selected_rows()
+ model, paths = selection.get_selected_rows()
menu = self._get_file_context_menu(model[paths[0]])
menu.popup(None, None, None, button, time)
return True
@@ -1319,7 +1319,7 @@ if selection.count_selected_rows() != 1:
return False
- model, paths = selection.get_selected_rows()
+ model, paths = selection.get_selected_rows()
menu = self._get_file_context_menu(model[paths[0]])
menu.get_children()[0].activate()
return True
|
|
|
@@ -29,7 +29,7 @@ self.root = rootpath()
self.selected_path = None
self.hgthread = None
-
+
# persistent app data
self._settings = shlib.Settings('synch')
self._recent_src = self._settings.mrul('src_paths')
@@ -91,7 +91,7 @@ vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
-
+
# sync target info
targethbox = gtk.HBox()
lbl = gtk.Button(_('Repo:'))
@@ -103,7 +103,7 @@ lbl.unset_flags(gtk.CAN_FOCUS)
lbl.connect('clicked', self._btn_bundlepath_clicked)
targethbox.pack_start(lbl, False, False)
-
+
# revisions combo box
self.pathlist = gtk.ListStore(str, str)
self._pathbox = gtk.ComboBoxEntry(self.pathlist, 0)
@@ -138,7 +138,7 @@
# create checkbox to disable proxy
self._use_proxy = gtk.CheckButton(_('use proxy server'))
- if ui.ui().config('http_proxy', 'host', ''):
+ if ui.ui().config('http_proxy', 'host', ''):
self._use_proxy.set_active(True)
else:
self._use_proxy.set_sensitive(False)
@@ -215,7 +215,6 @@ iovbox.pack_start(self._newestfirst, False, False, 2)
iovbox.pack_start(self._nomerge, False, False, 2)
frame.add(iovbox)
- vbox.pack_start(expander, False, False, 2)
# hg output window
scrolledwindow = gtk.ScrolledWindow()
@@ -242,7 +241,7 @@ vbox.pack_start(self.stbar, False, False, 2)
self.connect('map', self.update_buttons)
self._last_drop_time = None
-
+
self.load_settings()
self.update_pull_setting()
@@ -317,7 +316,7 @@ self.hgthread.start()
self.stbar.begin()
self.stbar.set_status_text('hg ' + ' '.join(cmdline))
-
+
def _get_paths(self, sort="value"):
""" retrieve symbolic paths """
try:
@@ -369,7 +368,7 @@ if response == gtk.RESPONSE_OK:
self._pathtext.set_text(dialog.get_filename())
dialog.destroy()
-
+
def should_live(self):
if self._cmd_running():
error_dialog(self, _('Cannot close now'), _('command is running'))
@@ -378,11 +377,11 @@ self.update_settings()
self._settings.write()
return False
-
+
def _delete(self, widget, event):
if not self.should_live():
self.destroy()
-
+
def _toolbutton(self, stock, label, handler,
menu=None, userdata=None, tip=None):
if menu:
@@ -390,7 +389,7 @@ tbutton.set_menu(menu)
else:
tbutton = gtk.ToolButton(stock)
-
+
tbutton.set_label(label)
if tip:
tbutton.set_tooltip(self.tips, tip)
@@ -413,9 +412,9 @@ target_rev = self._reventry.get_text().strip()
if target_rev != "":
opts['rev'] = ['--rev', target_rev]
-
+
return opts
-
+
def _pull_clicked(self, toolbutton, data=None):
aopts = self._get_advanced_options()
if self.fetchradio.get_active():
@@ -434,7 +433,7 @@ extensions.load(self.ui, 'rebase', None)
cmd += aopts.get('rev', [])
self._exec_cmd(cmd)
-
+
def _push_clicked(self, toolbutton, data=None):
aopts = self._get_advanced_options()
cmd = ['push']
@@ -442,7 +441,7 @@ cmd += aopts.get('force', [])
cmd += aopts.get('remotecmd', [])
self._exec_cmd(cmd)
-
+
def _conf_clicked(self, toolbutton, data=None):
newpath = fromutf(self._pathtext.get_text()).strip()
for alias, path in self.paths:
@@ -492,7 +491,7 @@ cmd += aopts.get('newest-first', [])
cmd += aopts.get('remotecmd', [])
self._exec_cmd(cmd)
-
+
def _outgoing_clicked(self, toolbutton, data=None):
aopts = self._get_advanced_options()
cmd = ['outgoing']
@@ -503,7 +502,7 @@ cmd += aopts.get('newest-first', [])
cmd += aopts.get('remotecmd', [])
self._exec_cmd(cmd)
-
+
def _stop_clicked(self, toolbutton, data=None):
if self._cmd_running():
self.hgthread.terminate()
@@ -526,13 +525,13 @@ remote_path = path
elif remote_path == url.hidepassword(path):
remote_path = path
-
+
cmdline = cmd[:]
cmdline += ['--verbose', '--repository', self.root]
if proxy_host and not use_proxy:
cmdline += ["--config", "http_proxy.host="]
cmdline += [remote_path]
-
+
# show command to be executed
self.write("", False)
@@ -542,7 +541,7 @@ self.hgthread.start()
self.stbar.begin()
self.stbar.set_status_text('hg ' + ' '.join(cmd + [remote_path]))
-
+
self._add_src_to_recent(remote_path)
def _cmd_running(self):
@@ -550,7 +549,7 @@ return True
else:
return False
-
+
def _add_src_to_recent(self, src):
if os.path.exists(src):
src = os.path.abspath(src)
@@ -593,14 +592,14 @@ if self.hgthread.return_code() is None:
self.write(_('[command interrupted]'))
return False # Stop polling this function
-
+
AdvancedDefaults = {
- 'expander.expanded': False,
- '_reventry.text': '',
- '_cmdentry.text': '',
+ 'expander.expanded': False,
+ '_reventry.text': '',
+ '_cmdentry.text': '',
'_force.active': False,
- '_showpatch.active': False,
- '_newestfirst.active': False,
+ '_showpatch.active': False,
+ '_newestfirst.active': False,
'_nomerge.active': False,}
def _expanded(self, expander):
@@ -613,7 +612,7 @@ member, attr = key.split('.')
value = get_value(key, default)
getattr(getattr(self, member), 'set_%s'%attr)(value)
-
+
def update_settings(self, set_value = None):
set_value = set_value or self._settings.set_value
for key, default in SynchDialog.AdvancedDefaults.iteritems():
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
@@ -50,7 +50,7 @@ serve update vdiff'''.split()
_commit_info = (
- (_('Username'), 'ui.username', [],
+ (_('Username'), 'ui.username', [],
_('Name associated with commits')),
(_('External Commit Tool'), 'tortoisehg.extcommit', ['None', 'qct'],
_('Select commit tool launched by TortoiseHg. (Qct is no longer'
@@ -340,7 +340,7 @@
class ConfigDialog(gtk.Dialog):
def __init__(self, configrepo=False, focusfield=None, newpath=None):
- """ Initialize the Dialog. """
+ """ Initialize the Dialog. """
gtk.Dialog.__init__(self, parent=None, flags=0,
buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
self.add_button(gtk.STOCK_EDIT, gtk.RESPONSE_YES)
@@ -469,7 +469,7 @@ self.notebook.set_current_page(page_num)
widgets[w].grab_focus()
return
-
+
def new_path(self, newpath):
'''Add a new path to [paths], give default name, focus'''
i = self.pathdata.insert_before(None, None)
@@ -576,11 +576,11 @@ renderer = gtk.CellRendererText()
column = gtk.TreeViewColumn(_('Alias'), renderer, text=0)
self.pathtree.append_column(column)
-
+
renderer = gtk.CellRendererText()
column = gtk.TreeViewColumn(_('Repository Path'), renderer, text=1)
self.pathtree.append_column(column)
-
+
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scrolledwindow.add(self.pathtree)
@@ -859,7 +859,7 @@
self.pages.append((vbox, info, widgets))
return vbox
-
+
def _refresh_vlist(self):
for vbox, info, widgets in self.pages:
for row, (label, cpath, values, tooltip) in enumerate(info):
@@ -898,7 +898,7 @@ pass
currow = None
- if not ispw:
+ if not ispw:
vlist.append([_unspecstr, False])
if values:
vlist.append([_('Suggested'), True])
@@ -941,7 +941,7 @@ return self.ini[section][key]
except KeyError:
return None
-
+
def load_config(self, rcpath):
for fn in rcpath:
if os.path.exists(fn):
@@ -1003,7 +1003,7 @@
self.history.write()
self._refresh_vlist()
-
+
try:
f = open(self.fn, "w")
f.write(str(self.ini))
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
Loading...