History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset e029f53859d8 …

Parents 429f63e37356 …

Parents c55f3b963ead …

by Steve Borho Jul 20 09 at 4:44 AM

Changes to 46 files · Browse files at e029f53859d8 Showing diff from parent 429f63e37356 c55f3b963ead Diff from another changeset...

Change 1 of 1 Show Changes Only Show Entire File Loading... MANIFEST.in Stacked
3 4 5	3 4 5 6	@@ -3,3 +3,4 @@ `include contrib/nautilus-thg.py` `include COPYING.txt ReleaseNotes.txt` `recursive-include locale .mo`+`recursive-include i18n .po`

Change 1 of 1 Show Changes Only Show Entire File Loading... contrib/nautilus-thg.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/about.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/backout.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122	-`#` `# 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` `import pango` `from mercurial import hg, ui` `from thgutil.i18n import _` `from thgutil import hglib, paths` `from hggtk import gtklib, hgcmd` `class BackoutDialog(gtk.Window):` `""" Backout effect of a changeset """` `def __init__(self, rev=None):` `""" Initialize the Dialog """` `gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)` `gtklib.set_tortoise_keys(self)` `self.set_title(_('Backout changeset - ') + rev)` `self.set_default_size(600, 400)` `self.notify_func = None` `try:` `repo = hg.repository(ui.ui(), path=paths.find_root())` `except hglib.RepoError:` `gobject.idle_add(self.destroy)` `return` `vbox = gtk.VBox()` `self.add(vbox)` `frame = gtk.Frame(_('Changeset Description'))` `lbl = gtk.Label()` `desc = self.revdesc(repo, rev)` `lbl.set_markup(desc)` `lbl.set_alignment(0, 0)` `frame.add(lbl)` `frame.set_border_width(5)` `vbox.pack_start(frame, False, False, 2)` `self.logview = gtk.TextView(buffer=None)` `self.logview.set_editable(True)` `self.logview.modify_font(pango.FontDescription('Monospace'))` `buf = self.logview.get_buffer()` `buf.set_text(_('Backed out changeset: ') + rev)` `scrolledwindow = gtk.ScrolledWindow()` `scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)` `scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)` `scrolledwindow.add(self.logview)` `scrolledwindow.set_border_width(4)` `frame = gtk.Frame(_('Backout commit message'))` `frame.set_border_width(4)` `frame.add(scrolledwindow)` `self.tips = gtk.Tooltips()` `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)` `accelgroup = gtk.AccelGroup()` `self.add_accel_group(accelgroup)` `mod = gtklib.get_thg_modifier()` `hbbox = gtk.HButtonBox()` `hbbox.set_layout(gtk.BUTTONBOX_END)` `vbox.pack_start(hbbox, False, False, 2)` `close = gtk.Button(_('Close'))` `close.connect('clicked', lambda x: self.destroy())` `key, modifier = gtk.accelerator_parse('Escape')` `close.add_accelerator('clicked', accelgroup, key, 0,` `gtk.ACCEL_VISIBLE)` `hbbox.add(close)` `backout = gtk.Button(_('Backout'))` `key, modifier = gtk.accelerator_parse(mod+'Return')` `backout.add_accelerator('clicked', accelgroup, key, modifier,` `gtk.ACCEL_VISIBLE)` `hbbox.add(backout)` `backout.grab_focus()` `backout.connect('clicked', self.backout, buf, rev)` `def revdesc(self, repo, revid):` `ctx = repo[revid]` `revstr = str(ctx.rev())` `summary = ctx.description().replace('\0', '')` `summary = summary.split('\n')[0]` `escape = gtklib.markup_escape_text` `desc = '<b>' + hglib.fromutf(_('rev')) + '</b>\t\t: %s\n' % escape(revstr)` `desc += '<b>' + hglib.fromutf(_('summary')) + '</b>\t: %s\n' % escape(summary[:80])` `desc += '<b>' + hglib.fromutf(_('user')) + '</b>\t\t: %s\n' % escape(ctx.user())` `desc += '<b>' + hglib.fromutf(_('date')) + '</b>\t\t: %s\n' % escape(hglib.displaytime(ctx.date()))` `node = repo.lookup(revid)` `tags = repo.nodetags(node)` `desc += '<b>' + hglib.fromutf(_('branch')) + '</b>\t: ' + escape(ctx.branch())` `if tags:` `desc += '\n<b>' + hglib.fromutf(_('tags')) + '</b>\t\t: ' + escape(', '.join(tags))` `return hglib.toutf(desc)` `def set_notify_func(self, func, *args):` `self.notify_func = func` `self.notify_args = args` `def backout(self, button, buf, revstr):` `start, end = buf.get_bounds()` `msg = buf.get_text(start, end)` `cmdline = ['hg', 'backout', '--rev', revstr, '--message', hglib.fromutf(msg)]` `dlg = hgcmd.CmdDialog(cmdline)` `dlg.show_all()` `dlg.run()` `dlg.hide()` `if dlg.returncode == 0:` `if self.notify_func:` `self.notify_func(self.notify_args)` `self.destroy()`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/bugreport.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/changeset.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/clone.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/commit.py Stacked
1 2 3 4 5 6 7 8 9 10 353 354 355 356 357 358 359 360 361 362	1 2 3 4 5 6 7 8 9 10 11 354 355 356 357 358 359 360 361 362 363 364	@@ -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):`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/datamine.py Stacked
1 2 3 4 5 6 7	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/gdialog.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/gtklib.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/guess.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgcmd.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgemail.py Stacked
1 2 3 4 5 6 7 8 9	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgignore.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -1,8 +1,9 @@ -`#` `# 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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hginit.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgshelve.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9 10 11	@@ -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'''`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgthread.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgtk.py Stacked
1 2 3 4 5 6 7	1 2 3 4 5 6 7 8 9 10	@@ -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>.`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/history.py Stacked
1 2 3 4 5 6 7 8 9 841 842 843 844 845 846 847 848	1 2 3 4 5 6 7 8 9 10 842 843 844 845 846	@@ -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)`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/logfilter.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/logview/treemodel.py Stacked
1 2 3	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/logview/treeview.py Stacked
1 2 3	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/merge.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/recovery.py Stacked
1 2 3 4 5 6 7 8 9	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/rename.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/serve.py Stacked
1 2 3 4 5 6 7 8 9	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/status.py Stacked
1 2 3 4 5 6 7 8 9 10 11	1 2 3 4 5 6 7 8 9 10 11	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/synch.py Stacked
1 2 3 4 5 6 7 8 9	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/tagadd.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/taskbarui.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/thgconfig.py Stacked
1 2 3 4 5 6 7 8 9	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/thgshelve.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9 10 11	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/thgstatus.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9	@@ -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'''`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/update.py Stacked
1 2 3 4 5 6 7 8	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/visdiff.py Stacked
1 2 3 4 5 6 7 8 9 10 11 276 277 278 279 280 281 282 283	1 2 3 4 5 6 7 8 9 274 275 276 277	@@ -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)`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/cachethg.py Stacked
1 2 3	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/debugthg.py Stacked
1 2 3	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 2 Show Changes Only Show Entire File Loading... thgutil/hglib.py Stacked
1 2 3 4 5 6 7 8 9 10 113 114 115 116 117 118	1 2 3 4 5 6 7 8 9 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/i18n.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9	@@ -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 _`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/menuthg.py Stacked
1 2 3 4 5 6 7	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/paths.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/settings.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/shlib.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9 10	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/thread2.py Stacked
1 2 3 4 5 6	1 2 3 4 5 6 7 8 9	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... thgutil/version.py Stacked
1 2 3 4 5 6 7 8 9 10	1 2 3 4 5 6 7 8 9	@@ -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 _`

Diff Options

merge with stable

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

merge with stable

Diff to e029f53859d8

Attach a Trello Card

Add a tag

Your session has expired