We are currently indexing your data, so search results may be incomplete until we finish.
merge with stable
by
Changes to 46 files · Browse files at e029f53859d8 Showing diff from parent 429f63e37356 c55f3b963ead Diff from another changeset...
-
MANIFEST.in
-
contrib/nautilus-thg.py
-
hggtk/about.py
-
hggtk/backout.py
-
hggtk/bugreport.py
-
hggtk/changeset.py
-
hggtk/clone.py
-
hggtk/commit.py
-
hggtk/datamine.py
-
hggtk/gdialog.py
-
hggtk/gtklib.py
-
hggtk/guess.py
-
hggtk/hgcmd.py
-
hggtk/hgemail.py
-
hggtk/hgignore.py
-
hggtk/hginit.py
-
hggtk/hgshelve.py
-
hggtk/hgthread.py
-
hggtk/hgtk.py
-
hggtk/history.py
-
hggtk/logfilter.py
-
hggtk/logview/treemodel.py
-
hggtk/logview/treeview.py
-
hggtk/merge.py
-
hggtk/recovery.py
-
hggtk/rename.py
-
hggtk/serve.py
-
hggtk/status.py
-
hggtk/synch.py
-
hggtk/tagadd.py
-
hggtk/taskbarui.py
-
hggtk/thgconfig.py
-
hggtk/thgshelve.py
-
hggtk/thgstatus.py
-
hggtk/update.py
-
hggtk/visdiff.py
-
thgutil/cachethg.py
-
thgutil/debugthg.py
-
thgutil/hglib.py
-
thgutil/i18n.py
-
thgutil/menuthg.py
-
thgutil/paths.py
-
thgutil/settings.py
-
thgutil/shlib.py
-
thgutil/thread2.py
-
thgutil/version.py
|
@@ -3,3 +3,4 @@ include contrib/nautilus-thg.py
include COPYING.txt ReleaseNotes.txt
recursive-include locale *.mo
+recursive-include i18n *.po
|
||
|
@@ -1,13 +1,9 @@ # TortoiseHg plugin for Nautilus
#
-# Copyright (C) 2007-9 Steve Borho
+# Copyright 2007 Steve Borho
#
-# Stolen mercilessly from nautilus-bzr, thanks guys
-# Copyright (C) 2006 Jeff Bailey
-# Copyright (C) 2006 Wouter van Heyst
-# Copyright (C) 2006 Jelmer Vernooij
-#
-# Published under the GNU GPL
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,8 +1,10 @@ + # about.py - TortoiseHg About dialog
#
-# TortoiseHg About dialog
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007-9 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import sys
|
||
|
@@ -1,9 +1,10 @@ - #
# backout.py - TortoiseHg's dialog for backing out changeset
#
-# Copyright (C) 2008 Steve Borho <steve@borho.org>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2008 TK Soh <teekaysoh@gmail.com>
+# Copyright 2008 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,8 +1,9 @@ - #
# bugreport.py - Bug report dialog for TortoiseHg
#
-# Copyright (C) 2009 Steve Borho <steve@borho.org>
+# Copyright 2009 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,8 +1,9 @@ - #
# changeset.py - Changeset dialog for TortoiseHg
#
# Copyright 2008 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,8 +1,10 @@ + # clone.py - Clone dialog for TortoiseHg
#
-# TortoiseHg dialog to clone a repo
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import os
|
||
|
@@ -1,10 +1,11 @@ - #
-# commit.py - commit dialog for TortoiseHg
+# commit.py - Commit dialog for TortoiseHg
#
# Copyright 2007 Brad Schick, brad at gmail . com
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-# Copyright (C) 2009 Steve Borho <steve@borho.org>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import errno
@@ -353,10 +354,11 @@ entry[FM_CHECKED] = True
self.update_check_count()
- # pre-fill commit message
+ # pre-fill commit message, if not modified
buf = self.text.get_buffer()
- buf.set_text(_('merge'))
- buf.set_modified(False)
+ if not buf.get_modified():
+ buf.set_text(_('merge'))
+ buf.set_modified(False)
def check_patch_queue(self):
|
||
|
@@ -1,7 +1,9 @@ + # datamine.py - Data Mining dialog for TortoiseHg
#
-# Data Mining dialog for TortoiseHg and Mercurial
+# Copyright 2008 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2008 Steve Borho <steve@borho.org>
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,10 +1,10 @@ # gdialog.py - base dialog for gtools
#
# Copyright 2007 Brad Schick, brad at gmail . com
+# Copyright 2008 Steve Borho <steve@borho.org>
#
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import threading
|
||
|
@@ -1,8 +1,10 @@ + # gtklib.py - miscellaneous PyGTK classes and functions for TortoiseHg
#
-# miscellaneous PyGTK classes and functions for TortoiseHg
+# Copyright 2008 TK Soh <teekaysoh@gmail.com>
+# Copyright 2009 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import sys
|
||
|
@@ -1,8 +1,9 @@ - #
# guess.py - TortoiseHg's dialogs for detecting copies and renames
#
-# Copyright (C) 2009 Steve Borho <steve@borho.org>
+# Copyright 2009 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import sys
|
||
|
@@ -1,8 +1,10 @@ + # hgcmd.py - A simple dialog to execute random command for TortoiseHg
#
-# A simple dialog to execute random command for TortoiseHg
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,9 +1,10 @@ - #
# hgemail.py - TortoiseHg's dialog for sending patches via email
#
-# Copyright (C) 2007 Steve Borho <steve@borho.org>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import sys
|
||
|
|
|
- #
# hgignore.py - TortoiseHg's dialog for editing .hgignore
#
-# Copyright (C) 2008-2009 Steve Borho <steve@borho.org>
+# Copyright 2008 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
import gobject
import re
from mercurial import hg, ui, match, util
from thgutil.i18n import _
from thgutil import shlib, hglib, paths
from hggtk import gtklib, gdialog
class HgIgnoreDialog(gtk.Window):
'Edit a reposiory .hgignore file'
def __init__(self, fileglob='', *pats):
'Initialize the Dialog'
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
gtklib.set_tortoise_icon(self, 'ignore.ico')
gtklib.set_tortoise_keys(self)
self.root = paths.find_root()
base = os.path.basename(self.root)
self.set_title(_('Ignore filter for ') + hglib.toutf(base))
self.set_default_size(630, 400)
self.notify_func = None
mainvbox = gtk.VBox()
hbox = gtk.HBox()
lbl = gtk.Label(_('Glob:'))
lbl.set_property('width-chars', 9)
lbl.set_alignment(1.0, 0.5)
hbox.pack_start(lbl, False, False, 4)
glob_entry = gtk.Entry()
hbox.pack_start(glob_entry, True, True, 4)
glob_button = gtk.Button(_('Add'))
hbox.pack_start(glob_button, False, False, 4)
glob_button.connect('clicked', self.add_glob, glob_entry)
glob_entry.connect('activate', self.add_glob, glob_entry)
glob_entry.set_text(hglib.toutf(fileglob))
self.glob_entry = glob_entry
mainvbox.pack_start(hbox, False, False)
hbox = gtk.HBox()
lbl = gtk.Label(_('Regexp:'))
lbl.set_property('width-chars', 9)
lbl.set_alignment(1.0, 0.5)
hbox.pack_start(lbl, False, False, 4)
regexp_entry = gtk.Entry()
hbox.pack_start(regexp_entry, True, True, 4)
regexp_button = gtk.Button(_('Add'))
hbox.pack_start(regexp_button, False, False, 4)
regexp_button.connect('clicked', self.add_regexp, regexp_entry)
regexp_entry.connect('activate', self.add_regexp, regexp_entry)
mainvbox.pack_start(hbox, False, False)
mainvbox.set_border_width(2)
try: repo = hg.repository(ui.ui(), path=self.root)
except: self.destroy()
ignorefiles = [repo.wjoin('.hgignore')]
for name, value in repo.ui.configitems('ui'):
if name == 'ignore' or name.startswith('ignore.'):
ignorefiles.append(os.path.expanduser(value))
if len(ignorefiles) > 1:
combo = gtk.combo_box_new_text()
for f in ignorefiles:
combo.append_text(hglib.toutf(f))
combo.set_active(0)
combo.connect('changed', self.fileselect)
mainvbox.pack_start(combo, False, False, 4)
self.ignorefile = ignorefiles[0]
hbox = gtk.HBox()
frame = gtk.Frame(_('Filters'))
hbox.pack_start(frame, True, True, 4)
pattree = gtk.TreeView()
pattree.set_enable_search(False)
pattree.set_reorderable(False)
sel = pattree.get_selection()
sel.set_mode(gtk.SELECTION_SINGLE)
col = gtk.TreeViewColumn(_('Patterns'), gtk.CellRendererText(), text=0)
pattree.append_column(col)
pattree.set_headers_visible(False)
self.pattree = pattree
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scrolledwindow.set_border_width(4)
scrolledwindow.add(pattree)
vbox = gtk.VBox()
vbox.pack_start(scrolledwindow, True, True, 2)
bhbox = gtk.HBox()
remove = gtk.Button(_('Remove Selected'))
remove.connect('pressed', self.remove_pressed, sel)
remove.set_sensitive(False)
bhbox.pack_start(remove, False, False, 2)
vbox.pack_start(bhbox, False, False, 2)
vbox.set_border_width(2)
frame.add(vbox)
frame = gtk.Frame(_('Unknown Files'))
hbox.pack_start(frame, True, True, 4)
unknowntree = gtk.TreeView()
unknowntree.set_search_equal_func(self.unknown_search)
col = gtk.TreeViewColumn(_('Files'), gtk.CellRendererText(), text=0)
unknowntree.append_column(col)
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scrolledwindow.set_border_width(4)
scrolledwindow.add(unknowntree)
model = gtk.ListStore(str, str)
unknowntree.set_model(model)
unknowntree.set_headers_visible(False)
self.unkmodel = model
vbox = gtk.VBox()
vbox.pack_start(scrolledwindow, True, True, 2)
bhbox = gtk.HBox()
refresh = gtk.Button(_('Refresh'))
refresh.connect('pressed', self.refresh_clicked, sel)
self.connect('thg-refresh', self.thgrefresh)
bhbox.pack_start(refresh, False, False, 2)
vbox.pack_start(bhbox, False, False, 2)
vbox.set_border_width(2)
frame.add(vbox)
mainvbox.pack_start(hbox, True, True)
self.add(mainvbox)
glob_entry.grab_focus()
pattree.get_selection().connect('changed', self.pattree_rowchanged, remove)
unknowntree.get_selection().connect('changed', self.unknown_rowchanged)
gobject.idle_add(self.refresh)
def fileselect(self, combo):
'select another ignore file'
self.ignorefile = hglib.fromutf(combo.get_active_text())
self.refresh()
def unknown_search(self, model, column, key, iter):
'case insensitive filename search'
key = key.lower()
if key in model.get_value(iter, 0).lower():
return False
return True
def remove_pressed(self, widget, selection):
model, rows = selection.get_selected_rows()
del model[rows[0]]
del self.ignorelines[rows[0][0]]
self.write_ignore_lines()
self.refresh()
def pattree_rowchanged(self, sel, remove):
model, ppaths = sel.get_selected()
sensitive = ppaths and True or False
remove.set_sensitive(sensitive)
def unknown_rowchanged(self, sel):
model, upaths = sel.get_selected()
if not upaths:
return
self.glob_entry.set_text(model[upaths][0])
def add_glob(self, widget, glob_entry):
newglob = hglib.fromutf(glob_entry.get_text())
if newglob == '':
return
newglob = 'glob:' + newglob
try:
match.match(self.root, '', [], [newglob])
except util.Abort, inst:
gdialog.Prompt(_('Invalid glob expression'), str(inst),
self).run()
return
self.ignorelines.append(newglob)
self.write_ignore_lines()
glob_entry.set_text('')
self.refresh()
def add_regexp(self, widget, regexp_entry):
newregexp = hglib.fromutf(regexp_entry.get_text())
if newregexp == '':
return
try:
match.match(self.root, '', [], ['relre:' + newregexp])
re.compile(newregexp)
except (util.Abort, re.error), inst:
gdialog.Prompt(_('Invalid regexp expression'), str(inst),
self).run()
return
self.ignorelines.append('relre:' + newregexp)
self.write_ignore_lines()
regexp_entry.set_text('')
self.refresh()
def thgrefresh(self, window):
self.refresh()
def refresh_clicked(self, togglebutton, data=None):
self.refresh()
def set_notify_func(self, func):
self.notify_func = func
def refresh(self):
try: repo = hg.repository(ui.ui(), path=self.root)
except: self.destroy()
matcher = match.always(repo.root, repo.root)
changes = repo.dirstate.status(matcher, ignored=False, clean=False,
unknown=True)
(lookup, modified, added, removed,
deleted, unknown, ignored, clean) = changes
self.unkmodel.clear()
for u in unknown:
self.unkmodel.append([hglib.toutf(u), u])
try:
l = open(self.ignorefile, 'rb').readlines()
self.doseoln = l[0].endswith('\r\n')
except (IOError, ValueError, IndexError):
self.doseoln = os.name == 'nt'
l = []
model = gtk.ListStore(str)
self.ignorelines = []
for line in l:
model.append([hglib.toutf(line.strip())])
self.ignorelines.append(line.strip())
self.pattree.set_model(model)
self.repo = repo
def write_ignore_lines(self):
if self.doseoln:
out = [line + '\r\n' for line in self.ignorelines]
else:
out = [line + '\n' for line in self.ignorelines]
try:
f = open(self.ignorefile, 'wb')
f.writelines(out)
f.close()
except IOError:
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 = []
return HgIgnoreDialog(*pats)
|
|
@@ -1,8 +1,9 @@ + # hginit.py - TortoiseHg dialog to initialize a repo
#
-# TortoiseHg dialog to initialize a repo
+# Copyright 2008 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,10 +1,11 @@ - # shelve.py
+# hgshelve.py - TortoiseHg dialog to initialize a repo
#
# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
# Copyright 2007 TK Soh <teekaysoh@gmailcom>
+# Copyright 2009 Steve Borho <steve@borho.org>
#
-# This software may be used and distributed according to the terms of
-# the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
'''interactive change selection to set aside that may be restored later'''
|
||
|
@@ -1,8 +1,9 @@ + # hgthread.py - Gtk UI class TortoiseHg
#
-# Gtk UI class TortoiseHg
+# Copyright 2009 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import Queue
|
||
|
@@ -1,7 +1,10 @@ - # front-end script for TortoiseHg dialogs
+# hgtk.py - front-end script for TortoiseHg dialogs
#
-# Copyright (C) 2008-9 Steve Borho <steve@borho.org>
-# Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>
+# Copyright 2008 Steve Borho <steve@borho.org>
+# Copyright 2008 TK Soh <teekaysoh@gmail.com>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
shortlicense = '''
Copyright (C) 2009 Steve Borho <steve@borho.org>.
|
||
|
@@ -1,9 +1,10 @@ - #
# history.py - Changelog dialog for TortoiseHg
#
# Copyright 2007 Brad Schick, brad at gmail . com
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2008 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
@@ -841,8 +842,5 @@ 'date':None, 'only_merges':None, 'prune':[], 'git':False,
'verbose':False, 'include':[], 'exclude':[]
}
- root = paths.find_root()
- canonpats = []
- for f in pats:
- canonpats.append(util.canonpath(root, os.getcwd(), f))
- return GLog(ui, None, None, canonpats, cmdoptions)
+ pats = hglib.canonpaths(pats)
+ return GLog(ui, None, None, pats, cmdoptions)
|
||
|
@@ -1,8 +1,10 @@ - #
# logfilter.py - TortoiseHg's dialog for defining log filter criteria
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,3 +1,10 @@ + # treemodel.py - changelog viewer data model
+#
+# Copyright 2008 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
''' Mercurial revision DAG visualization library
Implements a gtk.TreeModel which visualizes a Mercurial repository
|
||
|
@@ -1,3 +1,10 @@ + # treeview.py - changelog viewer implementation
+#
+# Copyright 2008 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
''' Mercurial revision DAG visualization library
Implements a gtk.TreeModel which visualizes a Mercurial repository
|
||
|
@@ -1,8 +1,10 @@ - #
# merge.py - TortoiseHg's dialog for merging revisions
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,9 +1,10 @@ + # recovery.py - Repository recovery dialog for TortoiseHg
#
-# Repository recovery dialog for TortoiseHg
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 Steve Borho <steve@borho.org>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,8 +1,9 @@ - #
# rename.py - TortoiseHg's dialogs for handling renames
#
-# Copyright (C) 2009 Steve Borho <steve@borho.org>
+# Copyright 2009 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import sys
import gtk
|
||
|
@@ -1,9 +1,10 @@ + # serve.py - TortoiseHg dialog to start web server
#
-# TortoiseHg dialog to start web server
+# Copyright 2007 Steve Borho <steve@borho.org>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
#
-# Copyright (C) 2007 Steve Borho <steve@borho.org>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,11 +1,11 @@ - #
# status.py - status dialog for TortoiseHg
#
# Copyright 2007 Brad Schick, brad at gmail . com
-# Copyright (C) 2007-8 TK Soh <teekaysoh@gmail.com>
-# Copyright (C) 2008-9 Steve Borho <steve@borho.org>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2008 Steve Borho <steve@borho.org>
#
-
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import cStringIO
|
||
|
@@ -1,9 +1,10 @@ + # synch.py - Repository synchronization dialog for TortoiseHg
#
-# Repository synchronization dialog for TortoiseHg
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 Steve Borho <steve@borho.org>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
|
||
|
@@ -1,8 +1,10 @@ + # tagadd.py - TortoiseHg dialog to add tag
#
-# TortoiseHg dialog to add tag
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,8 +1,9 @@ - #
# taskbarui.py - User interface for the TortoiseHg taskbar app
#
-# Copyright (C) 2009 Steve Borho <steve@borho.org>
+# Copyright 2009 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,9 +1,9 @@ - #_
-# Configuration dialog for TortoiseHg and Mercurial
+# thgconfig.py - Configuration dialog for TortoiseHg and Mercurial
#
-# Copyright (C) 2008-9 Steve Borho <steve@borho.org>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import os
|
||
|
@@ -1,10 +1,11 @@ - #
# thgshelve.py - commit dialog for TortoiseHg
#
# Copyright 2007 Brad Schick, brad at gmail . com
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-# Copyright (C) 2009 Steve Borho <steve@borho.org>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,8 +1,9 @@ - #
# thgstatus.py - update TortoiseHg status cache
#
-# Copyright (C) 2009 Adrian Buehlmann
+# Copyright 2009 Adrian Buehlmann
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
'''update TortoiseHg status cache'''
|
||
|
@@ -1,8 +1,10 @@ - #
# update.py - TortoiseHg's dialog for updating repo
#
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2007 Steve Borho <steve@borho.org>
#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import gtk
|
||
|
@@ -1,11 +1,9 @@ # visdiff.py - launch external visual diff tools
#
-# Copyright 2009 Steve Borho
+# Copyright 2009 Steve Borho <steve@borho.org>
#
-# Based on extdiff extension for Mercurial
-#
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gtk
import gobject
@@ -276,8 +274,4 @@ return tools
def run(ui, *pats, **opts):
- root = paths.find_root()
- canonpats = []
- for f in pats:
- canonpats.append(util.canonpath(root, os.getcwd(), f))
- return FileSelectionDialog(canonpats, opts)
+ return FileSelectionDialog(hglib.canonpaths(pats), opts)
|
||
|
@@ -1,3 +1,10 @@ + # cachethg.py - overlay/status cache
+#
+# Copyright 2008 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
import os
import sys
|
||
|
@@ -1,3 +1,10 @@ + # debugthg.py - debugging library for TortoiseHg shell extensions
+#
+# Copyright 2008 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
debugging = ''
try:
import _winreg
|
||
|
@@ -1,10 +1,9 @@ - """
-hglib.py
- Copyright (C) 2007 Steve Borho <steve@borho.org>
-
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
-"""
+# hglib.py - Mercurial API wrappers for TortoiseHg
+#
+# Copyright 2007 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import sys
@@ -113,6 +112,25 @@ if 'mq' in repo.__dict__: #do not create if it does not exist
repo.mq.invalidate()
+def canonpaths(list):
+ 'Get canonical paths (relative to root) for list of files'
+ canonpats = []
+ cwd = os.getcwd()
+ root = paths.find_root(cwd)
+ for f in list:
+ try:
+ canonpats.append(util.canonpath(root, cwd, f))
+ except util.Abort:
+ # Attempt to resolve case folding conflicts.
+ fu = f.upper()
+ cwdu = cwd.upper()
+ if fu.startswith(cwdu):
+ canonpats.append(util.canonpath(root, cwd, f[len(cwd+os.sep):]))
+ else:
+ # May already be canonical
+ canonpats.append(f)
+ return canonpats
+
def hgcmd_toq(path, q, *args):
'''
Run an hg command in a background thread, pipe all output to a Queue
|
||
|
@@ -1,10 +1,9 @@ - """
-i18n.py
- Copyright (C) 2009 Steve Borho <steve@borho.org>
-
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
-"""
+# i18n.py - TortoiseHg internationalization code
+#
+# Copyright 2009 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import gettext, sys
from gettext import gettext as _
|
||
|
@@ -1,7 +1,9 @@ - # Published under the GNU GPL, v2 or later.
-# Copyright (C) 2007 Jelmer Vernooij <jelmer@samba.org>
-# Copyright (C) 2007 Henry Ludemann <misc@hl.id.au>
-# Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
+# menuthg.py - TortoiseHg shell extension menu
+#
+# Copyright 2009 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
|
||
|
@@ -1,10 +1,9 @@ - """
-paths.py
- Copyright (C) 2009 Steve Borho <steve@borho.org>
-
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
-"""
+# paths.py - TortoiseHg path utilities
+#
+# Copyright 2009 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
try:
from config import icon_path, bin_path, license_path, locale_path
|
||
|
@@ -1,10 +1,10 @@ - """
-settings.py - TortoiseHg dialog settings library
- Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
-"""
+# settings.py - TortoiseHg dialog settings library
+#
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2009 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import cPickle
|
||
|
@@ -1,10 +1,10 @@ - """
-shlib.py - TortoiseHg shell utilities
- Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>
-
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
-"""
+# shlib.py - TortoiseHg shell utilities
+#
+# Copyright 2007 TK Soh <teekaysoh@gmail.com>
+# Copyright 2008 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import os
import sys
|
||
|
@@ -1,6 +1,9 @@ # Interuptible threads
#
# http://sebulba.wikispaces.com/recipe+thread2
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
import threading
import inspect
|
||
|
@@ -1,10 +1,9 @@ - """
-version.py - TortoiseHg version
- Copyright (C) 2009 Steve Borho <steve@borho.org>
-
-This software may be used and distributed according to the terms
-of the GNU General Public License, incorporated herein by reference.
-"""
+# version.py - TortoiseHg version
+#
+# Copyright 2009 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
from thgutil.i18n import _
|
||
Add a tag
Loading...