Update to 3.5:

TortoiseHg 3.5

TortoiseHg 3.5 is a major feature release, including the new
Mercurial 3.5 major release and a small number of bug-fix commits.

Bugs Fixes

    filectxactions: open save dialog where repository file exists (fixes #3445)
    grep: split inc/exc patterns on Comma instead of Comma+Space (fixes #836)
    lfprompt: suppress exception on getting size of inaccessible file (fixes #4240)
    qtlib: drop support for old-style icon lookup
    qtlib: load icons from filesystem unless frozen
    reporegistry: look for parent repo in model on removeSubrepo (fixes #4214)
    repowatcher: check mtime of bookmarks file (hg 3.5)
    repowatcher: detect rollback of repository states (fixes #4193)
    sync: sort bookmarks in target combobox alphabetically (fixes #4222)

Improvements

    names: experimental support for displaying any name space
    repoview: add an action to resize columns ignoring settings
    repowidget: add menu to filter ancestors, by author or branch (closes #1455)
    sync: allow to select user certificates by file dialog
    sync: open the save dialog when Enter is pressed in URL field
    workbench: add icon to Web Server menu item (closes #4211)

Installer

    update tsvn doc-diff scripts (fixes #3404, #4244)
    setup: build Qt resources only for py2exe target
    setup: do not pack unnecessary files to icon resource
    setup: generate config module according to installation options (refs #2178)
    setup: generate list of .mo files from existing .po files (fixes #2431)
    setup: move library.zip and dlls to lib/ directory (refs #4164, #4194)
    setup: respect prefix where nautilus extension will be installed (fixes #2178)

4 files changed, 40 insertions, 55 deletions

diff --git a/devel/py-tortoisehg/Makefile b/devel/py-tortoisehg/Makefile
index 34993566beb..5ff27e7a930 100644
--- a/devel/py-tortoisehg/Makefile
+++ b/devel/py-tortoisehg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/07/18 21:56:49 nros Exp $
+# $NetBSD: Makefile,v 1.18 2015/08/14 18:00:56 wiz Exp $
 
-DISTNAME=		tortoisehg-3.4.2
+DISTNAME=		tortoisehg-3.5
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
 MASTER_SITES=		http://bitbucket.org/tortoisehg/targz/downloads/
diff --git a/devel/py-tortoisehg/PLIST b/devel/py-tortoisehg/PLIST
index dd55ed7ab49..6f01f7fb0db 100644
--- a/devel/py-tortoisehg/PLIST
+++ b/devel/py-tortoisehg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/19 16:35:07 nros Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/08/14 18:00:56 wiz Exp $
 bin/thg
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/tortoisehg/__init__.py
@@ -112,9 +112,6 @@ ${PYSITELIB}/tortoisehg/hgqt/htmldelegate.pyo
 ${PYSITELIB}/tortoisehg/hgqt/htmlui.py
 ${PYSITELIB}/tortoisehg/hgqt/htmlui.pyc
 ${PYSITELIB}/tortoisehg/hgqt/htmlui.pyo
-${PYSITELIB}/tortoisehg/hgqt/icons_rc.py
-${PYSITELIB}/tortoisehg/hgqt/icons_rc.pyc
-${PYSITELIB}/tortoisehg/hgqt/icons_rc.pyo
 ${PYSITELIB}/tortoisehg/hgqt/infobar.py
 ${PYSITELIB}/tortoisehg/hgqt/infobar.pyc
 ${PYSITELIB}/tortoisehg/hgqt/infobar.pyo
@@ -518,26 +515,30 @@ share/locale/tr/LC_MESSAGES/tortoisehg.mo
 share/locale/uk/LC_MESSAGES/tortoisehg.mo
 share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
 share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
+share/pixmaps/tortoisehg/icons/16x16/actions/hg-add.png
+share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
+share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
 share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
 share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
 share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
 share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
+share/pixmaps/tortoisehg/icons/16x16/status/hg-removed.png
 share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-pull.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-add.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-branch.png
 share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
+share/pixmaps/tortoisehg/icons/32x32/actions/thg-repoconfig.png
+share/pixmaps/tortoisehg/icons/32x32/actions/thg-userconfig.png
+share/pixmaps/tortoisehg/icons/32x32/status/hg-removed.png
 share/pixmaps/tortoisehg/icons/README.txt
 share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
-share/pixmaps/tortoisehg/icons/branch.ico
 share/pixmaps/tortoisehg/icons/detect_rename.ico
 share/pixmaps/tortoisehg/icons/expander-close.png
 share/pixmaps/tortoisehg/icons/expander-open.png
-share/pixmaps/tortoisehg/icons/fallback.svg
-share/pixmaps/tortoisehg/icons/fileadd.ico
-share/pixmaps/tortoisehg/icons/filedelete.ico
-share/pixmaps/tortoisehg/icons/filemodify.ico
 share/pixmaps/tortoisehg/icons/general.ico
 share/pixmaps/tortoisehg/icons/hg.ico
 share/pixmaps/tortoisehg/icons/hgB.ico
@@ -550,16 +551,9 @@ share/pixmaps/tortoisehg/icons/menuclone.ico
 share/pixmaps/tortoisehg/icons/menucommit.ico
 share/pixmaps/tortoisehg/icons/menucreaterepos.ico
 share/pixmaps/tortoisehg/icons/menudelete.ico
-share/pixmaps/tortoisehg/icons/menudiff.ico
-share/pixmaps/tortoisehg/icons/menuhelp.ico
-share/pixmaps/tortoisehg/icons/menuimport.ico
 share/pixmaps/tortoisehg/icons/menulog.ico
-share/pixmaps/tortoisehg/icons/menumerge.ico
-share/pixmaps/tortoisehg/icons/menupatch.ico
 share/pixmaps/tortoisehg/icons/menurepobrowse.ico
 share/pixmaps/tortoisehg/icons/menurevert.ico
-share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
-share/pixmaps/tortoisehg/icons/menusettings.ico
 share/pixmaps/tortoisehg/icons/menushowchanged.ico
 share/pixmaps/tortoisehg/icons/menusynch.ico
 share/pixmaps/tortoisehg/icons/proxy.ico
@@ -617,7 +611,10 @@ share/pixmaps/tortoisehg/icons/scalable/actions/hg-recover.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-serve.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-shelve.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg
@@ -635,6 +632,8 @@ share/pixmaps/tortoisehg/icons/scalable/actions/status-check.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-guess.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-ignore.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg
@@ -662,15 +661,17 @@ share/pixmaps/tortoisehg/icons/scalable/actions/view-refresh.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
+share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg
-share/pixmaps/tortoisehg/icons/scalable/apps/thg-logo.svg
+share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-modified.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
@@ -687,23 +688,6 @@ share/pixmaps/tortoisehg/icons/scalable/status/thg-warning.svg
 share/pixmaps/tortoisehg/icons/settings_repo.ico
 share/pixmaps/tortoisehg/icons/settings_user.ico
 share/pixmaps/tortoisehg/icons/shelve.ico
-share/pixmaps/tortoisehg/icons/svg/add.svg
-share/pixmaps/tortoisehg/icons/svg/checkout.svg
-share/pixmaps/tortoisehg/icons/svg/clone.svg
-share/pixmaps/tortoisehg/icons/svg/commit.svg
-share/pixmaps/tortoisehg/icons/svg/detect_rename.svg
-share/pixmaps/tortoisehg/icons/svg/ignore.svg
-share/pixmaps/tortoisehg/icons/svg/init.svg
-share/pixmaps/tortoisehg/icons/svg/log.svg
-share/pixmaps/tortoisehg/icons/svg/merge.svg
-share/pixmaps/tortoisehg/icons/svg/proxy.svg
-share/pixmaps/tortoisehg/icons/svg/recovery.svg
-share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
-share/pixmaps/tortoisehg/icons/svg/remove.svg
-share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
-share/pixmaps/tortoisehg/icons/svg/shelve.svg
-share/pixmaps/tortoisehg/icons/svg/sync.svg
-share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
 share/pixmaps/tortoisehg/icons/thg_logo.ico
 share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
 share/tortoisehg/mergetools.rc
diff --git a/devel/py-tortoisehg/distinfo b/devel/py-tortoisehg/distinfo
index 8f52ee1c306..692fa0696b9 100644
--- a/devel/py-tortoisehg/distinfo
+++ b/devel/py-tortoisehg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2015/07/18 21:56:49 nros Exp $
+$NetBSD: distinfo,v 1.16 2015/08/14 18:00:56 wiz Exp $
 
-SHA1 (tortoisehg-3.4.2.tar.gz) = 115fad204916fb75eb77f423565991c1e403281c
-RMD160 (tortoisehg-3.4.2.tar.gz) = ad57ee9cb289e21b50d43e35fe293c5353eb5c5e
-Size (tortoisehg-3.4.2.tar.gz) = 8205349 bytes
-SHA1 (patch-setup.py) = 2fb156031c85bb24404e36d2a360177a77d45a47
+SHA1 (tortoisehg-3.5.tar.gz) = e9da2fd592e1d57f6b796545622e17e9696d4a28
+RMD160 (tortoisehg-3.5.tar.gz) = 4c8ec1c9266c04a9ae33d18bb869c5a3ad72e123
+Size (tortoisehg-3.5.tar.gz) = 7395688 bytes
+SHA1 (patch-setup.py) = 3f053f9935aacc25c271a3a7658918998058694a
 SHA1 (patch-tortoisehg_hgqt_qtlib.py) = 7c66aaf4472ac39f158e4c393bf03afafbd707d9
 SHA1 (patch-tortoisehg_util_paths.py) = 0eea97a668b27d1ee8293bc2f2b6f6692a18b365
diff --git a/devel/py-tortoisehg/patches/patch-setup.py b/devel/py-tortoisehg/patches/patch-setup.py
index 08befd6d7e9..7a95201f13f 100644
--- a/devel/py-tortoisehg/patches/patch-setup.py
+++ b/devel/py-tortoisehg/patches/patch-setup.py
@@ -1,26 +1,27 @@
-$NetBSD: patch-setup.py,v 1.1 2014/07/05 15:33:03 wiz Exp $
+$NetBSD: patch-setup.py,v 1.2 2015/08/14 18:00:56 wiz Exp $
 
 * nautilus-python is not available in pkgsrc so don't install
   the nautilus extension.
 * Install html documention, desktop file and license file.
 
---- setup.py.orig	2013-11-16 07:12:03.000000000 +0000
+--- setup.py.orig	2015-08-06 01:30:23.000000000 +0000
 +++ setup.py
-@@ -11,6 +11,7 @@ import time
- import sys
+@@ -11,6 +11,7 @@ import sys
  import os
  import shutil
-+import string
- import subprocess
  import cgi
++import string
  import tempfile
-@@ -504,8 +505,13 @@ def setup_posix():
-     _data_files += [(os.path.join('share', root),
-         [os.path.join(root, file_) for file_ in files])
-         for root, dirs, files in os.walk('locale')]
--    _data_files += [('/usr/share/nautilus-python/extensions/',
+ import re
+ import tarfile
+@@ -569,8 +570,14 @@ def setup_posix():
+                             [os.path.join(root, f) for f in files]))
+     _data_files.extend((os.path.join('share', modir), [mofile])
+                        for pofile, modir, mofile in _walklocales())
+-    _data_files += [('share/nautilus-python/extensions',
 -                     ['contrib/nautilus-thg.py'])]
-+    _data_files += [(os.path.join('share/doc/tortoisehg', 
++
++    _data_files += [(os.path.join('share/doc/tortoisehg',
 +                                  string.replace(root,'doc/build/html','html',1)),
 +        [os.path.join(root, file_) for file_ in files])
 +        for root, dirs, files in os.walk('doc/build/html')]
@@ -28,5 +29,5 @@ $NetBSD: patch-setup.py,v 1.1 2014/07/05 15:33:03 wiz Exp $
 +    _data_files += [('share/applications', ['contrib/thg.desktop'])]
 +    _data_files += [('share/tortoisehg', ['contrib/mergetools.rc'])]
  
-     # Create a config.py.  Distributions will need to supply their own
-     cfgfile = os.path.join('tortoisehg', 'util', 'config.py')
+     return _scripts, _packages, _data_files, _extra
+