diff --git a/.gitignore b/.gitignore
index 486ec80..e7c50d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,40 +1,75 @@
 *~
+.pycache
 __pycache__
 .directory
-#
-.cache/
+
+du.log
+nogit/
+__TRASH__/
+review.json
+
 CodeReview.egg-info/
-CodeReview/PatienceDiff/_patiencediff_c.cpython-36m-x86_64-linux-gnu.so
 MANIFEST
 build/
 dist/
+
 doc/sphinx/build/
 doc/sphinx/source/api/
-#
-bzr-backup/
-trash/
-#
-CodeReview/TextDistance/buggy.c
-DELETED-SPHINX-SOURCE
-du.log
-gui-prototypes/
-liblevenshtein_distance.so
-notes/
-profile-pyqgit.sh
-setup.py-backup0
-setup_data.py-backup0
-share/icons/copy-icons.sh
-test-failure.txt
-test-repository/
-test/Model.py
-test/github3-test.py
-test/init-stage-test-repo.sh
-test/stage-test
-test/swalign-fabrice/
-test/swalign-mbreese/
-test/test-diff.py
-test/test-levenshtein-distance.py
-test/test-repo/
-test/token.txt
-tools/rsync-vps.sh
-tools/upload-www
+
+src/CodeReview/GitHub/code/
+src/CodeReview/QmlApplication/rcc/CodeReviewRessource.py
+src/CodeReview/QmlApplication/rcc/code-review.rcc
+src/CodeReview/TextDistance/buggy.c
+src/CodeReview/ovh.txt
+src/CodeReview/share/icons/copy-icons.sh
+
+src/CodeReview/PatienceDiff/_patiencediff_c.cpython-314-x86_64-linux-gnu.so
+src/CodeReview/TextDistance/levenshtein_distance_c.cpython-314-x86_64-linux-gnu.so
+src/code_review.egg-info/
+
+doc/IDEA.md
+doc/git-gui.md
+doc/gitkraken/
+
+old/RELEASE-TEST.rst
+old/__BUGS__/
+old/gitkraken-id.txt
+old/gui-prototypes/qlog.ui
+old/gui-prototypes/side-view/side-view_ui.py
+old/notes/bzr-qlog1.png
+old/notes/codereview.png
+old/notes/diffview-link.txt
+old/notes/git-man-pages/
+old/notes/github1.png
+old/notes/github2.png
+old/notes/github3.png
+old/notes/github4.png
+old/notes/github5.png
+old/notes/github6.png
+old/notes/qbzr-qdiff.png
+old/notes/qbzr-qlog.png
+old/notes/qgit1.png
+old/notes/qgit2.png
+old/notes/qgit3.png
+old/notes/qgit4.png
+old/notes/qgit5.png
+old/notes/qgit6.png
+old/profile-pyqgit.sh
+old/test-failure.txt
+old/test-repository/bzr-repo/
+old/test-repository/git-repo/repo-branches/
+old/test-repository/git-repo/repo-twisted-branches/
+old/test-repository/git-repo/repo-two-branches/
+old/test-repository/git-repo/repo1/
+old/test/Model.py
+old/test/github3-test.py
+old/test/init-stage-test-repo.sh
+old/test/stage-test
+old/test/swalign-fabrice/
+old/test/swalign-mbreese/
+old/test/test-diff.py
+old/test/test-levenshtein-distance.py
+old/test/test-repo/
+old/test/token.txt
+old/tools/rsync-vps.sh
+old/tools/upload-www
diff --git a/CodeReview/Config/ConfigInstall.py b/CodeReview/Config/ConfigInstall.py
deleted file mode 100644
index 1cbd931..0000000
--- a/CodeReview/Config/ConfigInstall.py
+++ /dev/null
@@ -1,61 +0,0 @@
-####################################################################################################
-
-import os
-import sys
-
-####################################################################################################
-
-import CodeReview.Tools.Path as PathTools # due to Path class
-
-####################################################################################################
-
-_this_file = PathTools.to_absolute_path(__file__)
-
-class Path:
-
-    CodeReview_module_directory = PathTools.parent_directory_of(_this_file, step=2)
-    config_directory = os.path.dirname(_this_file)
-
-    ##############################################
-
-    @staticmethod
-    def share_directory():
-
-        path = os.path.dirname(Path.CodeReview_module_directory)
-        if path.startswith(sys.exec_prefix):
-            return os.path.join(sys.exec_prefix, 'share', 'CodeReview')
-        else:
-            return os.path.join(path, 'share')
-
-####################################################################################################
-
-class Logging:
-
-    default_config_file = 'logging.yml'
-    directories = (Path.config_directory,)
-
-    ##############################################
-
-    @staticmethod
-    def find(config_file):
-
-        return PathTools.find(config_file, Logging.directories)
-
-####################################################################################################
-
-class Icon:
-
-    icon_directory = os.path.join(Path.share_directory(), 'icons')
-
-    ##############################################
-
-    @staticmethod
-    def find(file_name, icon_size):
-
-        if icon_size == 'svg':
-            size_directory = icon_size
-        else:
-            size_directory = '{0}x{0}'.format(icon_size)
-
-        icon_directory = os.path.join(Icon.icon_directory, size_directory)
-        return PathTools.find(file_name, (icon_directory,))
diff --git a/CodeReview/GUI/LogBrowser/__init__.py b/CodeReview/GUI/LogBrowser/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/GUI/LogBrowser/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/CodeReview/GUI/Widgets/__init__.py b/CodeReview/GUI/Widgets/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/GUI/Widgets/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/CodeReview/GUI/__init__.py b/CodeReview/GUI/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/GUI/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/CodeReview/Logging/__init__.py b/CodeReview/Logging/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/Logging/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/CodeReview/Math/__init__.py b/CodeReview/Math/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/Math/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/CodeReview/Tools/__init__.py b/CodeReview/Tools/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/Tools/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/CodeReview/__init__.py b/CodeReview/__init__.py
deleted file mode 100644
index f523b65..0000000
--- a/CodeReview/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2015 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with this program.  If
-# not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
diff --git a/MANIFEST.in b/MANIFEST.in
index 3e5c4ba..3550c33 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,32 +1,23 @@
-include	.bzrignore
 include .gitignore
 include .pyflymakerc
 include .travis.yml
-include CHANGES.txt
 include GPL-V3.0.txt
-include LICENSE.txt
 include MANIFEST.in
 include README.html
 include README.rst
 include README.txt
-include make-release.sh
-include pylintrc.ini
 include requirements.txt
-include setenv.sh start.sh
 include setup_data.py
-include test-repository/git-repo/*.sh
-recursive-include CodeReview *.py *.yml *.c *.h *.ui Makefile.pyqt .in
-recursive-include bin
+recursive-include CodeReview *.py *.yml *.c *.h *.ui Makefile.pyqt *.png *.svg
 recursive-include doc *
 recursive-include doc/sphinx/source/_static *
 recursive-include gh-pages *
-recursive-include share *.png *.svg
 recursive-include spec *.spec *.desktop
-recursive-include tools *
 recursive-include unit-test *.py
 recursive-include unit-test/data *.txt
-prune *~ *.pyc
+prune *~
+prune *.pyc
 prune build
 prune doc/sphinx/build
-prune test-repository/bzr-repo/
-prune test-repository/git-repo/
+prune tasks
+prune QtShim
diff --git a/README.html b/README.html
index a43266f..222b9f1 100644
--- a/README.html
+++ b/README.html
@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
-<title></title>
+<meta name="generator" content="Docutils 0.16: http://docutils.sourceforge.net/" />
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -377,6 +377,8 @@
 <!-- .. _CodeReview@pypi: https://pypi.python.org/pypi/CodeReview -->
 <!-- End -->
 <!-- -*- Mode: rst -*- -->
+<!-- http://www.pygit2.org/install.html
+http://www.riverbankcomputing.com/software/pyqt/download5 -->
 <div class="section" id="codereview">
 <h1>CodeReview</h1>
 <p><a class="reference external" href="https://pypi.python.org/pypi/CodeReview"><object data="https://img.shields.io/pypi/l/CodeReview.svg" type="image/svg+xml">CodeReview license</object></a>
@@ -396,6 +398,12 @@ <h2>News</h2>
 <!-- -*- Mode: rst -*- -->
 <!-- no title here -->
 </div>
+<div class="section" id="v1-1-2022-25-10">
+<h2>V1.1 2022-25-10</h2>
+<ul class="simple">
+<li>Updated install process</li>
+</ul>
+</div>
 <div class="section" id="v1-2017-12-20">
 <h2>V1 2017-12-20</h2>
 <ul class="simple">
@@ -406,14 +414,25 @@ <h2>V1 2017-12-20</h2>
 </div>
 <div class="section" id="introduction">
 <h1>Introduction</h1>
-<p>The aim of CodeReview is to provide tools for code review tasks on local Git repositories.  As
-opposite to software like <a class="reference external" href="https://www.gerritcodereview.com">Gerrit</a> for example, CodeReview is
-not designed to perform code review at a team level, but to check the stage before a commit and show
-the difference between two versions.  In particular, CodeReview fills the gap with IDEs that don't
-provide efficiently these features.</p>
+<p>I code using the venerable <a class="reference external" href="https://www.gnu.org/software/emacs">Emacs</a> editor and the extension
+<a class="reference external" href="https://magit.vc">Magit</a> which is a powerfull text-based user interface to Git.  Despite, I am
+happy with Magit for most tasks, I dislike the diff view rendering in Emacs.</p>
+<p>Thus the goal of CodeReview is to provide a more convenient tool for code review tasks on local Git
+repositories.  Unlike software like <a class="reference external" href="https://www.gerritcodereview.com">Gerrit</a>, CodeReview is not
+designed to do team-level code review, but to check the stage before a commit and show the
+difference between two versions.  In particular, CodeReview fills the gap with IDEs that don't
+provide a nice side-by-side diff view.</p>
+<p>Historically, I wrote this tool as a replacement of <strong>qbzr</strong> for Git.</p>
 <div class="section" id="how-to-use-codereview">
 <h2>How to use CodeReview ?</h2>
 <p>CodeReview provides two applications <em>pyqgit</em> and <em>diff-viewer</em>.</p>
+</div>
+<div class="section" id="disclaimer">
+<h2>Disclaimer</h2>
+<p>This tool was written 10 years ago (late 2011) and I am using it for my own needs, thus it works as is.</p>
+<p>I tried to implement a file watching feature but it is a nightmare to debug.</p>
+<p>The Qt code is now a bit out dated, but the actual diff viewer implementation would require some
+works to be ported to QML.</p>
 <!-- -*- Mode: rst -*- -->
 </div>
 </div>
@@ -442,48 +461,82 @@ <h1>Features</h1>
 </div>
 <div class="section" id="installation">
 <span id="installation-page"></span><h1>Installation</h1>
-<div class="section" id="on-fedora">
-<h2>On Fedora</h2>
-<p>RPM packages are available for the Fedora distribution on <a class="reference external" href="https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review">https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review</a></p>
-<p>Run these commands to enable the copr repository and install the last release:</p>
+<p>CodeReview is written in Python and uses the GUI framework <a class="reference external" href="https://www.riverbankcomputing.com/software/pyqt">PyQt5</a> and the Git library <a class="reference external" href="http://www.pygit2.org">pygit2</a>.
+Thus, CodeReview is operating system agnostic and should work on Linux, Windows and OSX.</p>
+<p>To install CodeReview from <a class="reference external" href="https://github.com/FabriceSalvaire/CodeReview">source code</a>, you need a working Python environment and a C compiler.</p>
+<div class="section" id="on-linux">
+<h2>On Linux</h2>
+<p>To summarise, you can easily install CodeReview on Linux with just <code>pip install CodeReview</code> but read the followings.</p>
+<p>First you need to verify that Python is installed on your distribution.</p>
+<p>If you install CodeReview from source, you will also need the GCC C compiler.</p>
+<p>You can create a <a class="reference external" href="https://docs.python.org/3/library/venv.html">Python virtual environment</a> to install CodeReview in its own container:</p>
 <pre class="code sh literal-block">
-dnf copr <span class="name builtin">enable</span> fabricesalvaire/code-review
-dnf install CodeReview
+<span class="comment single"># create the venv
+</span>python3.10 -m venv <span class="name variable">$HOME</span>/codereview
+<span class="comment single"># enter in the venv
+</span><span class="name builtin">source</span> <span class="name variable">$HOME</span>/codereview/bin/activate
 </pre>
-</div>
-<div class="section" id="from-pypi-repository">
-<h2>From PyPi Repository</h2>
-<p>CodeReview is available on <a class="reference external" href="https://pypi.python.org/pypi">PyPI</a> repository: <a class="reference external" href="https://pypi.python.org/pypi/CodeReview">https://pypi.python.org/pypi/CodeReview</a></p>
-<p>Run this command to install the last release:</p>
+<p>This is not mandatory, but it is a good practice if you don't know exactly what you are doing.
+Especially, if you don't want to spoil your distribution.</p>
+<p>Notice, you can later create a shell script to wrap the venv activation and the pyqgit command.</p>
+<p>Then install CodeReview either from <a class="reference external" href="https://pypi.python.org/pypi">PyPI</a> (official Python package repository) or from source:</p>
 <pre class="code sh literal-block">
-pip install CodeReview
+<span class="comment single"># source .tar.gz or wheel/binary from PyPI (can require a GCC C compiler)
+</span>pip install CodeReview
+
+<span class="comment single"># from Git repository (require a GCC C compiler)
+</span>pip install git+https://github.com/FabriceSalvaire/CodeReview
 </pre>
-<p>Notice, it requires Python 3 and a C compiler.</p>
-</div>
-<div class="section" id="from-source">
-<h2>From source</h2>
-<p>CodeReview source code is hosted at <a class="reference external" href="https://github.com/FabriceSalvaire/CodeReview">https://github.com/FabriceSalvaire/CodeReview</a></p>
-<p>Clone the Git repository using this command:</p>
+<p>If the <cite>pip</cite> command is not available, you must install the corresponding package of your distribution.</p>
+<p>Finally, run CodeReview to verify that the installation was successful:</p>
 <pre class="code sh literal-block">
-git clone git&#64;github.com:FabriceSalvaire/CodeReview.git
+pyqgit --help
+diff-viewer --help
+
+pyqgit git_repository_path
+diff-viewer a.txt b.txt
+
+<span class="name builtin">cd</span> git_repository_path
+pyqgit
+</pre>
+<p>Example of shell wrapper:</p>
+<pre class="code sh literal-block">
+<span class="comment hashbang">#! /usr/bin/bash
+</span><span class="name variable">PY_ENV</span><span class="operator">=</span><span class="literal string interpol">${</span><span class="name variable">HOME</span><span class="literal string interpol">}</span>/codereview
+<span class="name builtin">source</span> <span class="literal string interpol">${</span><span class="name variable">PY_ENV</span><span class="literal string interpol">}</span>/bin/activate
+<span class="name variable">CodeReviewLogLevel</span><span class="operator">=</span><span class="literal string single">'WARNING'</span> <span class="literal string interpol">${</span><span class="name variable">PY_ENV</span><span class="literal string interpol">}</span>/bin/pyqgit <span class="name variable">$1</span> <span class="punctuation">&amp;</span>
 </pre>
-<p>Then build and install CodeReview using these commands:</p>
+<p>You can also clone the repository and install it using theses commands:</p>
 <pre class="code sh literal-block">
+git clone git&#64;github.com:FabriceSalvaire/CodeReview.git
 python setup.py build
 python setup.py install
 </pre>
 </div>
+<div class="section" id="on-windows">
+<h2>On Windows</h2>
+<p><strong>Actually there is no installer available, but it is welcome.</strong></p>
+<p>You must follow the same procedure that for Linux.  However it is a bit more difficult to achieve.</p>
+<p>A suggestion is to install the <a class="reference external" href="https://www.anaconda.com/products/distribution">Anaconda Python Distribution</a> and got a working compiler.</p>
+</div>
+<div class="section" id="on-osx">
+<h2>On OSX</h2>
+<p><strong>An up to date installation procedure is welcome.</strong></p>
+<!-- On Fedora -->
+<!-- - - - - - - - - - -->
+<!--  -->
+<!-- RPM packages are available for the Fedora distribution on https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review -->
+<!--  -->
+<!-- Run these commands to enable the copr repository and install the last release: -->
+<!--  -->
+<!-- .. code-block:: sh -->
+<!--  -->
+<!-- dnf copr enable fabricesalvaire/code-review -->
+<!-- dnf install CodeReview -->
+</div>
 <div class="section" id="dependencies">
 <h2>Dependencies</h2>
-<p>CodeReview requires the following dependencies:</p>
-<ul class="simple">
-<li><a class="reference external" href="http://python.org">Python</a> 3 (at least v3.4)</li>
-<li><a class="reference external" href="http://www.pygit2.org/install.html">pygit2</a> and libgit2 see <a class="reference external" href="http://www.pygit2.org/install.html#quick-install">link</a>  for installation instruction</li>
-<li>Pygments</li>
-<li><a class="reference external" href="http://www.riverbankcomputing.com/software/pyqt/download5">PyQt5</a></li>
-<li>PyYAML</li>
-<li>A C compiler to compile a module</li>
-</ul>
+<p>CodeReview requires the dependencies listed in <a class="reference external" href="https://github.com/FabriceSalvaire/CodeReview/blob/master/requirements.txt">requirements.txt</a></p>
 </div>
 </div>
 <div class="section" id="how-to-help">
diff --git a/README.rst b/README.rst
index 9b6cd09..4b5d8f1 100644
--- a/README.rst
+++ b/README.rst
@@ -69,10 +69,14 @@
 .. _Sphinx: http://sphinx-doc.org
 
 .. |pygit2| replace:: pygit2
-.. _pygit2: http://www.pygit2.org/install.html
+.. _pygit2: http://www.pygit2.org
 
 .. |PyQt5| replace:: PyQt5
-.. _PyQt5: http://www.riverbankcomputing.com/software/pyqt/download5
+.. _PyQt5: https://www.riverbankcomputing.com/software/pyqt
+
+..
+  http://www.pygit2.org/install.html
+  http://www.riverbankcomputing.com/software/pyqt/download5
 
 ============
  CodeReview
@@ -105,6 +109,11 @@ News
 
 .. no title here
 
+V1.1 2022-25-10
+---------------
+
+- Updated install process
+   
 V1 2017-12-20
 -------------
 
@@ -116,17 +125,33 @@ V1 2017-12-20
  Introduction
 ==============
 
-The aim of CodeReview is to provide tools for code review tasks on local Git repositories.  As
-opposite to software like `Gerrit <https://www.gerritcodereview.com>`_ for example, CodeReview is
-not designed to perform code review at a team level, but to check the stage before a commit and show
-the difference between two versions.  In particular, CodeReview fills the gap with IDEs that don't
-provide efficiently these features.
+I code using the venerable `Emacs <https://www.gnu.org/software/emacs>`_ editor and the extension
+`Magit <https://magit.vc>`_ which is a powerfull text-based user interface to Git.  Despite, I am
+happy with Magit for most tasks, I dislike the diff view rendering in Emacs.
+
+Thus the goal of CodeReview is to provide a more convenient tool for code review tasks on local Git
+repositories.  Unlike software like `Gerrit <https://www.gerritcodereview.com>`_, CodeReview is not
+designed to do team-level code review, but to check the stage before a commit and show the
+difference between two versions.  In particular, CodeReview fills the gap with IDEs that don't
+provide a nice side-by-side diff view.
+
+Historically, I wrote this tool as a replacement of **qbzr** for Git.
 
 How to use CodeReview ?
 -----------------------
 
 CodeReview provides two applications *pyqgit* and *diff-viewer*.
 
+Disclaimer
+----------
+
+This tool was written 10 years ago (late 2011) and I am using it for my own needs, thus it works as is.
+
+I tried to implement a file watching feature but it is a nightmare to debug.
+
+The Qt code is now a bit out dated, but the actual diff viewer implementation would require some
+works to be ported to QML.
+
 .. -*- Mode: rst -*-
 
 ==========
@@ -156,60 +181,106 @@ Diff viewer features:
  Installation
 ==============
 
-On Fedora
----------
+CodeReview is written in Python and uses the GUI framework |PyQt5|_ and the Git library |pygit2|_.
+Thus, CodeReview is operating system agnostic and should work on Linux, Windows and OSX.
+
+To install CodeReview from `source code <https://github.com/FabriceSalvaire/CodeReview>`_, you need a working Python environment and a C compiler.
+   
+On Linux
+--------
 
-RPM packages are available for the Fedora distribution on https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review
+To summarise, you can easily install CodeReview on Linux with just :code:`pip install CodeReview` but read the followings.
 
-Run these commands to enable the copr repository and install the last release:
+First you need to verify that Python is installed on your distribution.
+
+If you install CodeReview from source, you will also need the GCC C compiler.
+
+You can create a `Python virtual environment <https://docs.python.org/3/library/venv.html>`_ to install CodeReview in its own container:
 
 .. code-block:: sh
 
-  dnf copr enable fabricesalvaire/code-review
-  dnf install CodeReview
+    # create the venv
+    python3.10 -m venv $HOME/codereview
+    # enter in the venv
+    source $HOME/codereview/bin/activate
 
-From PyPi Repository
---------------------
+This is not mandatory, but it is a good practice if you don't know exactly what you are doing.
+Especially, if you don't want to spoil your distribution.
 
-CodeReview is available on |Pypi|_ repository: |CodeReview@pypi|
+Notice, you can later create a shell script to wrap the venv activation and the pyqgit command.
 
-Run this command to install the last release:
+Then install CodeReview either from |Pypi|_ (official Python package repository) or from source:
 
 .. code-block:: sh
 
-  pip install CodeReview
+    # source .tar.gz or wheel/binary from PyPI (can require a GCC C compiler)
+    pip install CodeReview
 
-Notice, it requires Python 3 and a C compiler.
+    # from Git repository (require a GCC C compiler)
+    pip install git+https://github.com/FabriceSalvaire/CodeReview
 
-From source
-------------
+If the `pip` command is not available, you must install the corresponding package of your distribution.
 
-CodeReview source code is hosted at |CodeReview@github|
+Finally, run CodeReview to verify that the installation was successful:
 
-Clone the Git repository using this command:
+.. code-block:: sh
+
+    pyqgit --help
+    diff-viewer --help
+
+    pyqgit git_repository_path
+    diff-viewer a.txt b.txt
+
+    cd git_repository_path
+    pyqgit
+
+Example of shell wrapper:
 
 .. code-block:: sh
 
-  git clone git@github.com:FabriceSalvaire/CodeReview.git
+    #! /usr/bin/bash
+    PY_ENV=${HOME}/codereview
+    source ${PY_ENV}/bin/activate
+    CodeReviewLogLevel='WARNING' ${PY_ENV}/bin/pyqgit $1 &
 
-Then build and install CodeReview using these commands:
+You can also clone the repository and install it using theses commands:
 
 .. code-block:: sh
 
-  python setup.py build
-  python setup.py install
+     git clone git@github.com:FabriceSalvaire/CodeReview.git
+     python setup.py build
+     python setup.py install
+
+On Windows
+----------
+
+**Actually there is no installer available, but it is welcome.**
+
+You must follow the same procedure that for Linux.  However it is a bit more difficult to achieve.
+
+A suggestion is to install the `Anaconda Python Distribution <https://www.anaconda.com/products/distribution>`_ and got a working compiler.
+
+On OSX
+------
+
+**An up to date installation procedure is welcome.**
+
+..  On Fedora
+..  ---------
+..  
+..  RPM packages are available for the Fedora distribution on https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review
+..  
+..  Run these commands to enable the copr repository and install the last release:
+..  
+..  .. code-block:: sh
+..  
+..    dnf copr enable fabricesalvaire/code-review
+..    dnf install CodeReview
 
 Dependencies
 ------------
 
-CodeReview requires the following dependencies:
-
-* |Python|_ 3 (at least v3.4)
-* |pygit2|_ and libgit2 see `link <http://www.pygit2.org/install.html#quick-install>`_  for installation instruction
-* Pygments
-* |PyQt5|_
-* PyYAML
-* A C compiler to compile a module
+CodeReview requires the dependencies listed in `requirements.txt <https://github.com/FabriceSalvaire/CodeReview/blob/master/requirements.txt>`_
 
 =============
  How to help
diff --git a/bin/diff-viewer b/bin/diff-viewer
index a8254e5..04c8804 100755
--- a/bin/diff-viewer
+++ b/bin/diff-viewer
@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-# -*- python -*-
 
 ####################################################################################################
 #
@@ -21,51 +20,5 @@
 #
 ####################################################################################################
 
-####################################################################################################
-#
-# Logging
-#
-
-import CodeReview.Logging.Logging as Logging
-
-logger = Logging.setup_logging('pyqgit')
-
-####################################################################################################
-
-import argparse
-
-####################################################################################################
-
-from CodeReview.GUI.DiffViewer.DiffViewerApplication import DiffViewerApplication
-from CodeReview.Tools.ProgramOptions import PathAction
-
-####################################################################################################
-#
-# Options
-#
-
-argument_parser = argparse.ArgumentParser(description='Diff Viewer')
-
-argument_parser.add_argument('file1', metavar='File1',
-                             help='First file')
-
-argument_parser.add_argument('file2', metavar='File2',
-                             help='Second File')
-
-argument_parser.add_argument('--show', action='store_true')
-
-argument_parser.add_argument('--user-script',
-                             action=PathAction,
-                             default=None,
-                             help='user script to execute')
-
-argument_parser.add_argument('--user-script-args',
-                             default='',
-                             help="user script args (don't forget to quote)")
-
-args = argument_parser.parse_args()
-
-####################################################################################################
-
-application = DiffViewerApplication(args)
-application.exec_()
+from CodeReview.scripts.diffviewer import main
+main()
diff --git a/bin/pyqgit b/bin/pyqgit
index cc416e4..5fc3aff 100755
--- a/bin/pyqgit
+++ b/bin/pyqgit
@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-# -*- python -*-
 
 ####################################################################################################
 #
@@ -21,48 +20,5 @@
 #
 ####################################################################################################
 
-####################################################################################################
-#
-# Logging
-#
-
-import CodeReview.Logging.Logging as Logging
-
-logger = Logging.setup_logging('pyqgit')
-
-####################################################################################################
-
-import argparse
-
-####################################################################################################
-
-from CodeReview.GUI.LogBrowser.LogBrowserApplication import LogBrowserApplication
-from CodeReview.Tools.ProgramOptions import PathAction
-
-####################################################################################################
-#
-# Options
-#
-
-argument_parser = argparse.ArgumentParser(description='Log Browser')
-
-argument_parser.add_argument('path', metavar='PATH',
-                             action=PathAction,
-                             nargs='?', default='.',
-                             help='path')
-
-argument_parser.add_argument('--user-script',
-                             action=PathAction,
-                             default=None,
-                             help='user script to execute')
-
-argument_parser.add_argument('--user-script-args',
-                             default='',
-                             help="user script args (don't forget to quote)")
-
-args = argument_parser.parse_args()
-
-####################################################################################################
-
-application = LogBrowserApplication(args)
-application.exec_()
+from CodeReview.scripts.pyqgit import main
+main()
diff --git a/bin/pyqgit-qml b/bin/pyqgit-qml
new file mode 100755
index 0000000..cd0b039
--- /dev/null
+++ b/bin/pyqgit-qml
@@ -0,0 +1,37 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2020 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+import CodeReview.Common.Logging.Logging as Logging
+logger = Logging.setup_logging('pyqgit')
+
+####################################################################################################
+
+from CodeReview.QmlApplication.QmlMainApplication import Application
+
+####################################################################################################
+
+# application = Application()
+Application.setup_gui_application()
+application = Application.create()
+application.exec_()
diff --git a/distro/fedora/code-review.desktop b/distro/fedora/code-review.desktop
new file mode 100644
index 0000000..359e33e
--- /dev/null
+++ b/distro/fedora/code-review.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+
+Encoding=UTF-8
+Name=code-review
+Comment=...
+Icon=code-review
+Exec=code-review
+Terminal=false
+Type=Application
+Categories=...;
+Comment[fr]=...
diff --git a/doc/sphinx/source/abbreviation.txt b/doc/sphinx/source/abbreviation.txt
index cc53941..17979fc 100644
--- a/doc/sphinx/source/abbreviation.txt
+++ b/doc/sphinx/source/abbreviation.txt
@@ -13,7 +13,11 @@
 .. _Sphinx: http://sphinx-doc.org
 
 .. |pygit2| replace:: pygit2
-.. _pygit2: http://www.pygit2.org/install.html
+.. _pygit2: http://www.pygit2.org
 
 .. |PyQt5| replace:: PyQt5
-.. _PyQt5: http://www.riverbankcomputing.com/software/pyqt/download5
+.. _PyQt5: https://www.riverbankcomputing.com/software/pyqt
+
+..
+  http://www.pygit2.org/install.html
+  http://www.riverbankcomputing.com/software/pyqt/download5
diff --git a/doc/sphinx/source/installation.rst b/doc/sphinx/source/installation.rst
index 9d1d196..78b5389 100644
--- a/doc/sphinx/source/installation.rst
+++ b/doc/sphinx/source/installation.rst
@@ -7,57 +7,103 @@
  Installation
 ==============
 
-On Fedora
----------
+CodeReview is written in Python and uses the GUI framework |PyQt5|_ and the Git library |pygit2|_.
+Thus, CodeReview is operating system agnostic and should work on Linux, Windows and OSX.
 
-RPM packages are available for the Fedora distribution on https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review
+To install CodeReview from `source code <https://github.com/FabriceSalvaire/CodeReview>`_, you need a working Python environment and a C compiler.
+   
+On Linux
+--------
 
-Run these commands to enable the copr repository and install the last release:
+To summarise, you can easily install CodeReview on Linux with just :code:`pip install CodeReview` but read the followings.
+
+First you need to verify that Python is installed on your distribution.
+
+If you install CodeReview from source, you will also need the GCC C compiler.
+
+You can create a `Python virtual environment <https://docs.python.org/3/library/venv.html>`_ to install CodeReview in its own container:
 
 .. code-block:: sh
 
-  dnf copr enable fabricesalvaire/code-review
-  dnf install CodeReview
+    # create the venv
+    python3.10 -m venv $HOME/codereview
+    # enter in the venv
+    source $HOME/codereview/bin/activate
 
-From PyPi Repository
---------------------
+This is not mandatory, but it is a good practice if you don't know exactly what you are doing.
+Especially, if you don't want to spoil your distribution.
 
-CodeReview is available on |Pypi|_ repository: |CodeReview@pypi|
+Notice, you can later create a shell script to wrap the venv activation and the pyqgit command.
 
-Run this command to install the last release:
+Then install CodeReview either from |Pypi|_ (official Python package repository) or from source:
 
 .. code-block:: sh
 
-  pip install CodeReview
+    # source .tar.gz or wheel/binary from PyPI (can require a GCC C compiler)
+    pip install CodeReview
 
-Notice, it requires Python 3 and a C compiler.
+    # from Git repository (require a GCC C compiler)
+    pip install git+https://github.com/FabriceSalvaire/CodeReview
 
-From source
-------------
+If the `pip` command is not available, you must install the corresponding package of your distribution.
+
+Finally, run CodeReview to verify that the installation was successful:
+
+.. code-block:: sh
+
+    pyqgit --help
+    diff-viewer --help
+
+    pyqgit git_repository_path
+    diff-viewer a.txt b.txt
 
-CodeReview source code is hosted at |CodeReview@github|
+    cd git_repository_path
+    pyqgit
 
-Clone the Git repository using this command:
+Example of shell wrapper:
 
 .. code-block:: sh
 
-  git clone git@github.com:FabriceSalvaire/CodeReview.git
+    #! /usr/bin/bash
+    PY_ENV=${HOME}/codereview
+    source ${PY_ENV}/bin/activate
+    CodeReviewLogLevel='WARNING' ${PY_ENV}/bin/pyqgit $1 &
 
-Then build and install CodeReview using these commands:
+You can also clone the repository and install it using theses commands:
 
 .. code-block:: sh
 
-  python setup.py build
-  python setup.py install
+     git clone git@github.com:FabriceSalvaire/CodeReview.git
+     python setup.py build
+     python setup.py install
+
+On Windows
+----------
+
+**Actually there is no installer available, but it is welcome.**
+
+You must follow the same procedure that for Linux.  However it is a bit more difficult to achieve.
+
+A suggestion is to install the `Anaconda Python Distribution <https://www.anaconda.com/products/distribution>`_ and got a working compiler.
+
+On OSX
+------
+
+**An up to date installation procedure is welcome.**
+
+..  On Fedora
+..  ---------
+..  
+..  RPM packages are available for the Fedora distribution on https://copr.fedorainfracloud.org/coprs/fabricesalvaire/code-review
+..  
+..  Run these commands to enable the copr repository and install the last release:
+..  
+..  .. code-block:: sh
+..  
+..    dnf copr enable fabricesalvaire/code-review
+..    dnf install CodeReview
 
 Dependencies
 ------------
 
-CodeReview requires the following dependencies:
-
-* |Python|_ 3 (at least v3.4)
-* |pygit2|_ and libgit2 see `link <http://www.pygit2.org/install.html#quick-install>`_  for installation instruction
-* Pygments
-* |PyQt5|_
-* PyYAML
-* A C compiler to compile a module
+CodeReview requires the dependencies listed in `requirements.txt <https://github.com/FabriceSalvaire/CodeReview/blob/master/requirements.txt>`_
diff --git a/doc/sphinx/source/introduction.txt b/doc/sphinx/source/introduction.txt
index 0e1cf67..505b92d 100644
--- a/doc/sphinx/source/introduction.txt
+++ b/doc/sphinx/source/introduction.txt
@@ -4,8 +4,14 @@
  Introduction
 ==============
 
-The aim of CodeReview is to provide tools for code review tasks on local Git repositories.  As
-opposite to software like `Gerrit <https://www.gerritcodereview.com>`_ for example, CodeReview is
-not designed to perform code review at a team level, but to check the stage before a commit and show
-the difference between two versions.  In particular, CodeReview fills the gap with IDEs that don't
-provide efficiently these features.
+I code using the venerable `Emacs <https://www.gnu.org/software/emacs>`_ editor and the extension
+`Magit <https://magit.vc>`_ which is a powerfull text-based user interface to Git.  Despite, I am
+happy with Magit for most tasks, I dislike the diff view rendering in Emacs.
+
+Thus the goal of CodeReview is to provide a more convenient tool for code review tasks on local Git
+repositories.  Unlike software like `Gerrit <https://www.gerritcodereview.com>`_, CodeReview is not
+designed to do team-level code review, but to check the stage before a commit and show the
+difference between two versions.  In particular, CodeReview fills the gap with IDEs that don't
+provide a nice side-by-side diff view.
+
+Historically, I wrote this tool as a replacement of **qbzr** for Git.
diff --git a/doc/sphinx/source/news.txt b/doc/sphinx/source/news.txt
index ade8c34..5adfb84 100644
--- a/doc/sphinx/source/news.txt
+++ b/doc/sphinx/source/news.txt
@@ -5,6 +5,11 @@
 
 .. no title here
 
+V1.1 2022-25-10
+---------------
+
+- Updated install process
+   
 V1 2017-12-20
 -------------
 
diff --git a/doc/sphinx/source/usage.txt b/doc/sphinx/source/usage.txt
index ab07271..a8ed3df 100644
--- a/doc/sphinx/source/usage.txt
+++ b/doc/sphinx/source/usage.txt
@@ -2,3 +2,13 @@ How to use CodeReview ?
 -----------------------
 
 CodeReview provides two applications *pyqgit* and *diff-viewer*.
+
+Disclaimer
+----------
+
+This tool was written 10 years ago (late 2011) and I am using it for my own needs, thus it works as is.
+
+I tried to implement a file watching feature but it is a nightmare to debug.
+
+The Qt code is now a bit out dated, but the actual diff viewer implementation would require some
+works to be ported to QML.
diff --git a/gh-pages/update-gh-pages b/gh-pages/update-gh-pages
index 50210db..2d7e6dd 100755
--- a/gh-pages/update-gh-pages
+++ b/gh-pages/update-gh-pages
@@ -47,9 +47,3 @@ if [ -e ${tmp_dir} ]; then
   popd -1 ; popd
   rm -rf ${tmp_dir}
 fi
-
-####################################################################################################
-# 
-# End
-# 
-####################################################################################################
diff --git a/invoke.yaml b/invoke.yaml
new file mode 100644
index 0000000..5e908b5
--- /dev/null
+++ b/invoke.yaml
@@ -0,0 +1 @@
+Package: CodeReview
diff --git a/old-setup/requirements-dev.txt b/old-setup/requirements-dev.txt
new file mode 100644
index 0000000..af54f2f
--- /dev/null
+++ b/old-setup/requirements-dev.txt
@@ -0,0 +1,5 @@
+pip
+wheel
+setuptools
+sphinx
+twine
diff --git a/old-setup/requirements-with-version.txt b/old-setup/requirements-with-version.txt
new file mode 100644
index 0000000..136c3f7
--- /dev/null
+++ b/old-setup/requirements-with-version.txt
@@ -0,0 +1,8 @@
+cffi==1.15.1
+pycparser==2.21
+pygit2==1.10.1
+Pygments==2.13.0
+PyQt5==5.15.7
+PyQt5-Qt5==5.15.2
+PyQt5-sip==12.11.0
+PyYAML==6.0
diff --git a/old-setup/requirements.txt b/old-setup/requirements.txt
new file mode 100644
index 0000000..f467733
--- /dev/null
+++ b/old-setup/requirements.txt
@@ -0,0 +1,8 @@
+cffi
+pycparser
+pygit2
+Pygments
+PyQt5
+PyQt5-Qt5
+PyQt5-sip
+PyYAML
diff --git a/old-setup/setup.cfg b/old-setup/setup.cfg
new file mode 100644
index 0000000..dac9b56
--- /dev/null
+++ b/old-setup/setup.cfg
@@ -0,0 +1,460 @@
+# https://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files
+
+[metadata]
+name = CodeReview
+version = attr: CodeReview.__version__
+url = https://github.com/FabriceSalvaire/CodeReview
+# download_url =
+project_urls =
+    Documentation = https://github.com/FabriceSalvaire/CodeReview
+    Code = https://github.com/FabriceSalvaire/CodeReview
+    Issue Tracker = https://github.com/FabriceSalvaire/CodeReview/issues
+license = GPLv3
+# license_file =
+license_files = LICENSE.txt
+author = Fabrice Salvaire
+author_email = fabrice.salvaire@orange.fr
+maintainer = Fabrice Salvaire
+maintainer_email = fabrice.salvaire@orange.fr
+description = CodeReview is a Python 3 / Qt5 GUI to perform code review on files and Git repositories.
+# long_description = file: README.rst
+# , CHANGELOG.rst, LICENSE.rst
+long_description_content_type = text/x-rst
+keywords = code review diff viewer git
+classifiers =
+    Topic :: Software Development :: Version Control
+    Intended Audience :: Developers
+    Development Status :: 5 - Production/Stable
+    License :: OSI Approved :: GNU General Public License (GPL)
+    Operating System :: OS Independent
+    Programming Language :: Python :: 3.8
+platforms = any
+# provides =
+# requires =
+# obsoletes =
+
+[options]
+packages = find:
+# package_dir =
+#     = CodeReview
+python_requires = >=3.8
+setup_require = setuptools
+# install_requires should declare the loosest possible dependency versions that are still workable
+# https://packaging.python.org/discussions/install-requires-vs-requirements/
+install_requires =
+    cffi
+    pycparser
+    pygit2
+    Pygments
+    PyQt5
+    PyYAML
+    # PyQt5-Qt5
+    # PyQt5-sip
+zip_safe = False
+# Look in MANIFEST.in
+include_package_data = True
+
+[options.packages.find]
+# where = CodeReview
+exclude =
+    QtShim
+    tasks
+    unit-test
+
+[options.package_data]
+CodeReview.Config = logging.yml
+
+[options.entry_points]
+console_scripts =
+    pyqgit = CodeReview.scripts.pyqgit:main
+    diff-viewer = CodeReview.scripts.diffviewer:main	
+
+[bdist_wheel]
+universal = 1
+
+[flake8]
+max-line-length = 120
+# https://flake8.pycqa.org/en/latest/user/error-codes.html
+# https://pycodestyle.pycqa.org/en/latest/intro.html#error-codes
+# E226 missing whitespace around arithmetic operator
+# E302  expected 2 blank lines
+# E303  too many blank lines
+# E305 expected 2 blank lines after class or function definition
+# E402  module level import not at top of file
+ignore = E226, E302, E303, E305, E402, ANN101
+
+[pylint.message]
+# module-naming-style=PascalCase
+disable =
+  apply-builtin, #W1601
+  backtick, #E1605
+  bad-inline-option, #I0010
+  bad-python3-import, #W1648
+  basestring-builtin, #W1602
+  buffer-builtin, #W1603
+  cmp-builtin, #W1604
+  cmp-method, #W1630
+  coerce-builtin, #W1605
+  coerce-method, #W1614
+  comprehension-escape, #W1662
+  delslice-method, #W1615
+  deprecated-itertools-function, #W1651
+  deprecated-operator-function, #W1657
+  deprecated-pragma, #I0022
+  deprecated-str-translate-call, #W1650
+  deprecated-string-function, #W1649
+  deprecated-sys-function, #W1660
+  deprecated-types-field, #W1652
+  deprecated-urllib-function, #W1658
+  dict-items-not-iterating, #W1654
+  dict-iter-method, #W1620
+  dict-keys-not-iterating, #W1655
+  dict-values-not-iterating, #W1656
+  dict-view-method, #W1621
+  div-method, #W1642
+  eq-without-hash, #W1641
+  exception-escape, #W1661
+  exception-message-attribute, #W1645
+  execfile-builtin, #W1606
+  file-builtin, #W1607
+  file-ignored, #I0013
+  filter-builtin-not-iterating, #W1639
+  fixme, #W0511 spam...
+  getslice-method, #W1616
+  hex-method, #W1628
+  idiv-method, #W1643
+  import-star-module-level, #E1609
+  indexing-exception, #W1624
+  input-builtin, #W1632
+  intern-builtin, #W1634
+  invalid-name, #C0103 for module name not conforming to snake_case
+  invalid-str-codec, #W1646
+  locally-disabled, #I0011
+  long-builtin, #W1608
+  long-suffix, #E1606
+  map-builtin-not-iterating, #W1636
+  metaclass-assignment, #W1623
+  missing-class-docstring, #C0115 spam ...
+  missing-function-docstring, #C0116
+  missing-module-docstring, #C0114
+  next-method-called, #W1622
+  next-method-defined, #W1653
+  no-absolute-import, #W1618
+  no-else-return, #R1705 sometimes it is more readable...
+  non-ascii-bytes-literal, #E1610
+  nonzero-method, #W1629
+  oct-method, #W1627
+  old-division, #W1619
+  old-ne-operator, #E1607
+  old-octal-literal, #E1608
+  old-raise-syntax, #E1604
+  parameter-unpacking, #E1602
+  print-statement, #E1601
+  raising-string, #W1625
+  range-builtin-not-iterating, #W1638
+  raw-checker-failed, #I0001
+  raw_input-builtin, #W1609
+  rdiv-method, #W1644
+  reduce-builtin, #W1610
+  reload-builtin, #W1626
+  round-builtin, #W1633
+  setslice-method, #W1617
+  standarderror-builtin, #W1611
+  suppressed-message, #I0020
+  sys-max-int, #W1647
+  too-few-format-args, #E1306
+  too-few-public-methods, #R0903
+  too-many-arguments, #R0913
+  too-many-boolean-expressions, #R0916
+  too-many-branches, #R0912
+  too-many-format-args, #E1305
+  too-many-function-args, #E1121
+  too-many-instance-attributes, #R0902
+  too-many-lines, #C0302
+  too-many-locals, #R0914
+  too-many-nested-blocks, #R1702
+  too-many-public-methods, #R0904
+  too-many-return-statements, #R0911
+  too-many-star-expressions, #E0112
+  too-many-statements, #R0915
+  unichr-builtin, #W1635
+  unicode-builtin, #W1612
+  unpacking-in-except, #E1603
+  use-symbolic-message-instead, #I0023
+  useless-suppression, #I0021
+  using-cmp-argument, #W1640
+  xrange-builtin, #W1613
+  xreadlines-attribute, #W1659
+  zip-builtin-not-iterating, #W1637
+
+# Enabled messages:
+#   abstract-class-instantiated, #E0110
+#   abstract-method, #W0223
+#   access-member-before-definition, #E0203
+#   anomalous-backslash-in-string, #W1401
+#   anomalous-unicode-escape-in-string, #W1402
+#   arguments-differ, #W0221
+#   arguments-out-of-order, #W1114
+#   assert-on-string-literal, #W0129
+#   assert-on-tuple, #W0199
+#   assign-to-new-keyword, #W0111
+#   assigning-non-slot, #E0237
+#   assignment-from-no-return, #E1111
+#   assignment-from-none, #E1128
+#   astroid-error, #F0002
+#   attribute-defined-outside-init, #W0201
+#   bad-classmethod-argument, #C0202
+#   bad-except-order, #E0701
+#   bad-exception-context, #E0703
+#   bad-format-character, #E1300
+#   bad-format-string, #W1302
+#   bad-format-string-key, #W1300
+#   bad-indentation, #W0311
+#   bad-mcs-classmethod-argument, #C0204
+#   bad-mcs-method-argument, #C0203
+#   bad-open-mode, #W1501
+#   bad-option-value, #E0012
+#   bad-reversed-sequence, #E0111
+#   bad-staticmethod-argument, #W0211
+#   bad-str-strip-call, #E1310
+#   bad-string-format-type, #E1307
+#   bad-super-call, #E1003
+#   bad-thread-instantiation, #W1506
+#   bare-except, #W0702
+#   binary-op-exception, #W0711
+#   boolean-datetime, #W1502
+#   broad-except, #W0703
+#   c-extension-no-member, #I1101
+#   catching-non-exception, #E0712
+#   cell-var-from-loop, #W0640
+#   chained-comparison, #R1716
+#   class-variable-slots-conflict, #E0242
+#   comparison-with-callable, #W0143
+#   comparison-with-itself, #R0124
+#   condition-evals-to-constant, #R1727
+#   confusing-with-statement, #W0124
+#   consider-iterating-dictionary, #C0201
+#   consider-merging-isinstance, #R1701
+#   consider-swap-variables, #R1712
+#   consider-using-dict-comprehension, #R1717
+#   consider-using-enumerate, #C0200
+#   consider-using-generator, #R1728
+#   consider-using-get, #R1715
+#   consider-using-in, #R1714
+#   consider-using-join, #R1713
+#   consider-using-max-builtin, #R1731
+#   consider-using-min-builtin, #R1730
+#   consider-using-set-comprehension, #R1718
+#   consider-using-sys-exit, #R1722
+#   consider-using-ternary, #R1706
+#   consider-using-with, #R1732
+#   continue-in-finally, #E0116
+#   cyclic-import, #R0401
+#   dangerous-default-value, #W0102
+#   deprecated-argument, #W1511
+#   deprecated-method, #W1505
+#   deprecated-module, #W0402
+#   dict-iter-missing-items, #E1141
+#   disallowed-name, #C0104
+#   duplicate-argument-name, #E0108
+#   duplicate-bases, #E0241
+#   duplicate-code, #R0801
+#   duplicate-except, #W0705
+#   duplicate-key, #W0109
+#   duplicate-string-formatting-argument, #W1308
+#   empty-docstring, #C0112
+#   eval-used, #W0123
+#   exec-used, #W0122
+#   expression-not-assigned, #W0106
+#   f-string-without-interpolation, #W1309
+#   fatal, #F0001
+#   format-combined-specification, #W1305
+#   format-needs-mapping, #E1303
+#   function-redefined, #E0102
+#   global-at-module-level, #W0604
+#   global-statement, #W0603
+#   global-variable-not-assigned, #W0602
+#   global-variable-undefined, #W0601
+#   implicit-str-concat, #W1404
+#   import-error, #E0401
+#   import-outside-toplevel, #C0415
+#   import-self, #W0406
+#   inconsistent-mro, #E0240
+#   inconsistent-quotes, #W1405
+#   inconsistent-return-statements, #R1710
+#   inherit-non-class, #E0239
+#   init-is-generator, #E0100
+#   invalid-all-object, #E0604
+#   invalid-bool-returned, #E0304
+#   invalid-bytes-returned, #E0308
+#   invalid-characters-in-docstring, #C0403
+#   invalid-envvar-default, #W1508
+#   invalid-envvar-value, #E1507
+#   invalid-format-index, #W1307
+#   invalid-format-returned, #E0311
+#   invalid-getnewargs-ex-returned, #E0313
+#   invalid-getnewargs-returned, #E0312
+#   invalid-hash-returned, #E0309
+#   invalid-index-returned, #E0305
+#   invalid-length-hint-returned, #E0310
+#   invalid-length-returned, #E0303
+#   invalid-metaclass, #E1139
+#   invalid-overridden-method, #W0236
+#   invalid-repr-returned, #E0306
+#   invalid-sequence-index, #E1126
+#   invalid-slice-index, #E1127
+#   invalid-slots, #E0238
+#   invalid-slots-object, #E0236
+#   invalid-star-assignment-target, #E0113
+#   invalid-str-returned, #E0307
+#   invalid-unary-operand-type, #E1130
+#   isinstance-second-argument-not-valid-type, #W1116
+#   keyword-arg-before-vararg, #W1113
+#   len-as-condition, #C1801
+#   line-too-long, #C0301
+#   literal-comparison, #R0123
+#   logging-format-interpolation, #W1202
+#   logging-format-truncated, #E1201
+#   logging-fstring-interpolation, #W1203
+#   logging-not-lazy, #W1201
+#   logging-too-few-args, #E1206
+#   logging-too-many-args, #E1205
+#   logging-unsupported-format, #E1200
+#   lost-exception, #W0150
+#   method-check-failed, #F0202
+#   method-hidden, #E0202
+#   misplaced-bare-raise, #E0704
+#   misplaced-comparison-constant, #C0122
+#   misplaced-format-function, #E0119
+#   misplaced-future, #W0410
+#   missing-final-newline, #C0304
+#   missing-format-argument-key, #W1303
+#   missing-format-attribute, #W1306
+#   missing-format-string-key, #E1304
+#   missing-kwoa, #E1125
+#   missing-parentheses-for-call-in-test, #W0126
+#   mixed-format-string, #E1302
+#   mixed-line-endings, #C0327
+#   multiple-imports, #C0410
+#   multiple-statements, #C0321
+#   nan-comparison, #W0177
+#   no-classmethod-decorator, #R0202
+#   no-else-break, #R1723
+#   no-else-continue, #R1724
+#   no-else-raise, #R1720
+#   no-init, #W0232
+#   no-member, #E1101
+#   no-method-argument, #E0211
+#   no-name-in-module, #E0611
+#   no-self-argument, #E0213
+#   no-self-use, #R0201
+#   no-staticmethod-decorator, #R0203
+#   no-value-for-parameter, #E1120
+#   non-ascii-name, #C0144
+#   non-iterator-returned, #E0301
+#   non-parent-init-called, #W0233
+#   non-str-assignment-to-dunder-name, #W1115
+#   nonexistent-operator, #E0107
+#   nonlocal-and-global, #E0115
+#   nonlocal-without-binding, #E0117
+#   not-a-mapping, #E1134
+#   not-an-iterable, #E1133
+#   not-async-context-manager, #E1701
+#   not-callable, #E1102
+#   not-context-manager, #E1129
+#   not-in-loop, #E0103
+#   notimplemented-raised, #E0711
+#   parse-error, #F0010
+#   pointless-statement, #W0104
+#   pointless-string-statement, #W0105
+#   possibly-unused-variable, #W0641
+#   preferred-module, #W0407
+#   property-with-parameters, #R0206
+#   protected-access, #W0212
+#   raise-missing-from, #W0707
+#   raising-bad-type, #E0702
+#   raising-format-tuple, #W0715
+#   raising-non-exception, #E0710
+#   redeclared-assigned-name, #W0128
+#   redefine-in-handler, #W0623
+#   redefined-argument-from-local, #R1704
+#   redefined-builtin, #W0622
+#   redefined-outer-name, #W0621
+#   redundant-keyword-arg, #E1124
+#   redundant-unittest-assert, #W1503
+#   reimported, #W0404
+#   relative-beyond-top-level, #E0402
+#   repeated-keyword, #E1132
+#   return-arg-in-generator, #E0106
+#   return-in-init, #E0101
+#   return-outside-function, #E0104
+#   self-assigning-variable, #W0127
+#   self-cls-assignment, #W0642
+#   shallow-copy-environ, #W1507
+#   signature-differs, #W0222
+#   simplifiable-condition, #R1726
+#   simplifiable-if-expression, #R1719
+#   simplifiable-if-statement, #R1703
+#   simplify-boolean-expression, #R1709
+#   single-string-used-for-slots, #C0205
+#   singleton-comparison, #C0121
+#   star-needs-assignment-target, #E0114
+#   stop-iteration-return, #R1708
+#   subprocess-popen-preexec-fn, #W1509
+#   subprocess-run-check, #W1510
+#   super-init-not-called, #W0231
+#   super-with-arguments, #R1725
+#   superfluous-parens, #C0325
+#   syntax-error, #E0001
+#   too-many-ancestors, #R0901
+#   trailing-comma-tuple, #R1707
+#   trailing-newlines, #C0305
+#   trailing-whitespace, #C0303
+#   truncated-format-string, #E1301
+#   try-except-raise, #W0706
+#   unbalanced-tuple-unpacking, #W0632
+#   undefined-all-variable, #E0603
+#   undefined-loop-variable, #W0631
+#   undefined-variable, #E0602
+#   unexpected-keyword-arg, #E1123
+#   unexpected-line-ending-format, #C0328
+#   unexpected-special-method-signature, #E0302
+#   ungrouped-imports, #C0412
+#   unhashable-dict-key, #E1140
+#   unidiomatic-typecheck, #C0123
+#   unnecessary-comprehension, #R1721
+#   unnecessary-lambda, #W0108
+#   unnecessary-pass, #W0107
+#   unnecessary-semicolon, #W0301
+#   unneeded-not, #C0113
+#   unpacking-non-sequence, #E0633
+#   unreachable, #W0101
+#   unrecognized-inline-option, #E0011
+#   unsubscriptable-object, #E1136
+#   unsupported-assignment-operation, #E1137
+#   unsupported-binary-operation, #E1131
+#   unsupported-delete-operation, #E1138
+#   unsupported-membership-test, #E1135
+#   unused-argument, #W0613
+#   unused-format-string-argument, #W1304
+#   unused-format-string-key, #W1301
+#   unused-import, #W0611
+#   unused-variable, #W0612
+#   unused-wildcard-import, #W0614
+#   use-a-generator, #R1729
+#   used-before-assignment, #E0601
+#   used-prior-global-declaration, #E0118
+#   useless-else-on-loop, #W0120
+#   useless-import-alias, #C0414
+#   useless-object-inheritance, #R0205
+#   useless-return, #R1711
+#   useless-super-delegation, #W0235
+#   using-constant-test, #W0125
+#   wildcard-import, #W0401
+#   wrong-exception-operation, #W0716
+#   wrong-import-order, #C0411
+#   wrong-import-position, #C0413
+#   wrong-spelling-in-comment, #C0401
+#   wrong-spelling-in-docstring, #C0402
+#   yield-inside-async-function, #E1700
+#   yield-outside-function, #E0105
diff --git a/old-setup/setup.py b/old-setup/setup.py
new file mode 100644
index 0000000..3935cf4
--- /dev/null
+++ b/old-setup/setup.py
@@ -0,0 +1,53 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2017 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+import sys
+
+from setuptools import setup, Extension
+
+####################################################################################################
+
+if sys.version_info < (3,):
+    print('CodeReview requires Python 3', file=sys.stderr)
+    sys.exit(1)
+
+####################################################################################################
+
+from setup_data import setup_dict
+setup(
+    **setup_dict,
+    # https://setuptools.pypa.io/en/latest/userguide/ext_modules.html
+    # Add support for ext_modules in static setup.cfg
+    #   https://github.com/pypa/setuptools/issues/2220
+    ext_modules=[
+        Extension(
+            name='CodeReview.PatienceDiff._patiencediff_c',
+            sources=['CodeReview/PatienceDiff/_patiencediff_c.c'],
+        ),
+        Extension(
+            name='CodeReview.TextDistance.levenshtein_distance_c',
+            sources=['CodeReview/TextDistance/levenshtein_distance.c'],
+        )
+    ],
+)
diff --git a/setup_data.py b/old-setup/setup_data.py
similarity index 89%
rename from setup_data.py
rename to old-setup/setup_data.py
index ab28716..367f165 100644
--- a/setup_data.py
+++ b/old-setup/setup_data.py
@@ -18,6 +18,8 @@
 #
 ####################################################################################################
 
+# Note: Still required for long_description
+
 ####################################################################################################
 
 import os
@@ -71,13 +73,5 @@ def read_readme(file_name):
 ####################################################################################################
 
 setup_dict = dict(
-    name='CodeReview',
-    version='1.0.0',
-    author='Fabrice Salvaire',
-    author_email='fabrice.salvaire@orange.fr',
-    description='CodeReview is a Python 3 / Qt5 GUI to perform code review on files and Git repositories.',
-    license='GPLv3',
-    keywords="code review diff viewer git",
-    url='https://github.com/FabriceSalvaire/CodeReview',
     long_description=long_description,
 )
diff --git a/diff-viewer.sh b/old/diff-viewer.sh
similarity index 100%
rename from diff-viewer.sh
rename to old/diff-viewer.sh
diff --git a/gui-prototypes/side-view/side-view b/old/gui-prototypes/side-view/side-view
similarity index 100%
rename from gui-prototypes/side-view/side-view
rename to old/gui-prototypes/side-view/side-view
diff --git a/gui-prototypes/side-view/side-view.ui b/old/gui-prototypes/side-view/side-view.ui
similarity index 100%
rename from gui-prototypes/side-view/side-view.ui
rename to old/gui-prototypes/side-view/side-view.ui
diff --git a/link-patience.sh b/old/link-patience.sh
similarity index 100%
rename from link-patience.sh
rename to old/link-patience.sh
diff --git a/notes/design.rst b/old/notes/design.rst
similarity index 100%
rename from notes/design.rst
rename to old/notes/design.rst
diff --git a/notes/graphviz-qt.cpp b/old/notes/graphviz-qt.cpp
similarity index 100%
rename from notes/graphviz-qt.cpp
rename to old/notes/graphviz-qt.cpp
diff --git a/notes/rest-summary.rst b/old/notes/rest-summary.rst
similarity index 100%
rename from notes/rest-summary.rst
rename to old/notes/rest-summary.rst
diff --git a/notes/review-log.txt b/old/notes/review-log.txt
similarity index 100%
rename from notes/review-log.txt
rename to old/notes/review-log.txt
diff --git a/notes/sphinx-autodoc-flaws.txt b/old/notes/sphinx-autodoc-flaws.txt
similarity index 100%
rename from notes/sphinx-autodoc-flaws.txt
rename to old/notes/sphinx-autodoc-flaws.txt
diff --git a/old-dev/Diff.py b/old/old-dev/Diff.py
similarity index 100%
rename from old-dev/Diff.py
rename to old/old-dev/Diff.py
diff --git a/old-dev/DiffBuffer.py b/old/old-dev/DiffBuffer.py
similarity index 100%
rename from old-dev/DiffBuffer.py
rename to old/old-dev/DiffBuffer.py
diff --git a/old-dev/bzr-patience b/old/old-dev/bzr-patience
similarity index 100%
rename from old-dev/bzr-patience
rename to old/old-dev/bzr-patience
diff --git a/old-dev/test_Diff.py b/old/old-dev/test_Diff.py
similarity index 100%
rename from old-dev/test_Diff.py
rename to old/old-dev/test_Diff.py
diff --git a/old-dev/test_DiffViewer.py b/old/old-dev/test_DiffViewer.py
similarity index 100%
rename from old-dev/test_DiffViewer.py
rename to old/old-dev/test_DiffViewer.py
diff --git a/open-doc.sh b/old/open-doc.sh
similarity index 100%
rename from open-doc.sh
rename to old/open-doc.sh
diff --git a/start.sh b/old/start.sh
similarity index 100%
rename from start.sh
rename to old/start.sh
diff --git a/test-repository/git-repo/make-repo2-twisted.sh b/old/test-repository/git-repo/make-repo2-twisted.sh
similarity index 100%
rename from test-repository/git-repo/make-repo2-twisted.sh
rename to old/test-repository/git-repo/make-repo2-twisted.sh
diff --git a/test-repository/git-repo/make-repo2-two-branches.sh b/old/test-repository/git-repo/make-repo2-two-branches.sh
similarity index 100%
rename from test-repository/git-repo/make-repo2-two-branches.sh
rename to old/test-repository/git-repo/make-repo2-two-branches.sh
diff --git a/test-repository/git-repo/make-repo2.sh b/old/test-repository/git-repo/make-repo2.sh
similarity index 100%
rename from test-repository/git-repo/make-repo2.sh
rename to old/test-repository/git-repo/make-repo2.sh
diff --git a/test/git2-python b/old/test/git2-python
similarity index 100%
rename from test/git2-python
rename to old/test/git2-python
diff --git a/text-samples/file1.txt b/old/text-samples/file1.txt
similarity index 100%
rename from text-samples/file1.txt
rename to old/text-samples/file1.txt
diff --git a/text-samples/file2.txt b/old/text-samples/file2.txt
similarity index 100%
rename from text-samples/file2.txt
rename to old/text-samples/file2.txt
diff --git a/text-samples/unicode-sample.txt b/old/text-samples/unicode-sample.txt
similarity index 100%
rename from text-samples/unicode-sample.txt
rename to old/text-samples/unicode-sample.txt
diff --git a/tools/license-model-gpl.py b/old/tools/license-model-gpl.py
similarity index 100%
rename from tools/license-model-gpl.py
rename to old/tools/license-model-gpl.py
diff --git a/tools/make-api-doc b/old/tools/make-api-doc
similarity index 100%
rename from tools/make-api-doc
rename to old/tools/make-api-doc
diff --git a/tools/make-readme b/old/tools/make-readme
similarity index 100%
rename from tools/make-readme
rename to old/tools/make-readme
diff --git a/tools/upload-to-pypi b/old/tools/upload-to-pypi
similarity index 100%
rename from tools/upload-to-pypi
rename to old/tools/upload-to-pypi
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..800167b
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,26 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "code-review"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.13"
+dependencies = [
+    "cffi>=2.0.0",
+    "pycparser>=3.0",
+    "pygit2>=1.19.1",
+    "pygments>=2.19.2",
+    "pyqt5>=5.15.11",
+    "pyqt5-qt5>=5.15.18",
+    "pyqt5-sip>=12.18.0",
+    "pyyaml>=6.0.3",
+]
+
+[tool.setuptools]
+ext-modules = [
+  {name = "CodeReview.PatienceDiff._patiencediff_c", sources = ["src/CodeReview/PatienceDiff/_patiencediff_c.c"]},
+  {name = "CodeReview.TextDistance.levenshtein_distance_c", sources = ["src/CodeReview/TextDistance/levenshtein_distance.c"]},
+]
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 5f235b2..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Pygments
-PyYAML
-pygit2
-# PyQt5
-
diff --git a/ressources/gitk b/ressources/gitk
deleted file mode 100755
index a14d7a1..0000000
--- a/ressources/gitk
+++ /dev/null
@@ -1,12619 +0,0 @@
-#!/bin/sh
-# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "$@"
-
-# Copyright © 2005-2016 Paul Mackerras.  All rights reserved.
-# This program is free software; it may be used, copied, modified
-# and distributed under the terms of the GNU General Public Licence,
-# either version 2, or (at your option) any later version.
-
-package require Tk
-
-proc hasworktree {} {
-    return [expr {[exec git rev-parse --is-bare-repository] == "false" &&
-		  [exec git rev-parse --is-inside-git-dir] == "false"}]
-}
-
-proc reponame {} {
-    global gitdir
-    set n [file normalize $gitdir]
-    if {[string match "*/.git" $n]} {
-	set n [string range $n 0 end-5]
-    }
-    return [file tail $n]
-}
-
-proc gitworktree {} {
-    variable _gitworktree
-    if {[info exists _gitworktree]} {
-	return $_gitworktree
-    }
-    # v1.7.0 introduced --show-toplevel to return the canonical work-tree
-    if {[catch {set _gitworktree [exec git rev-parse --show-toplevel]}]} {
-        # try to set work tree from environment, core.worktree or use
-        # cdup to obtain a relative path to the top of the worktree. If
-        # run from the top, the ./ prefix ensures normalize expands pwd.
-        if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
-	    catch {set _gitworktree [exec git config --get core.worktree]}
-	    if {$_gitworktree eq ""} {
-		set _gitworktree [file normalize ./[exec git rev-parse --show-cdup]]
-	    }
-        }
-    }
-    return $_gitworktree
-}
-
-# A simple scheduler for compute-intensive stuff.
-# The aim is to make sure that event handlers for GUI actions can
-# run at least every 50-100 ms.  Unfortunately fileevent handlers are
-# run before X event handlers, so reading from a fast source can
-# make the GUI completely unresponsive.
-proc run args {
-    global isonrunq runq currunq
-
-    set script $args
-    if {[info exists isonrunq($script)]} return
-    if {$runq eq {} && ![info exists currunq]} {
-	after idle dorunq
-    }
-    lappend runq [list {} $script]
-    set isonrunq($script) 1
-}
-
-proc filerun {fd script} {
-    fileevent $fd readable [list filereadable $fd $script]
-}
-
-proc filereadable {fd script} {
-    global runq currunq
-
-    fileevent $fd readable {}
-    if {$runq eq {} && ![info exists currunq]} {
-	after idle dorunq
-    }
-    lappend runq [list $fd $script]
-}
-
-proc nukefile {fd} {
-    global runq
-
-    for {set i 0} {$i < [llength $runq]} {} {
-	if {[lindex $runq $i 0] eq $fd} {
-	    set runq [lreplace $runq $i $i]
-	} else {
-	    incr i
-	}
-    }
-}
-
-proc dorunq {} {
-    global isonrunq runq currunq
-
-    set tstart [clock clicks -milliseconds]
-    set t0 $tstart
-    while {[llength $runq] > 0} {
-	set fd [lindex $runq 0 0]
-	set script [lindex $runq 0 1]
-	set currunq [lindex $runq 0]
-	set runq [lrange $runq 1 end]
-	set repeat [eval $script]
-	unset currunq
-	set t1 [clock clicks -milliseconds]
-	set t [expr {$t1 - $t0}]
-	if {$repeat ne {} && $repeat} {
-	    if {$fd eq {} || $repeat == 2} {
-		# script returns 1 if it wants to be readded
-		# file readers return 2 if they could do more straight away
-		lappend runq [list $fd $script]
-	    } else {
-		fileevent $fd readable [list filereadable $fd $script]
-	    }
-	} elseif {$fd eq {}} {
-	    unset isonrunq($script)
-	}
-	set t0 $t1
-	if {$t1 - $tstart >= 80} break
-    }
-    if {$runq ne {}} {
-	after idle dorunq
-    }
-}
-
-proc reg_instance {fd} {
-    global commfd leftover loginstance
-
-    set i [incr loginstance]
-    set commfd($i) $fd
-    set leftover($i) {}
-    return $i
-}
-
-proc unmerged_files {files} {
-    global nr_unmerged
-
-    # find the list of unmerged files
-    set mlist {}
-    set nr_unmerged 0
-    if {[catch {
-	set fd [open "| git ls-files -u" r]
-    } err]} {
-	show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
-	exit 1
-    }
-    while {[gets $fd line] >= 0} {
-	set i [string first "\t" $line]
-	if {$i < 0} continue
-	set fname [string range $line [expr {$i+1}] end]
-	if {[lsearch -exact $mlist $fname] >= 0} continue
-	incr nr_unmerged
-	if {$files eq {} || [path_filter $files $fname]} {
-	    lappend mlist $fname
-	}
-    }
-    catch {close $fd}
-    return $mlist
-}
-
-proc parseviewargs {n arglist} {
-    global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env
-    global vinlinediff
-    global worddiff git_version
-
-    set vdatemode($n) 0
-    set vmergeonly($n) 0
-    set vinlinediff($n) 0
-    set glflags {}
-    set diffargs {}
-    set nextisval 0
-    set revargs {}
-    set origargs $arglist
-    set allknown 1
-    set filtered 0
-    set i -1
-    foreach arg $arglist {
-	incr i
-	if {$nextisval} {
-	    lappend glflags $arg
-	    set nextisval 0
-	    continue
-	}
-	switch -glob -- $arg {
-	    "-d" -
-	    "--date-order" {
-		set vdatemode($n) 1
-		# remove from origargs in case we hit an unknown option
-		set origargs [lreplace $origargs $i $i]
-		incr i -1
-	    }
-	    "-[puabwcrRBMC]" -
-	    "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
-	    "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
-	    "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
-	    "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
-	    "--ignore-space-change" - "-U*" - "--unified=*" {
-		# These request or affect diff output, which we don't want.
-		# Some could be used to set our defaults for diff display.
-		lappend diffargs $arg
-	    }
-	    "--raw" - "--patch-with-raw" - "--patch-with-stat" -
-	    "--name-only" - "--name-status" - "--color" -
-	    "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
-	    "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
-	    "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
-	    "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
-	    "--objects" - "--objects-edge" - "--reverse" {
-		# These cause our parsing of git log's output to fail, or else
-		# they're options we want to set ourselves, so ignore them.
-	    }
-	    "--color-words*" - "--word-diff=color" {
-		# These trigger a word diff in the console interface,
-		# so help the user by enabling our own support
-		if {[package vcompare $git_version "1.7.2"] >= 0} {
-		    set worddiff [mc "Color words"]
-		}
-	    }
-	    "--word-diff*" {
-		if {[package vcompare $git_version "1.7.2"] >= 0} {
-		    set worddiff [mc "Markup words"]
-		}
-	    }
-	    "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
-	    "--check" - "--exit-code" - "--quiet" - "--topo-order" -
-	    "--full-history" - "--dense" - "--sparse" -
-	    "--follow" - "--left-right" - "--encoding=*" {
-		# These are harmless, and some are even useful
-		lappend glflags $arg
-	    }
-	    "--diff-filter=*" - "--no-merges" - "--unpacked" -
-	    "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
-	    "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
-	    "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
-	    "--remove-empty" - "--first-parent" - "--cherry-pick" -
-	    "-S*" - "-G*" - "--pickaxe-all" - "--pickaxe-regex" -
-	    "--simplify-by-decoration" {
-		# These mean that we get a subset of the commits
-		set filtered 1
-		lappend glflags $arg
-	    }
-	    "-L*" {
-		# Line-log with 'stuck' argument (unstuck form is
-		# not supported)
-		set filtered 1
-		set vinlinediff($n) 1
-		set allknown 0
-		lappend glflags $arg
-	    }
-	    "-n" {
-		# This appears to be the only one that has a value as a
-		# separate word following it
-		set filtered 1
-		set nextisval 1
-		lappend glflags $arg
-	    }
-	    "--not" - "--all" {
-		lappend revargs $arg
-	    }
-	    "--merge" {
-		set vmergeonly($n) 1
-		# git rev-parse doesn't understand --merge
-		lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD
-	    }
-	    "--no-replace-objects" {
-		set env(GIT_NO_REPLACE_OBJECTS) "1"
-	    }
-	    "-*" {
-		# Other flag arguments including -<n>
-		if {[string is digit -strict [string range $arg 1 end]]} {
-		    set filtered 1
-		} else {
-		    # a flag argument that we don't recognize;
-		    # that means we can't optimize
-		    set allknown 0
-		}
-		lappend glflags $arg
-	    }
-	    default {
-		# Non-flag arguments specify commits or ranges of commits
-		if {[string match "*...*" $arg]} {
-		    lappend revargs --gitk-symmetric-diff-marker
-		}
-		lappend revargs $arg
-	    }
-	}
-    }
-    set vdflags($n) $diffargs
-    set vflags($n) $glflags
-    set vrevs($n) $revargs
-    set vfiltered($n) $filtered
-    set vorigargs($n) $origargs
-    return $allknown
-}
-
-proc parseviewrevs {view revs} {
-    global vposids vnegids
-
-    if {$revs eq {}} {
-	set revs HEAD
-    } elseif {[lsearch -exact $revs --all] >= 0} {
-	lappend revs HEAD
-    }
-    if {[catch {set ids [eval exec git rev-parse $revs]} err]} {
-	# we get stdout followed by stderr in $err
-	# for an unknown rev, git rev-parse echoes it and then errors out
-	set errlines [split $err "\n"]
-	set badrev {}
-	for {set l 0} {$l < [llength $errlines]} {incr l} {
-	    set line [lindex $errlines $l]
-	    if {!([string length $line] == 40 && [string is xdigit $line])} {
-		if {[string match "fatal:*" $line]} {
-		    if {[string match "fatal: ambiguous argument*" $line]
-			&& $badrev ne {}} {
-			if {[llength $badrev] == 1} {
-			    set err "unknown revision $badrev"
-			} else {
-			    set err "unknown revisions: [join $badrev ", "]"
-			}
-		    } else {
-			set err [join [lrange $errlines $l end] "\n"]
-		    }
-		    break
-		}
-		lappend badrev $line
-	    }
-	}
-	error_popup "[mc "Error parsing revisions:"] $err"
-	return {}
-    }
-    set ret {}
-    set pos {}
-    set neg {}
-    set sdm 0
-    foreach id [split $ids "\n"] {
-	if {$id eq "--gitk-symmetric-diff-marker"} {
-	    set sdm 4
-	} elseif {[string match "^*" $id]} {
-	    if {$sdm != 1} {
-		lappend ret $id
-		if {$sdm == 3} {
-		    set sdm 0
-		}
-	    }
-	    lappend neg [string range $id 1 end]
-	} else {
-	    if {$sdm != 2} {
-		lappend ret $id
-	    } else {
-		lset ret end $id...[lindex $ret end]
-	    }
-	    lappend pos $id
-	}
-	incr sdm -1
-    }
-    set vposids($view) $pos
-    set vnegids($view) $neg
-    return $ret
-}
-
-# Start off a git log process and arrange to read its output
-proc start_rev_list {view} {
-    global startmsecs commitidx viewcomplete curview
-    global tclencoding
-    global viewargs viewargscmd viewfiles vfilelimit
-    global showlocalchanges
-    global viewactive viewinstances vmergeonly
-    global mainheadid viewmainheadid viewmainheadid_orig
-    global vcanopt vflags vrevs vorigargs
-    global show_notes
-
-    set startmsecs [clock clicks -milliseconds]
-    set commitidx($view) 0
-    # these are set this way for the error exits
-    set viewcomplete($view) 1
-    set viewactive($view) 0
-    varcinit $view
-
-    set args $viewargs($view)
-    if {$viewargscmd($view) ne {}} {
-	if {[catch {
-	    set str [exec sh -c $viewargscmd($view)]
-	} err]} {
-	    error_popup "[mc "Error executing --argscmd command:"] $err"
-	    return 0
-	}
-	set args [concat $args [split $str "\n"]]
-    }
-    set vcanopt($view) [parseviewargs $view $args]
-
-    set files $viewfiles($view)
-    if {$vmergeonly($view)} {
-	set files [unmerged_files $files]
-	if {$files eq {}} {
-	    global nr_unmerged
-	    if {$nr_unmerged == 0} {
-		error_popup [mc "No files selected: --merge specified but\
-			     no files are unmerged."]
-	    } else {
-		error_popup [mc "No files selected: --merge specified but\
-			     no unmerged files are within file limit."]
-	    }
-	    return 0
-	}
-    }
-    set vfilelimit($view) $files
-
-    if {$vcanopt($view)} {
-	set revs [parseviewrevs $view $vrevs($view)]
-	if {$revs eq {}} {
-	    return 0
-	}
-	set args [concat $vflags($view) $revs]
-    } else {
-	set args $vorigargs($view)
-    }
-
-    if {[catch {
-	set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
-			--parents --boundary $args "--" $files] r]
-    } err]} {
-	error_popup "[mc "Error executing git log:"] $err"
-	return 0
-    }
-    set i [reg_instance $fd]
-    set viewinstances($view) [list $i]
-    set viewmainheadid($view) $mainheadid
-    set viewmainheadid_orig($view) $mainheadid
-    if {$files ne {} && $mainheadid ne {}} {
-	get_viewmainhead $view
-    }
-    if {$showlocalchanges && $viewmainheadid($view) ne {}} {
-	interestedin $viewmainheadid($view) dodiffindex
-    }
-    fconfigure $fd -blocking 0 -translation lf -eofchar {}
-    if {$tclencoding != {}} {
-	fconfigure $fd -encoding $tclencoding
-    }
-    filerun $fd [list getcommitlines $fd $i $view 0]
-    nowbusy $view [mc "Reading"]
-    set viewcomplete($view) 0
-    set viewactive($view) 1
-    return 1
-}
-
-proc stop_instance {inst} {
-    global commfd leftover
-
-    set fd $commfd($inst)
-    catch {
-	set pid [pid $fd]
-
-	if {$::tcl_platform(platform) eq {windows}} {
-	    exec taskkill /pid $pid
-	} else {
-	    exec kill $pid
-	}
-    }
-    catch {close $fd}
-    nukefile $fd
-    unset commfd($inst)
-    unset leftover($inst)
-}
-
-proc stop_backends {} {
-    global commfd
-
-    foreach inst [array names commfd] {
-	stop_instance $inst
-    }
-}
-
-proc stop_rev_list {view} {
-    global viewinstances
-
-    foreach inst $viewinstances($view) {
-	stop_instance $inst
-    }
-    set viewinstances($view) {}
-}
-
-proc reset_pending_select {selid} {
-    global pending_select mainheadid selectheadid
-
-    if {$selid ne {}} {
-	set pending_select $selid
-    } elseif {$selectheadid ne {}} {
-	set pending_select $selectheadid
-    } else {
-	set pending_select $mainheadid
-    }
-}
-
-proc getcommits {selid} {
-    global canv curview need_redisplay viewactive
-
-    initlayout
-    if {[start_rev_list $curview]} {
-	reset_pending_select $selid
-	show_status [mc "Reading commits..."]
-	set need_redisplay 1
-    } else {
-	show_status [mc "No commits selected"]
-    }
-}
-
-proc updatecommits {} {
-    global curview vcanopt vorigargs vfilelimit viewinstances
-    global viewactive viewcomplete tclencoding
-    global startmsecs showneartags showlocalchanges
-    global mainheadid viewmainheadid viewmainheadid_orig pending_select
-    global hasworktree
-    global varcid vposids vnegids vflags vrevs
-    global show_notes
-
-    set hasworktree [hasworktree]
-    rereadrefs
-    set view $curview
-    if {$mainheadid ne $viewmainheadid_orig($view)} {
-	if {$showlocalchanges} {
-	    dohidelocalchanges
-	}
-	set viewmainheadid($view) $mainheadid
-	set viewmainheadid_orig($view) $mainheadid
-	if {$vfilelimit($view) ne {}} {
-	    get_viewmainhead $view
-	}
-    }
-    if {$showlocalchanges} {
-	doshowlocalchanges
-    }
-    if {$vcanopt($view)} {
-	set oldpos $vposids($view)
-	set oldneg $vnegids($view)
-	set revs [parseviewrevs $view $vrevs($view)]
-	if {$revs eq {}} {
-	    return
-	}
-	# note: getting the delta when negative refs change is hard,
-	# and could require multiple git log invocations, so in that
-	# case we ask git log for all the commits (not just the delta)
-	if {$oldneg eq $vnegids($view)} {
-	    set newrevs {}
-	    set npos 0
-	    # take out positive refs that we asked for before or
-	    # that we have already seen
-	    foreach rev $revs {
-		if {[string length $rev] == 40} {
-		    if {[lsearch -exact $oldpos $rev] < 0
-			&& ![info exists varcid($view,$rev)]} {
-			lappend newrevs $rev
-			incr npos
-		    }
-		} else {
-		    lappend $newrevs $rev
-		}
-	    }
-	    if {$npos == 0} return
-	    set revs $newrevs
-	    set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]
-	}
-	set args [concat $vflags($view) $revs --not $oldpos]
-    } else {
-	set args $vorigargs($view)
-    }
-    if {[catch {
-	set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
-			--parents --boundary $args "--" $vfilelimit($view)] r]
-    } err]} {
-	error_popup "[mc "Error executing git log:"] $err"
-	return
-    }
-    if {$viewactive($view) == 0} {
-	set startmsecs [clock clicks -milliseconds]
-    }
-    set i [reg_instance $fd]
-    lappend viewinstances($view) $i
-    fconfigure $fd -blocking 0 -translation lf -eofchar {}
-    if {$tclencoding != {}} {
-	fconfigure $fd -encoding $tclencoding
-    }
-    filerun $fd [list getcommitlines $fd $i $view 1]
-    incr viewactive($view)
-    set viewcomplete($view) 0
-    reset_pending_select {}
-    nowbusy $view [mc "Reading"]
-    if {$showneartags} {
-	getallcommits
-    }
-}
-
-proc reloadcommits {} {
-    global curview viewcomplete selectedline currentid thickerline
-    global showneartags treediffs commitinterest cached_commitrow
-    global targetid commitinfo
-
-    set selid {}
-    if {$selectedline ne {}} {
-	set selid $currentid
-    }
-
-    if {!$viewcomplete($curview)} {
-	stop_rev_list $curview
-    }
-    resetvarcs $curview
-    set selectedline {}
-    unset -nocomplain currentid
-    unset -nocomplain thickerline
-    unset -nocomplain treediffs
-    readrefs
-    changedrefs
-    if {$showneartags} {
-	getallcommits
-    }
-    clear_display
-    unset -nocomplain commitinfo
-    unset -nocomplain commitinterest
-    unset -nocomplain cached_commitrow
-    unset -nocomplain targetid
-    setcanvscroll
-    getcommits $selid
-    return 0
-}
-
-# This makes a string representation of a positive integer which
-# sorts as a string in numerical order
-proc strrep {n} {
-    if {$n < 16} {
-	return [format "%x" $n]
-    } elseif {$n < 256} {
-	return [format "x%.2x" $n]
-    } elseif {$n < 65536} {
-	return [format "y%.4x" $n]
-    }
-    return [format "z%.8x" $n]
-}
-
-# Procedures used in reordering commits from git log (without
-# --topo-order) into the order for display.
-
-proc varcinit {view} {
-    global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
-    global vtokmod varcmod vrowmod varcix vlastins
-
-    set varcstart($view) {{}}
-    set vupptr($view) {0}
-    set vdownptr($view) {0}
-    set vleftptr($view) {0}
-    set vbackptr($view) {0}
-    set varctok($view) {{}}
-    set varcrow($view) {{}}
-    set vtokmod($view) {}
-    set varcmod($view) 0
-    set vrowmod($view) 0
-    set varcix($view) {{}}
-    set vlastins($view) {0}
-}
-
-proc resetvarcs {view} {
-    global varcid varccommits parents children vseedcount ordertok
-    global vshortids
-
-    foreach vid [array names varcid $view,*] {
-	unset varcid($vid)
-	unset children($vid)
-	unset parents($vid)
-    }
-    foreach vid [array names vshortids $view,*] {
-	unset vshortids($vid)
-    }
-    # some commits might have children but haven't been seen yet
-    foreach vid [array names children $view,*] {
-	unset children($vid)
-    }
-    foreach va [array names varccommits $view,*] {
-	unset varccommits($va)
-    }
-    foreach vd [array names vseedcount $view,*] {
-	unset vseedcount($vd)
-    }
-    unset -nocomplain ordertok
-}
-
-# returns a list of the commits with no children
-proc seeds {v} {
-    global vdownptr vleftptr varcstart
-
-    set ret {}
-    set a [lindex $vdownptr($v) 0]
-    while {$a != 0} {
-	lappend ret [lindex $varcstart($v) $a]
-	set a [lindex $vleftptr($v) $a]
-    }
-    return $ret
-}
-
-proc newvarc {view id} {
-    global varcid varctok parents children vdatemode
-    global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
-    global commitdata commitinfo vseedcount varccommits vlastins
-
-    set a [llength $varctok($view)]
-    set vid $view,$id
-    if {[llength $children($vid)] == 0 || $vdatemode($view)} {
-	if {![info exists commitinfo($id)]} {
-	    parsecommit $id $commitdata($id) 1
-	}
-	set cdate [lindex [lindex $commitinfo($id) 4] 0]
-	if {![string is integer -strict $cdate]} {
-	    set cdate 0
-	}
-	if {![info exists vseedcount($view,$cdate)]} {
-	    set vseedcount($view,$cdate) -1
-	}
-	set c [incr vseedcount($view,$cdate)]
-	set cdate [expr {$cdate ^ 0xffffffff}]
-	set tok "s[strrep $cdate][strrep $c]"
-    } else {
-	set tok {}
-    }
-    set ka 0
-    if {[llength $children($vid)] > 0} {
-	set kid [lindex $children($vid) end]
-	set k $varcid($view,$kid)
-	if {[string compare [lindex $varctok($view) $k] $tok] > 0} {
-	    set ki $kid
-	    set ka $k
-	    set tok [lindex $varctok($view) $k]
-	}
-    }
-    if {$ka != 0} {
-	set i [lsearch -exact $parents($view,$ki) $id]
-	set j [expr {[llength $parents($view,$ki)] - 1 - $i}]
-	append tok [strrep $j]
-    }
-    set c [lindex $vlastins($view) $ka]
-    if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} {
-	set c $ka
-	set b [lindex $vdownptr($view) $ka]
-    } else {
-	set b [lindex $vleftptr($view) $c]
-    }
-    while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} {
-	set c $b
-	set b [lindex $vleftptr($view) $c]
-    }
-    if {$c == $ka} {
-	lset vdownptr($view) $ka $a
-	lappend vbackptr($view) 0
-    } else {
-	lset vleftptr($view) $c $a
-	lappend vbackptr($view) $c
-    }
-    lset vlastins($view) $ka $a
-    lappend vupptr($view) $ka
-    lappend vleftptr($view) $b
-    if {$b != 0} {
-	lset vbackptr($view) $b $a
-    }
-    lappend varctok($view) $tok
-    lappend varcstart($view) $id
-    lappend vdownptr($view) 0
-    lappend varcrow($view) {}
-    lappend varcix($view) {}
-    set varccommits($view,$a) {}
-    lappend vlastins($view) 0
-    return $a
-}
-
-proc splitvarc {p v} {
-    global varcid varcstart varccommits varctok vtokmod
-    global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
-
-    set oa $varcid($v,$p)
-    set otok [lindex $varctok($v) $oa]
-    set ac $varccommits($v,$oa)
-    set i [lsearch -exact $varccommits($v,$oa) $p]
-    if {$i <= 0} return
-    set na [llength $varctok($v)]
-    # "%" sorts before "0"...
-    set tok "$otok%[strrep $i]"
-    lappend varctok($v) $tok
-    lappend varcrow($v) {}
-    lappend varcix($v) {}
-    set varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]]
-    set varccommits($v,$na) [lrange $ac $i end]
-    lappend varcstart($v) $p
-    foreach id $varccommits($v,$na) {
-	set varcid($v,$id) $na
-    }
-    lappend vdownptr($v) [lindex $vdownptr($v) $oa]
-    lappend vlastins($v) [lindex $vlastins($v) $oa]
-    lset vdownptr($v) $oa $na
-    lset vlastins($v) $oa 0
-    lappend vupptr($v) $oa
-    lappend vleftptr($v) 0
-    lappend vbackptr($v) 0
-    for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {
-	lset vupptr($v) $b $na
-    }
-    if {[string compare $otok $vtokmod($v)] <= 0} {
-	modify_arc $v $oa
-    }
-}
-
-proc renumbervarc {a v} {
-    global parents children varctok varcstart varccommits
-    global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
-
-    set t1 [clock clicks -milliseconds]
-    set todo {}
-    set isrelated($a) 1
-    set kidchanged($a) 1
-    set ntot 0
-    while {$a != 0} {
-	if {[info exists isrelated($a)]} {
-	    lappend todo $a
-	    set id [lindex $varccommits($v,$a) end]
-	    foreach p $parents($v,$id) {
-		if {[info exists varcid($v,$p)]} {
-		    set isrelated($varcid($v,$p)) 1
-		}
-	    }
-	}
-	incr ntot
-	set b [lindex $vdownptr($v) $a]
-	if {$b == 0} {
-	    while {$a != 0} {
-		set b [lindex $vleftptr($v) $a]
-		if {$b != 0} break
-		set a [lindex $vupptr($v) $a]
-	    }
-	}
-	set a $b
-    }
-    foreach a $todo {
-	if {![info exists kidchanged($a)]} continue
-	set id [lindex $varcstart($v) $a]
-	if {[llength $children($v,$id)] > 1} {
-	    set children($v,$id) [lsort -command [list vtokcmp $v] \
-				      $children($v,$id)]
-	}
-	set oldtok [lindex $varctok($v) $a]
-	if {!$vdatemode($v)} {
-	    set tok {}
-	} else {
-	    set tok $oldtok
-	}
-	set ka 0
-	set kid [last_real_child $v,$id]
-	if {$kid ne {}} {
-	    set k $varcid($v,$kid)
-	    if {[string compare [lindex $varctok($v) $k] $tok] > 0} {
-		set ki $kid
-		set ka $k
-		set tok [lindex $varctok($v) $k]
-	    }
-	}
-	if {$ka != 0} {
-	    set i [lsearch -exact $parents($v,$ki) $id]
-	    set j [expr {[llength $parents($v,$ki)] - 1 - $i}]
-	    append tok [strrep $j]
-	}
-	if {$tok eq $oldtok} {
-	    continue
-	}
-	set id [lindex $varccommits($v,$a) end]
-	foreach p $parents($v,$id) {
-	    if {[info exists varcid($v,$p)]} {
-		set kidchanged($varcid($v,$p)) 1
-	    } else {
-		set sortkids($p) 1
-	    }
-	}
-	lset varctok($v) $a $tok
-	set b [lindex $vupptr($v) $a]
-	if {$b != $ka} {
-	    if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {
-		modify_arc $v $ka
-	    }
-	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
-		modify_arc $v $b
-	    }
-	    set c [lindex $vbackptr($v) $a]
-	    set d [lindex $vleftptr($v) $a]
-	    if {$c == 0} {
-		lset vdownptr($v) $b $d
-	    } else {
-		lset vleftptr($v) $c $d
-	    }
-	    if {$d != 0} {
-		lset vbackptr($v) $d $c
-	    }
-	    if {[lindex $vlastins($v) $b] == $a} {
-		lset vlastins($v) $b $c
-	    }
-	    lset vupptr($v) $a $ka
-	    set c [lindex $vlastins($v) $ka]
-	    if {$c == 0 || \
-		    [string compare $tok [lindex $varctok($v) $c]] < 0} {
-		set c $ka
-		set b [lindex $vdownptr($v) $ka]
-	    } else {
-		set b [lindex $vleftptr($v) $c]
-	    }
-	    while {$b != 0 && \
-		      [string compare $tok [lindex $varctok($v) $b]] >= 0} {
-		set c $b
-		set b [lindex $vleftptr($v) $c]
-	    }
-	    if {$c == $ka} {
- 		lset vdownptr($v) $ka $a
-		lset vbackptr($v) $a 0
-	    } else {
-		lset vleftptr($v) $c $a
-		lset vbackptr($v) $a $c
-	    }
-	    lset vleftptr($v) $a $b
-	    if {$b != 0} {
-		lset vbackptr($v) $b $a
-	    }
-	    lset vlastins($v) $ka $a
-	}
-    }
-    foreach id [array names sortkids] {
-	if {[llength $children($v,$id)] > 1} {
-	    set children($v,$id) [lsort -command [list vtokcmp $v] \
-				      $children($v,$id)]
-	}
-    }
-    set t2 [clock clicks -milliseconds]
-    #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
-}
-
-# Fix up the graph after we have found out that in view $v,
-# $p (a commit that we have already seen) is actually the parent
-# of the last commit in arc $a.
-proc fix_reversal {p a v} {
-    global varcid varcstart varctok vupptr
-
-    set pa $varcid($v,$p)
-    if {$p ne [lindex $varcstart($v) $pa]} {
-	splitvarc $p $v
-	set pa $varcid($v,$p)
-    }
-    # seeds always need to be renumbered
-    if {[lindex $vupptr($v) $pa] == 0 ||
-	[string compare [lindex $varctok($v) $a] \
-	     [lindex $varctok($v) $pa]] > 0} {
-	renumbervarc $pa $v
-    }
-}
-
-proc insertrow {id p v} {
-    global cmitlisted children parents varcid varctok vtokmod
-    global varccommits ordertok commitidx numcommits curview
-    global targetid targetrow vshortids
-
-    readcommit $id
-    set vid $v,$id
-    set cmitlisted($vid) 1
-    set children($vid) {}
-    set parents($vid) [list $p]
-    set a [newvarc $v $id]
-    set varcid($vid) $a
-    lappend vshortids($v,[string range $id 0 3]) $id
-    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} {
-	modify_arc $v $a
-    }
-    lappend varccommits($v,$a) $id
-    set vp $v,$p
-    if {[llength [lappend children($vp) $id]] > 1} {
-	set children($vp) [lsort -command [list vtokcmp $v] $children($vp)]
-	unset -nocomplain ordertok
-    }
-    fix_reversal $p $a $v
-    incr commitidx($v)
-    if {$v == $curview} {
-	set numcommits $commitidx($v)
-	setcanvscroll
-	if {[info exists targetid]} {
-	    if {![comes_before $targetid $p]} {
-		incr targetrow
-	    }
-	}
-    }
-}
-
-proc insertfakerow {id p} {
-    global varcid varccommits parents children cmitlisted
-    global commitidx varctok vtokmod targetid targetrow curview numcommits
-
-    set v $curview
-    set a $varcid($v,$p)
-    set i [lsearch -exact $varccommits($v,$a) $p]
-    if {$i < 0} {
-	puts "oops: insertfakerow can't find [shortids $p] on arc $a"
-	return
-    }
-    set children($v,$id) {}
-    set parents($v,$id) [list $p]
-    set varcid($v,$id) $a
-    lappend children($v,$p) $id
-    set cmitlisted($v,$id) 1
-    set numcommits [incr commitidx($v)]
-    # note we deliberately don't update varcstart($v) even if $i == 0
-    set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]
-    modify_arc $v $a $i
-    if {[info exists targetid]} {
-	if {![comes_before $targetid $p]} {
-	    incr targetrow
-	}
-    }
-    setcanvscroll
-    drawvisible
-}
-
-proc removefakerow {id} {
-    global varcid varccommits parents children commitidx
-    global varctok vtokmod cmitlisted currentid selectedline
-    global targetid curview numcommits
-
-    set v $curview
-    if {[llength $parents($v,$id)] != 1} {
-	puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
-	return
-    }
-    set p [lindex $parents($v,$id) 0]
-    set a $varcid($v,$id)
-    set i [lsearch -exact $varccommits($v,$a) $id]
-    if {$i < 0} {
-	puts "oops: removefakerow can't find [shortids $id] on arc $a"
-	return
-    }
-    unset varcid($v,$id)
-    set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i]
-    unset parents($v,$id)
-    unset children($v,$id)
-    unset cmitlisted($v,$id)
-    set numcommits [incr commitidx($v) -1]
-    set j [lsearch -exact $children($v,$p) $id]
-    if {$j >= 0} {
-	set children($v,$p) [lreplace $children($v,$p) $j $j]
-    }
-    modify_arc $v $a $i
-    if {[info exist currentid] && $id eq $currentid} {
-	unset currentid
-	set selectedline {}
-    }
-    if {[info exists targetid] && $targetid eq $id} {
-	set targetid $p
-    }
-    setcanvscroll
-    drawvisible
-}
-
-proc real_children {vp} {
-    global children nullid nullid2
-
-    set kids {}
-    foreach id $children($vp) {
-	if {$id ne $nullid && $id ne $nullid2} {
-	    lappend kids $id
-	}
-    }
-    return $kids
-}
-
-proc first_real_child {vp} {
-    global children nullid nullid2
-
-    foreach id $children($vp) {
-	if {$id ne $nullid && $id ne $nullid2} {
-	    return $id
-	}
-    }
-    return {}
-}
-
-proc last_real_child {vp} {
-    global children nullid nullid2
-
-    set kids $children($vp)
-    for {set i [llength $kids]} {[incr i -1] >= 0} {} {
-	set id [lindex $kids $i]
-	if {$id ne $nullid && $id ne $nullid2} {
-	    return $id
-	}
-    }
-    return {}
-}
-
-proc vtokcmp {v a b} {
-    global varctok varcid
-
-    return [string compare [lindex $varctok($v) $varcid($v,$a)] \
-		[lindex $varctok($v) $varcid($v,$b)]]
-}
-
-# This assumes that if lim is not given, the caller has checked that
-# arc a's token is less than $vtokmod($v)
-proc modify_arc {v a {lim {}}} {
-    global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
-
-    if {$lim ne {}} {
-	set c [string compare [lindex $varctok($v) $a] $vtokmod($v)]
-	if {$c > 0} return
-	if {$c == 0} {
-	    set r [lindex $varcrow($v) $a]
-	    if {$r ne {} && $vrowmod($v) <= $r + $lim} return
-	}
-    }
-    set vtokmod($v) [lindex $varctok($v) $a]
-    set varcmod($v) $a
-    if {$v == $curview} {
-	while {$a != 0 && [lindex $varcrow($v) $a] eq {}} {
-	    set a [lindex $vupptr($v) $a]
-	    set lim {}
-	}
-	set r 0
-	if {$a != 0} {
-	    if {$lim eq {}} {
-		set lim [llength $varccommits($v,$a)]
-	    }
-	    set r [expr {[lindex $varcrow($v) $a] + $lim}]
-	}
-	set vrowmod($v) $r
-	undolayout $r
-    }
-}
-
-proc update_arcrows {v} {
-    global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
-    global varcid vrownum varcorder varcix varccommits
-    global vupptr vdownptr vleftptr varctok
-    global displayorder parentlist curview cached_commitrow
-
-    if {$vrowmod($v) == $commitidx($v)} return
-    if {$v == $curview} {
-	if {[llength $displayorder] > $vrowmod($v)} {
-	    set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]
-	    set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]
-	}
-	unset -nocomplain cached_commitrow
-    }
-    set narctot [expr {[llength $varctok($v)] - 1}]
-    set a $varcmod($v)
-    while {$a != 0 && [lindex $varcix($v) $a] eq {}} {
-	# go up the tree until we find something that has a row number,
-	# or we get to a seed
-	set a [lindex $vupptr($v) $a]
-    }
-    if {$a == 0} {
-	set a [lindex $vdownptr($v) 0]
-	if {$a == 0} return
-	set vrownum($v) {0}
-	set varcorder($v) [list $a]
-	lset varcix($v) $a 0
-	lset varcrow($v) $a 0
-	set arcn 0
-	set row 0
-    } else {
-	set arcn [lindex $varcix($v) $a]
-	if {[llength $vrownum($v)] > $arcn + 1} {
-	    set vrownum($v) [lrange $vrownum($v) 0 $arcn]
-	    set varcorder($v) [lrange $varcorder($v) 0 $arcn]
-	}
-	set row [lindex $varcrow($v) $a]
-    }
-    while {1} {
-	set p $a
-	incr row [llength $varccommits($v,$a)]
-	# go down if possible
-	set b [lindex $vdownptr($v) $a]
-	if {$b == 0} {
-	    # if not, go left, or go up until we can go left
-	    while {$a != 0} {
-		set b [lindex $vleftptr($v) $a]
-		if {$b != 0} break
-		set a [lindex $vupptr($v) $a]
-	    }
-	    if {$a == 0} break
-	}
-	set a $b
-	incr arcn
-	lappend vrownum($v) $row
-	lappend varcorder($v) $a
-	lset varcix($v) $a $arcn
-	lset varcrow($v) $a $row
-    }
-    set vtokmod($v) [lindex $varctok($v) $p]
-    set varcmod($v) $p
-    set vrowmod($v) $row
-    if {[info exists currentid]} {
-	set selectedline [rowofcommit $currentid]
-    }
-}
-
-# Test whether view $v contains commit $id
-proc commitinview {id v} {
-    global varcid
-
-    return [info exists varcid($v,$id)]
-}
-
-# Return the row number for commit $id in the current view
-proc rowofcommit {id} {
-    global varcid varccommits varcrow curview cached_commitrow
-    global varctok vtokmod
-
-    set v $curview
-    if {![info exists varcid($v,$id)]} {
-	puts "oops rowofcommit no arc for [shortids $id]"
-	return {}
-    }
-    set a $varcid($v,$id)
-    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {
-	update_arcrows $v
-    }
-    if {[info exists cached_commitrow($id)]} {
-	return $cached_commitrow($id)
-    }
-    set i [lsearch -exact $varccommits($v,$a) $id]
-    if {$i < 0} {
-	puts "oops didn't find commit [shortids $id] in arc $a"
-	return {}
-    }
-    incr i [lindex $varcrow($v) $a]
-    set cached_commitrow($id) $i
-    return $i
-}
-
-# Returns 1 if a is on an earlier row than b, otherwise 0
-proc comes_before {a b} {
-    global varcid varctok curview
-
-    set v $curview
-    if {$a eq $b || ![info exists varcid($v,$a)] || \
-	    ![info exists varcid($v,$b)]} {
-	return 0
-    }
-    if {$varcid($v,$a) != $varcid($v,$b)} {
-	return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \
-			   [lindex $varctok($v) $varcid($v,$b)]] < 0}]
-    }
-    return [expr {[rowofcommit $a] < [rowofcommit $b]}]
-}
-
-proc bsearch {l elt} {
-    if {[llength $l] == 0 || $elt <= [lindex $l 0]} {
-	return 0
-    }
-    set lo 0
-    set hi [llength $l]
-    while {$hi - $lo > 1} {
-	set mid [expr {int(($lo + $hi) / 2)}]
-	set t [lindex $l $mid]
-	if {$elt < $t} {
-	    set hi $mid
-	} elseif {$elt > $t} {
-	    set lo $mid
-	} else {
-	    return $mid
-	}
-    }
-    return $lo
-}
-
-# Make sure rows $start..$end-1 are valid in displayorder and parentlist
-proc make_disporder {start end} {
-    global vrownum curview commitidx displayorder parentlist
-    global varccommits varcorder parents vrowmod varcrow
-    global d_valid_start d_valid_end
-
-    if {$end > $vrowmod($curview)} {
-	update_arcrows $curview
-    }
-    set ai [bsearch $vrownum($curview) $start]
-    set start [lindex $vrownum($curview) $ai]
-    set narc [llength $vrownum($curview)]
-    for {set r $start} {$ai < $narc && $r < $end} {incr ai} {
-	set a [lindex $varcorder($curview) $ai]
-	set l [llength $displayorder]
-	set al [llength $varccommits($curview,$a)]
-	if {$l < $r + $al} {
-	    if {$l < $r} {
-		set pad [ntimes [expr {$r - $l}] {}]
-		set displayorder [concat $displayorder $pad]
-		set parentlist [concat $parentlist $pad]
-	    } elseif {$l > $r} {
-		set displayorder [lrange $displayorder 0 [expr {$r - 1}]]
-		set parentlist [lrange $parentlist 0 [expr {$r - 1}]]
-	    }
-	    foreach id $varccommits($curview,$a) {
-		lappend displayorder $id
-		lappend parentlist $parents($curview,$id)
-	    }
-	} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
-	    set i $r
-	    foreach id $varccommits($curview,$a) {
-		lset displayorder $i $id
-		lset parentlist $i $parents($curview,$id)
-		incr i
-	    }
-	}
-	incr r $al
-    }
-}
-
-proc commitonrow {row} {
-    global displayorder
-
-    set id [lindex $displayorder $row]
-    if {$id eq {}} {
-	make_disporder $row [expr {$row + 1}]
-	set id [lindex $displayorder $row]
-    }
-    return $id
-}
-
-proc closevarcs {v} {
-    global varctok varccommits varcid parents children
-    global cmitlisted commitidx vtokmod curview numcommits
-
-    set missing_parents 0
-    set scripts {}
-    set narcs [llength $varctok($v)]
-    for {set a 1} {$a < $narcs} {incr a} {
-	set id [lindex $varccommits($v,$a) end]
-	foreach p $parents($v,$id) {
-	    if {[info exists varcid($v,$p)]} continue
-	    # add p as a new commit
-	    incr missing_parents
-	    set cmitlisted($v,$p) 0
-	    set parents($v,$p) {}
-	    if {[llength $children($v,$p)] == 1 &&
-		[llength $parents($v,$id)] == 1} {
-		set b $a
-	    } else {
-		set b [newvarc $v $p]
-	    }
-	    set varcid($v,$p) $b
-	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
-		modify_arc $v $b
-	    }
-	    lappend varccommits($v,$b) $p
-	    incr commitidx($v)
-	    if {$v == $curview} {
-		set numcommits $commitidx($v)
-	    }
-	    set scripts [check_interest $p $scripts]
-	}
-    }
-    if {$missing_parents > 0} {
-	foreach s $scripts {
-	    eval $s
-	}
-    }
-}
-
-# Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
-# Assumes we already have an arc for $rwid.
-proc rewrite_commit {v id rwid} {
-    global children parents varcid varctok vtokmod varccommits
-
-    foreach ch $children($v,$id) {
-	# make $rwid be $ch's parent in place of $id
-	set i [lsearch -exact $parents($v,$ch) $id]
-	if {$i < 0} {
-	    puts "oops rewrite_commit didn't find $id in parent list for $ch"
-	}
-	set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid]
-	# add $ch to $rwid's children and sort the list if necessary
-	if {[llength [lappend children($v,$rwid) $ch]] > 1} {
-	    set children($v,$rwid) [lsort -command [list vtokcmp $v] \
-					$children($v,$rwid)]
-	}
-	# fix the graph after joining $id to $rwid
-	set a $varcid($v,$ch)
-	fix_reversal $rwid $a $v
-	# parentlist is wrong for the last element of arc $a
-	# even if displayorder is right, hence the 3rd arg here
-	modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}]
-    }
-}
-
-# Mechanism for registering a command to be executed when we come
-# across a particular commit.  To handle the case when only the
-# prefix of the commit is known, the commitinterest array is now
-# indexed by the first 4 characters of the ID.  Each element is a
-# list of id, cmd pairs.
-proc interestedin {id cmd} {
-    global commitinterest
-
-    lappend commitinterest([string range $id 0 3]) $id $cmd
-}
-
-proc check_interest {id scripts} {
-    global commitinterest
-
-    set prefix [string range $id 0 3]
-    if {[info exists commitinterest($prefix)]} {
-	set newlist {}
-	foreach {i script} $commitinterest($prefix) {
-	    if {[string match "$i*" $id]} {
-		lappend scripts [string map [list "%I" $id "%P" $i] $script]
-	    } else {
-		lappend newlist $i $script
-	    }
-	}
-	if {$newlist ne {}} {
-	    set commitinterest($prefix) $newlist
-	} else {
-	    unset commitinterest($prefix)
-	}
-    }
-    return $scripts
-}
-
-proc getcommitlines {fd inst view updating}  {
-    global cmitlisted leftover
-    global commitidx commitdata vdatemode
-    global parents children curview hlview
-    global idpending ordertok
-    global varccommits varcid varctok vtokmod vfilelimit vshortids
-
-    set stuff [read $fd 500000]
-    # git log doesn't terminate the last commit with a null...
-    if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {
-	set stuff "\0"
-    }
-    if {$stuff == {}} {
-	if {![eof $fd]} {
-	    return 1
-	}
-	global commfd viewcomplete viewactive viewname
-	global viewinstances
-	unset commfd($inst)
-	set i [lsearch -exact $viewinstances($view) $inst]
-	if {$i >= 0} {
-	    set viewinstances($view) [lreplace $viewinstances($view) $i $i]
-	}
-	# set it blocking so we wait for the process to terminate
-	fconfigure $fd -blocking 1
-	if {[catch {close $fd} err]} {
-	    set fv {}
-	    if {$view != $curview} {
-		set fv " for the \"$viewname($view)\" view"
-	    }
-	    if {[string range $err 0 4] == "usage"} {
-		set err "Gitk: error reading commits$fv:\
-			bad arguments to git log."
-		if {$viewname($view) eq [mc "Command line"]} {
-		    append err \
-			"  (Note: arguments to gitk are passed to git log\
-			 to allow selection of commits to be displayed.)"
-		}
-	    } else {
-		set err "Error reading commits$fv: $err"
-	    }
-	    error_popup $err
-	}
-	if {[incr viewactive($view) -1] <= 0} {
-	    set viewcomplete($view) 1
-	    # Check if we have seen any ids listed as parents that haven't
-	    # appeared in the list
-	    closevarcs $view
-	    notbusy $view
-	}
-	if {$view == $curview} {
-	    run chewcommits
-	}
-	return 0
-    }
-    set start 0
-    set gotsome 0
-    set scripts {}
-    while 1 {
-	set i [string first "\0" $stuff $start]
-	if {$i < 0} {
-	    append leftover($inst) [string range $stuff $start end]
-	    break
-	}
-	if {$start == 0} {
-	    set cmit $leftover($inst)
-	    append cmit [string range $stuff 0 [expr {$i - 1}]]
-	    set leftover($inst) {}
-	} else {
-	    set cmit [string range $stuff $start [expr {$i - 1}]]
-	}
-	set start [expr {$i + 1}]
-	set j [string first "\n" $cmit]
-	set ok 0
-	set listed 1
-	if {$j >= 0 && [string match "commit *" $cmit]} {
-	    set ids [string range $cmit 7 [expr {$j - 1}]]
-	    if {[string match {[-^<>]*} $ids]} {
-		switch -- [string index $ids 0] {
-		    "-" {set listed 0}
-		    "^" {set listed 2}
-		    "<" {set listed 3}
-		    ">" {set listed 4}
-		}
-		set ids [string range $ids 1 end]
-	    }
-	    set ok 1
-	    foreach id $ids {
-		if {[string length $id] != 40} {
-		    set ok 0
-		    break
-		}
-	    }
-	}
-	if {!$ok} {
-	    set shortcmit $cmit
-	    if {[string length $shortcmit] > 80} {
-		set shortcmit "[string range $shortcmit 0 80]..."
-	    }
-	    error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
-	    exit 1
-	}
-	set id [lindex $ids 0]
-	set vid $view,$id
-
-	lappend vshortids($view,[string range $id 0 3]) $id
-
-	if {!$listed && $updating && ![info exists varcid($vid)] &&
-	    $vfilelimit($view) ne {}} {
-	    # git log doesn't rewrite parents for unlisted commits
-	    # when doing path limiting, so work around that here
-	    # by working out the rewritten parent with git rev-list
-	    # and if we already know about it, using the rewritten
-	    # parent as a substitute parent for $id's children.
-	    if {![catch {
-		set rwid [exec git rev-list --first-parent --max-count=1 \
-			      $id -- $vfilelimit($view)]
-	    }]} {
-		if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
-		    # use $rwid in place of $id
-		    rewrite_commit $view $id $rwid
-		    continue
-		}
-	    }
-	}
-
-	set a 0
-	if {[info exists varcid($vid)]} {
-	    if {$cmitlisted($vid) || !$listed} continue
-	    set a $varcid($vid)
-	}
-	if {$listed} {
-	    set olds [lrange $ids 1 end]
-	} else {
-	    set olds {}
-	}
-	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
-	set cmitlisted($vid) $listed
-	set parents($vid) $olds
-	if {![info exists children($vid)]} {
-	    set children($vid) {}
-	} elseif {$a == 0 && [llength $children($vid)] == 1} {
-	    set k [lindex $children($vid) 0]
-	    if {[llength $parents($view,$k)] == 1 &&
-		(!$vdatemode($view) ||
-		 $varcid($view,$k) == [llength $varctok($view)] - 1)} {
-		set a $varcid($view,$k)
-	    }
-	}
-	if {$a == 0} {
-	    # new arc
-	    set a [newvarc $view $id]
-	}
-	if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {
-	    modify_arc $view $a
-	}
-	if {![info exists varcid($vid)]} {
-	    set varcid($vid) $a
-	    lappend varccommits($view,$a) $id
-	    incr commitidx($view)
-	}
-
-	set i 0
-	foreach p $olds {
-	    if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
-		set vp $view,$p
-		if {[llength [lappend children($vp) $id]] > 1 &&
-		    [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {
-		    set children($vp) [lsort -command [list vtokcmp $view] \
-					   $children($vp)]
-		    unset -nocomplain ordertok
-		}
-		if {[info exists varcid($view,$p)]} {
-		    fix_reversal $p $a $view
-		}
-	    }
-	    incr i
-	}
-
-	set scripts [check_interest $id $scripts]
-	set gotsome 1
-    }
-    if {$gotsome} {
-	global numcommits hlview
-
-	if {$view == $curview} {
-	    set numcommits $commitidx($view)
-	    run chewcommits
-	}
-	if {[info exists hlview] && $view == $hlview} {
-	    # we never actually get here...
-	    run vhighlightmore
-	}
-	foreach s $scripts {
-	    eval $s
-	}
-    }
-    return 2
-}
-
-proc chewcommits {} {
-    global curview hlview viewcomplete
-    global pending_select
-
-    layoutmore
-    if {$viewcomplete($curview)} {
-	global commitidx varctok
-	global numcommits startmsecs
-
-	if {[info exists pending_select]} {
-	    update
-	    reset_pending_select {}
-
-	    if {[commitinview $pending_select $curview]} {
-		selectline [rowofcommit $pending_select] 1
-	    } else {
-		set row [first_real_row]
-		selectline $row 1
-	    }
-	}
-	if {$commitidx($curview) > 0} {
-	    #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
-	    #puts "overall $ms ms for $numcommits commits"
-	    #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
-	} else {
-	    show_status [mc "No commits selected"]
-	}
-	notbusy layout
-    }
-    return 0
-}
-
-proc do_readcommit {id} {
-    global tclencoding
-
-    # Invoke git-log to handle automatic encoding conversion
-    set fd [open [concat | git log --no-color --pretty=raw -1 $id] r]
-    # Read the results using i18n.logoutputencoding
-    fconfigure $fd -translation lf -eofchar {}
-    if {$tclencoding != {}} {
-	fconfigure $fd -encoding $tclencoding
-    }
-    set contents [read $fd]
-    close $fd
-    # Remove the heading line
-    regsub {^commit [0-9a-f]+\n} $contents {} contents
-
-    return $contents
-}
-
-proc readcommit {id} {
-    if {[catch {set contents [do_readcommit $id]}]} return
-    parsecommit $id $contents 1
-}
-
-proc parsecommit {id contents listed} {
-    global commitinfo
-
-    set inhdr 1
-    set comment {}
-    set headline {}
-    set auname {}
-    set audate {}
-    set comname {}
-    set comdate {}
-    set hdrend [string first "\n\n" $contents]
-    if {$hdrend < 0} {
-	# should never happen...
-	set hdrend [string length $contents]
-    }
-    set header [string range $contents 0 [expr {$hdrend - 1}]]
-    set comment [string range $contents [expr {$hdrend + 2}] end]
-    foreach line [split $header "\n"] {
-	set line [split $line " "]
-	set tag [lindex $line 0]
-	if {$tag == "author"} {
-	    set audate [lrange $line end-1 end]
-	    set auname [join [lrange $line 1 end-2] " "]
-	} elseif {$tag == "committer"} {
-	    set comdate [lrange $line end-1 end]
-	    set comname [join [lrange $line 1 end-2] " "]
-	}
-    }
-    set headline {}
-    # take the first non-blank line of the comment as the headline
-    set headline [string trimleft $comment]
-    set i [string first "\n" $headline]
-    if {$i >= 0} {
-	set headline [string range $headline 0 $i]
-    }
-    set headline [string trimright $headline]
-    set i [string first "\r" $headline]
-    if {$i >= 0} {
-	set headline [string trimright [string range $headline 0 $i]]
-    }
-    if {!$listed} {
-	# git log indents the comment by 4 spaces;
-	# if we got this via git cat-file, add the indentation
-	set newcomment {}
-	foreach line [split $comment "\n"] {
-	    append newcomment "    "
-	    append newcomment $line
-	    append newcomment "\n"
-	}
-	set comment $newcomment
-    }
-    set hasnote [string first "\nNotes:\n" $contents]
-    set diff ""
-    # If there is diff output shown in the git-log stream, split it
-    # out.  But get rid of the empty line that always precedes the
-    # diff.
-    set i [string first "\n\ndiff" $comment]
-    if {$i >= 0} {
-	set diff [string range $comment $i+1 end]
-	set comment [string range $comment 0 $i-1]
-    }
-    set commitinfo($id) [list $headline $auname $audate \
-			     $comname $comdate $comment $hasnote $diff]
-}
-
-proc getcommit {id} {
-    global commitdata commitinfo
-
-    if {[info exists commitdata($id)]} {
-	parsecommit $id $commitdata($id) 1
-    } else {
-	readcommit $id
-	if {![info exists commitinfo($id)]} {
-	    set commitinfo($id) [list [mc "No commit information available"]]
-	}
-    }
-    return 1
-}
-
-# Expand an abbreviated commit ID to a list of full 40-char IDs that match
-# and are present in the current view.
-# This is fairly slow...
-proc longid {prefix} {
-    global varcid curview vshortids
-
-    set ids {}
-    if {[string length $prefix] >= 4} {
-	set vshortid $curview,[string range $prefix 0 3]
-	if {[info exists vshortids($vshortid)]} {
-	    foreach id $vshortids($vshortid) {
-		if {[string match "$prefix*" $id]} {
-		    if {[lsearch -exact $ids $id] < 0} {
-			lappend ids $id
-			if {[llength $ids] >= 2} break
-		    }
-		}
-	    }
-	}
-    } else {
-	foreach match [array names varcid "$curview,$prefix*"] {
-	    lappend ids [lindex [split $match ","] 1]
-	    if {[llength $ids] >= 2} break
-	}
-    }
-    return $ids
-}
-
-proc readrefs {} {
-    global tagids idtags headids idheads tagobjid
-    global otherrefids idotherrefs mainhead mainheadid
-    global selecthead selectheadid
-    global hideremotes
-
-    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
-	unset -nocomplain $v
-    }
-    set refd [open [list | git show-ref -d] r]
-    while {[gets $refd line] >= 0} {
-	if {[string index $line 40] ne " "} continue
-	set id [string range $line 0 39]
-	set ref [string range $line 41 end]
-	if {![string match "refs/*" $ref]} continue
-	set name [string range $ref 5 end]
-	if {[string match "remotes/*" $name]} {
-	    if {![string match "*/HEAD" $name] && !$hideremotes} {
-		set headids($name) $id
-		lappend idheads($id) $name
-	    }
-	} elseif {[string match "heads/*" $name]} {
-	    set name [string range $name 6 end]
-	    set headids($name) $id
-	    lappend idheads($id) $name
-	} elseif {[string match "tags/*" $name]} {
-	    # this lets refs/tags/foo^{} overwrite refs/tags/foo,
-	    # which is what we want since the former is the commit ID
-	    set name [string range $name 5 end]
-	    if {[string match "*^{}" $name]} {
-		set name [string range $name 0 end-3]
-	    } else {
-		set tagobjid($name) $id
-	    }
-	    set tagids($name) $id
-	    lappend idtags($id) $name
-	} else {
-	    set otherrefids($name) $id
-	    lappend idotherrefs($id) $name
-	}
-    }
-    catch {close $refd}
-    set mainhead {}
-    set mainheadid {}
-    catch {
-	set mainheadid [exec git rev-parse HEAD]
-	set thehead [exec git symbolic-ref HEAD]
-	if {[string match "refs/heads/*" $thehead]} {
-	    set mainhead [string range $thehead 11 end]
-	}
-    }
-    set selectheadid {}
-    if {$selecthead ne {}} {
-	catch {
-	    set selectheadid [exec git rev-parse --verify $selecthead]
-	}
-    }
-}
-
-# skip over fake commits
-proc first_real_row {} {
-    global nullid nullid2 numcommits
-
-    for {set row 0} {$row < $numcommits} {incr row} {
-	set id [commitonrow $row]
-	if {$id ne $nullid && $id ne $nullid2} {
-	    break
-	}
-    }
-    return $row
-}
-
-# update things for a head moved to a child of its previous location
-proc movehead {id name} {
-    global headids idheads
-
-    removehead $headids($name) $name
-    set headids($name) $id
-    lappend idheads($id) $name
-}
-
-# update things when a head has been removed
-proc removehead {id name} {
-    global headids idheads
-
-    if {$idheads($id) eq $name} {
-	unset idheads($id)
-    } else {
-	set i [lsearch -exact $idheads($id) $name]
-	if {$i >= 0} {
-	    set idheads($id) [lreplace $idheads($id) $i $i]
-	}
-    }
-    unset headids($name)
-}
-
-proc ttk_toplevel {w args} {
-    global use_ttk
-    eval [linsert $args 0 ::toplevel $w]
-    if {$use_ttk} {
-        place [ttk::frame $w._toplevel_background] -x 0 -y 0 -relwidth 1 -relheight 1
-    }
-    return $w
-}
-
-proc make_transient {window origin} {
-    global have_tk85
-
-    # In MacOS Tk 8.4 transient appears to work by setting
-    # overrideredirect, which is utterly useless, since the
-    # windows get no border, and are not even kept above
-    # the parent.
-    if {!$have_tk85 && [tk windowingsystem] eq {aqua}} return
-
-    wm transient $window $origin
-
-    # Windows fails to place transient windows normally, so
-    # schedule a callback to center them on the parent.
-    if {[tk windowingsystem] eq {win32}} {
-	after idle [list tk::PlaceWindow $window widget $origin]
-    }
-}
-
-proc show_error {w top msg} {
-    global NS
-    if {![info exists NS]} {set NS ""}
-    if {[wm state $top] eq "withdrawn"} { wm deiconify $top }
-    message $w.m -text $msg -justify center -aspect 400
-    pack $w.m -side top -fill x -padx 20 -pady 20
-    ${NS}::button $w.ok -default active -text [mc OK] -command "destroy $top"
-    pack $w.ok -side bottom -fill x
-    bind $top <Visibility> "grab $top; focus $top"
-    bind $top <Key-Return> "destroy $top"
-    bind $top <Key-space>  "destroy $top"
-    bind $top <Key-Escape> "destroy $top"
-    tkwait window $top
-}
-
-proc error_popup {msg {owner .}} {
-    if {[tk windowingsystem] eq "win32"} {
-        tk_messageBox -icon error -type ok -title [wm title .] \
-            -parent $owner -message $msg
-    } else {
-        set w .error
-        ttk_toplevel $w
-        make_transient $w $owner
-        show_error $w $w $msg
-    }
-}
-
-proc confirm_popup {msg {owner .}} {
-    global confirm_ok NS
-    set confirm_ok 0
-    set w .confirm
-    ttk_toplevel $w
-    make_transient $w $owner
-    message $w.m -text $msg -justify center -aspect 400
-    pack $w.m -side top -fill x -padx 20 -pady 20
-    ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
-    pack $w.ok -side left -fill x
-    ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w"
-    pack $w.cancel -side right -fill x
-    bind $w <Visibility> "grab $w; focus $w"
-    bind $w <Key-Return> "set confirm_ok 1; destroy $w"
-    bind $w <Key-space>  "set confirm_ok 1; destroy $w"
-    bind $w <Key-Escape> "destroy $w"
-    tk::PlaceWindow $w widget $owner
-    tkwait window $w
-    return $confirm_ok
-}
-
-proc setoptions {} {
-    global use_ttk
-
-    if {[tk windowingsystem] ne "win32"} {
-        option add *Panedwindow.showHandle 1 startupFile
-        option add *Panedwindow.sashRelief raised startupFile
-        if {[tk windowingsystem] ne "aqua"} {
-            option add *Menu.font uifont startupFile
-        }
-    } else {
-        option add *Menu.TearOff 0 startupFile
-    }
-    option add *Button.font uifont startupFile
-    option add *Checkbutton.font uifont startupFile
-    option add *Radiobutton.font uifont startupFile
-    option add *Menubutton.font uifont startupFile
-    option add *Label.font uifont startupFile
-    option add *Message.font uifont startupFile
-    option add *Entry.font textfont startupFile
-    option add *Text.font textfont startupFile
-    option add *Labelframe.font uifont startupFile
-    option add *Spinbox.font textfont startupFile
-    option add *Listbox.font mainfont startupFile
-}
-
-proc setttkstyle {} {
-    eval font configure TkDefaultFont [fontflags mainfont]
-    eval font configure TkTextFont [fontflags textfont]
-    eval font configure TkHeadingFont [fontflags mainfont]
-    eval font configure TkCaptionFont [fontflags mainfont] -weight bold
-    eval font configure TkTooltipFont [fontflags uifont]
-    eval font configure TkFixedFont   [fontflags textfont]
-    eval font configure TkIconFont    [fontflags uifont]
-    eval font configure TkMenuFont    [fontflags uifont]
-    eval font configure TkSmallCaptionFont [fontflags uifont]
-}
-
-# Make a menu and submenus.
-# m is the window name for the menu, items is the list of menu items to add.
-# Each item is a list {mc label type description options...}
-# mc is ignored; it's so we can put mc there to alert xgettext
-# label is the string that appears in the menu
-# type is cascade, command or radiobutton (should add checkbutton)
-# description depends on type; it's the sublist for cascade, the
-# command to invoke for command, or {variable value} for radiobutton
-proc makemenu {m items} {
-    menu $m
-    if {[tk windowingsystem] eq {aqua}} {
-	set Meta1 Cmd
-    } else {
-	set Meta1 Ctrl
-    }
-    foreach i $items {
-	set name [mc [lindex $i 1]]
-	set type [lindex $i 2]
-	set thing [lindex $i 3]
-	set params [list $type]
-	if {$name ne {}} {
-	    set u [string first "&" [string map {&& x} $name]]
-	    lappend params -label [string map {&& & & {}} $name]
-	    if {$u >= 0} {
-		lappend params -underline $u
-	    }
-	}
-	switch -- $type {
-	    "cascade" {
-		set submenu [string tolower [string map {& ""} [lindex $i 1]]]
-		lappend params -menu $m.$submenu
-	    }
-	    "command" {
-		lappend params -command $thing
-	    }
-	    "radiobutton" {
-		lappend params -variable [lindex $thing 0] \
-		    -value [lindex $thing 1]
-	    }
-	}
-	set tail [lrange $i 4 end]
-	regsub -all {\yMeta1\y} $tail $Meta1 tail
-	eval $m add $params $tail
-	if {$type eq "cascade"} {
-	    makemenu $m.$submenu $thing
-	}
-    }
-}
-
-# translate string and remove ampersands
-proc mca {str} {
-    return [string map {&& & & {}} [mc $str]]
-}
-
-proc cleardropsel {w} {
-    $w selection clear
-}
-proc makedroplist {w varname args} {
-    global use_ttk
-    if {$use_ttk} {
-        set width 0
-        foreach label $args {
-            set cx [string length $label]
-            if {$cx > $width} {set width $cx}
-        }
-	set gm [ttk::combobox $w -width $width -state readonly\
-		    -textvariable $varname -values $args \
-		    -exportselection false]
-	bind $gm <<ComboboxSelected>> [list $gm selection clear]
-    } else {
-	set gm [eval [linsert $args 0 tk_optionMenu $w $varname]]
-    }
-    return $gm
-}
-
-proc makewindow {} {
-    global canv canv2 canv3 linespc charspc ctext cflist cscroll
-    global tabstop
-    global findtype findtypemenu findloc findstring fstring geometry
-    global entries sha1entry sha1string sha1but
-    global diffcontextstring diffcontext
-    global ignorespace
-    global maincursor textcursor curtextcursor
-    global rowctxmenu fakerowmenu mergemax wrapcomment
-    global highlight_files gdttype
-    global searchstring sstring
-    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
-    global uifgcolor uifgdisabledcolor
-    global filesepbgcolor filesepfgcolor
-    global mergecolors foundbgcolor currentsearchhitbgcolor
-    global headctxmenu progresscanv progressitem progresscoords statusw
-    global fprogitem fprogcoord lastprogupdate progupdatepending
-    global rprogitem rprogcoord rownumsel numcommits
-    global have_tk85 use_ttk NS
-    global git_version
-    global worddiff
-
-    # The "mc" arguments here are purely so that xgettext
-    # sees the following string as needing to be translated
-    set file {
-	mc "&File" cascade {
-	    {mc "&Update" command updatecommits -accelerator F5}
-	    {mc "&Reload" command reloadcommits -accelerator Shift-F5}
-	    {mc "Reread re&ferences" command rereadrefs}
-	    {mc "&List references" command showrefs -accelerator F2}
-	    {xx "" separator}
-	    {mc "Start git &gui" command {exec git gui &}}
-	    {xx "" separator}
-	    {mc "&Quit" command doquit -accelerator Meta1-Q}
-	}}
-    set edit {
-	mc "&Edit" cascade {
-	    {mc "&Preferences" command doprefs}
-	}}
-    set view {
-	mc "&View" cascade {
-	    {mc "&New view..." command {newview 0} -accelerator Shift-F4}
-	    {mc "&Edit view..." command editview -state disabled -accelerator F4}
-	    {mc "&Delete view" command delview -state disabled}
-	    {xx "" separator}
-	    {mc "&All files" radiobutton {selectedview 0} -command {showview 0}}
-	}}
-    if {[tk windowingsystem] ne "aqua"} {
-	set help {
-	mc "&Help" cascade {
-	    {mc "&About gitk" command about}
-	    {mc "&Key bindings" command keys}
-	}}
-	set bar [list $file $edit $view $help]
-    } else {
-	proc ::tk::mac::ShowPreferences {} {doprefs}
-	proc ::tk::mac::Quit {} {doquit}
-	lset file end [lreplace [lindex $file end] end-1 end]
-	set apple {
-	xx "&Apple" cascade {
-	    {mc "&About gitk" command about}
-	    {xx "" separator}
-	}}
-	set help {
-	mc "&Help" cascade {
-	    {mc "&Key bindings" command keys}
-	}}
-	set bar [list $apple $file $view $help]
-    }
-    makemenu .bar $bar
-    . configure -menu .bar
-
-    if {$use_ttk} {
-        # cover the non-themed toplevel with a themed frame.
-        place [ttk::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1
-    }
-
-    # the gui has upper and lower half, parts of a paned window.
-    ${NS}::panedwindow .ctop -orient vertical
-
-    # possibly use assumed geometry
-    if {![info exists geometry(pwsash0)]} {
-        set geometry(topheight) [expr {15 * $linespc}]
-        set geometry(topwidth) [expr {80 * $charspc}]
-        set geometry(botheight) [expr {15 * $linespc}]
-        set geometry(botwidth) [expr {50 * $charspc}]
-        set geometry(pwsash0) [list [expr {40 * $charspc}] 2]
-        set geometry(pwsash1) [list [expr {60 * $charspc}] 2]
-    }
-
-    # the upper half will have a paned window, a scroll bar to the right, and some stuff below
-    ${NS}::frame .tf -height $geometry(topheight) -width $geometry(topwidth)
-    ${NS}::frame .tf.histframe
-    ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal
-    if {!$use_ttk} {
-	.tf.histframe.pwclist configure -sashpad 0 -handlesize 4
-    }
-
-    # create three canvases
-    set cscroll .tf.histframe.csb
-    set canv .tf.histframe.pwclist.canv
-    canvas $canv \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -bd 0 \
-	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
-    .tf.histframe.pwclist add $canv
-    set canv2 .tf.histframe.pwclist.canv2
-    canvas $canv2 \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -bd 0 -yscrollincr $linespc
-    .tf.histframe.pwclist add $canv2
-    set canv3 .tf.histframe.pwclist.canv3
-    canvas $canv3 \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -bd 0 -yscrollincr $linespc
-    .tf.histframe.pwclist add $canv3
-    if {$use_ttk} {
-	bind .tf.histframe.pwclist <Map> {
-	    bind %W <Map> {}
-	    .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0]
-	    .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0]
-	}
-    } else {
-	eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
-	eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
-    }
-
-    # a scroll bar to rule them
-    ${NS}::scrollbar $cscroll -command {allcanvs yview}
-    if {!$use_ttk} {$cscroll configure -highlightthickness 0}
-    pack $cscroll -side right -fill y
-    bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w}
-    lappend bglist $canv $canv2 $canv3
-    pack .tf.histframe.pwclist -fill both -expand 1 -side left
-
-    # we have two button bars at bottom of top frame. Bar 1
-    ${NS}::frame .tf.bar
-    ${NS}::frame .tf.lbar -height 15
-
-    set sha1entry .tf.bar.sha1
-    set entries $sha1entry
-    set sha1but .tf.bar.sha1label
-    button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
-	-command gotocommit -width 8
-    $sha1but conf -disabledforeground [$sha1but cget -foreground]
-    pack .tf.bar.sha1label -side left
-    ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string
-    trace add variable sha1string write sha1change
-    pack $sha1entry -side left -pady 2
-
-    set bm_left_data {
-	#define left_width 16
-	#define left_height 16
-	static unsigned char left_bits[] = {
-	0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
-	0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
-	0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
-    }
-    set bm_right_data {
-	#define right_width 16
-	#define right_height 16
-	static unsigned char right_bits[] = {
-	0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
-	0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
-	0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
-    }
-    image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor
-    image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor
-    image create bitmap bm-right -data $bm_right_data -foreground $uifgcolor
-    image create bitmap bm-right-gray -data $bm_right_data -foreground $uifgdisabledcolor
-
-    ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26
-    if {$use_ttk} {
-	.tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
-    } else {
-	.tf.bar.leftbut configure -image bm-left
-    }
-    pack .tf.bar.leftbut -side left -fill y
-    ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26
-    if {$use_ttk} {
-	.tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
-    } else {
-	.tf.bar.rightbut configure -image bm-right
-    }
-    pack .tf.bar.rightbut -side left -fill y
-
-    ${NS}::label .tf.bar.rowlabel -text [mc "Row"]
-    set rownumsel {}
-    ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \
-	-relief sunken -anchor e
-    ${NS}::label .tf.bar.rowlabel2 -text "/"
-    ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \
-	-relief sunken -anchor e
-    pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
-	-side left
-    if {!$use_ttk} {
-        foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont}
-    }
-    global selectedline
-    trace add variable selectedline write selectedline_change
-
-    # Status label and progress bar
-    set statusw .tf.bar.status
-    ${NS}::label $statusw -width 15 -relief sunken
-    pack $statusw -side left -padx 5
-    if {$use_ttk} {
-	set progresscanv [ttk::progressbar .tf.bar.progress]
-    } else {
-	set h [expr {[font metrics uifont -linespace] + 2}]
-	set progresscanv .tf.bar.progress
-	canvas $progresscanv -relief sunken -height $h -borderwidth 2
-	set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00ff00"]
-	set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
-	set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
-    }
-    pack $progresscanv -side right -expand 1 -fill x -padx {0 2}
-    set progresscoords {0 0}
-    set fprogcoord 0
-    set rprogcoord 0
-    bind $progresscanv <Configure> adjustprogress
-    set lastprogupdate [clock clicks -milliseconds]
-    set progupdatepending 0
-
-    # build up the bottom bar of upper window
-    ${NS}::label .tf.lbar.flabel -text "[mc "Find"] "
-
-    set bm_down_data {
-	#define down_width 16
-	#define down_height 16
-	static unsigned char down_bits[] = {
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-	0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d,
-	0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01};
-    }
-    image create bitmap bm-down -data $bm_down_data -foreground $uifgcolor
-    ${NS}::button .tf.lbar.fnext -width 26 -command {dofind 1 1}
-    .tf.lbar.fnext configure -image bm-down
-
-    set bm_up_data {
-	#define up_width 16
-	#define up_height 16
-	static unsigned char up_bits[] = {
-	0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
-	0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1,
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01};
-    }
-    image create bitmap bm-up -data $bm_up_data -foreground $uifgcolor
-    ${NS}::button .tf.lbar.fprev -width 26 -command {dofind -1 1}
-    .tf.lbar.fprev configure -image bm-up
-
-    ${NS}::label .tf.lbar.flab2 -text " [mc "commit"] "
-
-    pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
-	-side left -fill y
-    set gdttype [mc "containing:"]
-    set gm [makedroplist .tf.lbar.gdttype gdttype \
-		[mc "containing:"] \
-		[mc "touching paths:"] \
-		[mc "adding/removing string:"] \
-		[mc "changing lines matching:"]]
-    trace add variable gdttype write gdttype_change
-    pack .tf.lbar.gdttype -side left -fill y
-
-    set findstring {}
-    set fstring .tf.lbar.findstring
-    lappend entries $fstring
-    ${NS}::entry $fstring -width 30 -textvariable findstring
-    trace add variable findstring write find_change
-    set findtype [mc "Exact"]
-    set findtypemenu [makedroplist .tf.lbar.findtype \
-			  findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
-    trace add variable findtype write findcom_change
-    set findloc [mc "All fields"]
-    makedroplist .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
-	[mc "Comments"] [mc "Author"] [mc "Committer"]
-    trace add variable findloc write find_change
-    pack .tf.lbar.findloc -side right
-    pack .tf.lbar.findtype -side right
-    pack $fstring -side left -expand 1 -fill x
-
-    # Finish putting the upper half of the viewer together
-    pack .tf.lbar -in .tf -side bottom -fill x
-    pack .tf.bar -in .tf -side bottom -fill x
-    pack .tf.histframe -fill both -side top -expand 1
-    .ctop add .tf
-    if {!$use_ttk} {
-	.ctop paneconfigure .tf -height $geometry(topheight)
-	.ctop paneconfigure .tf -width $geometry(topwidth)
-    }
-
-    # now build up the bottom
-    ${NS}::panedwindow .pwbottom -orient horizontal
-
-    # lower left, a text box over search bar, scroll bar to the right
-    # if we know window height, then that will set the lower text height, otherwise
-    # we set lower text height which will drive window height
-    if {[info exists geometry(main)]} {
-	${NS}::frame .bleft -width $geometry(botwidth)
-    } else {
-	${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
-    }
-    ${NS}::frame .bleft.top
-    ${NS}::frame .bleft.mid
-    ${NS}::frame .bleft.bottom
-
-    # gap between sub-widgets
-    set wgap [font measure uifont "i"]
-
-    ${NS}::button .bleft.top.search -text [mc "Search"] -command dosearch
-    pack .bleft.top.search -side left -padx 5
-    set sstring .bleft.top.sstring
-    set searchstring ""
-    ${NS}::entry $sstring -width 20 -textvariable searchstring
-    lappend entries $sstring
-    trace add variable searchstring write incrsearch
-    pack $sstring -side left -expand 1 -fill x
-    ${NS}::radiobutton .bleft.mid.diff -text [mc "Diff"] \
-	-command changediffdisp -variable diffelide -value {0 0}
-    ${NS}::radiobutton .bleft.mid.old -text [mc "Old version"] \
-	-command changediffdisp -variable diffelide -value {0 1}
-    ${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \
-	-command changediffdisp -variable diffelide -value {1 0}
-
-    ${NS}::label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
-    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left -ipadx $wgap
-    spinbox .bleft.mid.diffcontext -width 5 \
-	-from 0 -increment 1 -to 10000000 \
-	-validate all -validatecommand "diffcontextvalidate %P" \
-	-textvariable diffcontextstring
-    .bleft.mid.diffcontext set $diffcontext
-    trace add variable diffcontextstring write diffcontextchange
-    lappend entries .bleft.mid.diffcontext
-    pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left -ipadx $wgap
-    ${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
-	-command changeignorespace -variable ignorespace
-    pack .bleft.mid.ignspace -side left -padx 5
-
-    set worddiff [mc "Line diff"]
-    if {[package vcompare $git_version "1.7.2"] >= 0} {
-	makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \
-	    [mc "Markup words"] [mc "Color words"]
-	trace add variable worddiff write changeworddiff
-	pack .bleft.mid.worddiff -side left -padx 5
-    }
-
-    set ctext .bleft.bottom.ctext
-    text $ctext -background $bgcolor -foreground $fgcolor \
-	-state disabled -undo 0 -font textfont \
-	-yscrollcommand scrolltext -wrap none \
-	-xscrollcommand ".bleft.bottom.sbhorizontal set"
-    if {$have_tk85} {
-	$ctext conf -tabstyle wordprocessor
-    }
-    ${NS}::scrollbar .bleft.bottom.sb -command "$ctext yview"
-    ${NS}::scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h
-    pack .bleft.top -side top -fill x
-    pack .bleft.mid -side top -fill x
-    grid $ctext .bleft.bottom.sb -sticky nsew
-    grid .bleft.bottom.sbhorizontal -sticky ew
-    grid columnconfigure .bleft.bottom 0 -weight 1
-    grid rowconfigure .bleft.bottom 0 -weight 1
-    grid rowconfigure .bleft.bottom 1 -weight 0
-    pack .bleft.bottom -side top -fill both -expand 1
-    lappend bglist $ctext
-    lappend fglist $ctext
-
-    $ctext tag conf comment -wrap $wrapcomment
-    $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor
-    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
-    $ctext tag conf d0 -fore [lindex $diffcolors 0]
-    $ctext tag conf dresult -fore [lindex $diffcolors 1]
-    $ctext tag conf m0 -fore [lindex $mergecolors 0]
-    $ctext tag conf m1 -fore [lindex $mergecolors 1]
-    $ctext tag conf m2 -fore [lindex $mergecolors 2]
-    $ctext tag conf m3 -fore [lindex $mergecolors 3]
-    $ctext tag conf m4 -fore [lindex $mergecolors 4]
-    $ctext tag conf m5 -fore [lindex $mergecolors 5]
-    $ctext tag conf m6 -fore [lindex $mergecolors 6]
-    $ctext tag conf m7 -fore [lindex $mergecolors 7]
-    $ctext tag conf m8 -fore [lindex $mergecolors 8]
-    $ctext tag conf m9 -fore [lindex $mergecolors 9]
-    $ctext tag conf m10 -fore [lindex $mergecolors 10]
-    $ctext tag conf m11 -fore [lindex $mergecolors 11]
-    $ctext tag conf m12 -fore [lindex $mergecolors 12]
-    $ctext tag conf m13 -fore [lindex $mergecolors 13]
-    $ctext tag conf m14 -fore [lindex $mergecolors 14]
-    $ctext tag conf m15 -fore [lindex $mergecolors 15]
-    $ctext tag conf mmax -fore darkgrey
-    set mergemax 16
-    $ctext tag conf mresult -font textfontbold
-    $ctext tag conf msep -font textfontbold
-    $ctext tag conf found -back $foundbgcolor
-    $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor
-    $ctext tag conf wwrap -wrap word -lmargin2 1c
-    $ctext tag conf bold -font textfontbold
-
-    .pwbottom add .bleft
-    if {!$use_ttk} {
-	.pwbottom paneconfigure .bleft -width $geometry(botwidth)
-    }
-
-    # lower right
-    ${NS}::frame .bright
-    ${NS}::frame .bright.mode
-    ${NS}::radiobutton .bright.mode.patch -text [mc "Patch"] \
-	-command reselectline -variable cmitmode -value "patch"
-    ${NS}::radiobutton .bright.mode.tree -text [mc "Tree"] \
-	-command reselectline -variable cmitmode -value "tree"
-    grid .bright.mode.patch .bright.mode.tree -sticky ew
-    pack .bright.mode -side top -fill x
-    set cflist .bright.cfiles
-    set indent [font measure mainfont "nn"]
-    text $cflist \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -foreground $fgcolor \
-	-font mainfont \
-	-tabs [list $indent [expr {2 * $indent}]] \
-	-yscrollcommand ".bright.sb set" \
-	-cursor [. cget -cursor] \
-	-spacing1 1 -spacing3 1
-    lappend bglist $cflist
-    lappend fglist $cflist
-    ${NS}::scrollbar .bright.sb -command "$cflist yview"
-    pack .bright.sb -side right -fill y
-    pack $cflist -side left -fill both -expand 1
-    $cflist tag configure highlight \
-	-background [$cflist cget -selectbackground]
-    $cflist tag configure bold -font mainfontbold
-
-    .pwbottom add .bright
-    .ctop add .pwbottom
-
-    # restore window width & height if known
-    if {[info exists geometry(main)]} {
-	if {[scan $geometry(main) "%dx%d" w h] >= 2} {
-	    if {$w > [winfo screenwidth .]} {
-		set w [winfo screenwidth .]
-	    }
-	    if {$h > [winfo screenheight .]} {
-		set h [winfo screenheight .]
-	    }
-	    wm geometry . "${w}x$h"
-	}
-    }
-
-    if {[info exists geometry(state)] && $geometry(state) eq "zoomed"} {
-        wm state . $geometry(state)
-    }
-
-    if {[tk windowingsystem] eq {aqua}} {
-        set M1B M1
-        set ::BM "3"
-    } else {
-        set M1B Control
-        set ::BM "2"
-    }
-
-    if {$use_ttk} {
-        bind .ctop <Map> {
-            bind %W <Map> {}
-            %W sashpos 0 $::geometry(topheight)
-        }
-        bind .pwbottom <Map> {
-            bind %W <Map> {}
-            %W sashpos 0 $::geometry(botwidth)
-        }
-    }
-
-    bind .pwbottom <Configure> {resizecdetpanes %W %w}
-    pack .ctop -fill both -expand 1
-    bindall <1> {selcanvline %W %x %y}
-    #bindall <B1-Motion> {selcanvline %W %x %y}
-    if {[tk windowingsystem] == "win32"} {
-	bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
-	bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
-    } else {
-	bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
-	bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
-	bind $ctext <Button> {
-	    if {"%b" eq 6} {
-		$ctext xview scroll -5 units
-	    } elseif {"%b" eq 7} {
-		$ctext xview scroll 5 units
-	    }
-	}
-        if {[tk windowingsystem] eq "aqua"} {
-            bindall <MouseWheel> {
-                set delta [expr {- (%D)}]
-                allcanvs yview scroll $delta units
-            }
-            bindall <Shift-MouseWheel> {
-                set delta [expr {- (%D)}]
-                $canv xview scroll $delta units
-            }
-        }
-    }
-    bindall <$::BM> "canvscan mark %W %x %y"
-    bindall <B$::BM-Motion> "canvscan dragto %W %x %y"
-    bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
-    bind . <$M1B-Key-w> doquit
-    bindkey <Home> selfirstline
-    bindkey <End> sellastline
-    bind . <Key-Up> "selnextline -1"
-    bind . <Key-Down> "selnextline 1"
-    bind . <Shift-Key-Up> "dofind -1 0"
-    bind . <Shift-Key-Down> "dofind 1 0"
-    bindkey <Key-Right> "goforw"
-    bindkey <Key-Left> "goback"
-    bind . <Key-Prior> "selnextpage -1"
-    bind . <Key-Next> "selnextpage 1"
-    bind . <$M1B-Home> "allcanvs yview moveto 0.0"
-    bind . <$M1B-End> "allcanvs yview moveto 1.0"
-    bind . <$M1B-Key-Up> "allcanvs yview scroll -1 units"
-    bind . <$M1B-Key-Down> "allcanvs yview scroll 1 units"
-    bind . <$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
-    bind . <$M1B-Key-Next> "allcanvs yview scroll 1 pages"
-    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
-    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
-    bindkey <Key-space> "$ctext yview scroll 1 pages"
-    bindkey p "selnextline -1"
-    bindkey n "selnextline 1"
-    bindkey z "goback"
-    bindkey x "goforw"
-    bindkey k "selnextline -1"
-    bindkey j "selnextline 1"
-    bindkey h "goback"
-    bindkey l "goforw"
-    bindkey b prevfile
-    bindkey d "$ctext yview scroll 18 units"
-    bindkey u "$ctext yview scroll -18 units"
-    bindkey g {$sha1entry delete 0 end; focus $sha1entry}
-    bindkey / {focus $fstring}
-    bindkey <Key-KP_Divide> {focus $fstring}
-    bindkey <Key-Return> {dofind 1 1}
-    bindkey ? {dofind -1 1}
-    bindkey f nextfile
-    bind . <F5> updatecommits
-    bindmodfunctionkey Shift 5 reloadcommits
-    bind . <F2> showrefs
-    bindmodfunctionkey Shift 4 {newview 0}
-    bind . <F4> edit_or_newview
-    bind . <$M1B-q> doquit
-    bind . <$M1B-f> {dofind 1 1}
-    bind . <$M1B-g> {dofind 1 0}
-    bind . <$M1B-r> dosearchback
-    bind . <$M1B-s> dosearch
-    bind . <$M1B-equal> {incrfont 1}
-    bind . <$M1B-plus> {incrfont 1}
-    bind . <$M1B-KP_Add> {incrfont 1}
-    bind . <$M1B-minus> {incrfont -1}
-    bind . <$M1B-KP_Subtract> {incrfont -1}
-    wm protocol . WM_DELETE_WINDOW doquit
-    bind . <Destroy> {stop_backends}
-    bind . <Button-1> "click %W"
-    bind $fstring <Key-Return> {dofind 1 1}
-    bind $sha1entry <Key-Return> {gotocommit; break}
-    bind $sha1entry <<PasteSelection>> clearsha1
-    bind $sha1entry <<Paste>> clearsha1
-    bind $cflist <1> {sel_flist %W %x %y; break}
-    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
-    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
-    global ctxbut
-    bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
-    bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
-    bind $ctext <Button-1> {focus %W}
-    bind $ctext <<Selection>> rehighlight_search_results
-    for {set i 1} {$i < 10} {incr i} {
-	bind . <$M1B-Key-$i> [list go_to_parent $i]
-    }
-
-    set maincursor [. cget -cursor]
-    set textcursor [$ctext cget -cursor]
-    set curtextcursor $textcursor
-
-    set rowctxmenu .rowctxmenu
-    makemenu $rowctxmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
-	{mc "Create tag" command mktag}
-	{mc "Copy commit summary" command copysummary}
-	{mc "Write commit to file" command writecommit}
-	{mc "Create new branch" command mkbranch}
-	{mc "Cherry-pick this commit" command cherrypick}
-	{mc "Reset HEAD branch to here" command resethead}
-	{mc "Mark this commit" command markhere}
-	{mc "Return to mark" command gotomark}
-	{mc "Find descendant of this and mark" command find_common_desc}
-	{mc "Compare with marked commit" command compare_commits}
-	{mc "Diff this -> marked commit" command {diffvsmark 0}}
-	{mc "Diff marked commit -> this" command {diffvsmark 1}}
-	{mc "Revert this commit" command revert}
-    }
-    $rowctxmenu configure -tearoff 0
-
-    set fakerowmenu .fakerowmenu
-    makemenu $fakerowmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
-	{mc "Diff this -> marked commit" command {diffvsmark 0}}
-	{mc "Diff marked commit -> this" command {diffvsmark 1}}
-    }
-    $fakerowmenu configure -tearoff 0
-
-    set headctxmenu .headctxmenu
-    makemenu $headctxmenu {
-	{mc "Check out this branch" command cobranch}
-	{mc "Rename this branch" command mvbranch}
-	{mc "Remove this branch" command rmbranch}
-	{mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}}
-    }
-    $headctxmenu configure -tearoff 0
-
-    global flist_menu
-    set flist_menu .flistctxmenu
-    makemenu $flist_menu {
-	{mc "Highlight this too" command {flist_hl 0}}
-	{mc "Highlight this only" command {flist_hl 1}}
-	{mc "External diff" command {external_diff}}
-	{mc "Blame parent commit" command {external_blame 1}}
-	{mc "Copy path" command {clipboard clear; clipboard append $flist_menu_file}}
-    }
-    $flist_menu configure -tearoff 0
-
-    global diff_menu
-    set diff_menu .diffctxmenu
-    makemenu $diff_menu {
-	{mc "Show origin of this line" command show_line_source}
-	{mc "Run git gui blame on this line" command {external_blame_diff}}
-    }
-    $diff_menu configure -tearoff 0
-}
-
-# Windows sends all mouse wheel events to the current focused window, not
-# the one where the mouse hovers, so bind those events here and redirect
-# to the correct window
-proc windows_mousewheel_redirector {W X Y D} {
-    global canv canv2 canv3
-    set w [winfo containing -displayof $W $X $Y]
-    if {$w ne ""} {
-	set u [expr {$D < 0 ? 5 : -5}]
-	if {$w == $canv || $w == $canv2 || $w == $canv3} {
-	    allcanvs yview scroll $u units
-	} else {
-	    catch {
-		$w yview scroll $u units
-	    }
-	}
-    }
-}
-
-# Update row number label when selectedline changes
-proc selectedline_change {n1 n2 op} {
-    global selectedline rownumsel
-
-    if {$selectedline eq {}} {
-	set rownumsel {}
-    } else {
-	set rownumsel [expr {$selectedline + 1}]
-    }
-}
-
-# mouse-2 makes all windows scan vertically, but only the one
-# the cursor is in scans horizontally
-proc canvscan {op w x y} {
-    global canv canv2 canv3
-    foreach c [list $canv $canv2 $canv3] {
-	if {$c == $w} {
-	    $c scan $op $x $y
-	} else {
-	    $c scan $op 0 $y
-	}
-    }
-}
-
-proc scrollcanv {cscroll f0 f1} {
-    $cscroll set $f0 $f1
-    drawvisible
-    flushhighlights
-}
-
-# when we make a key binding for the toplevel, make sure
-# it doesn't get triggered when that key is pressed in the
-# find string entry widget.
-proc bindkey {ev script} {
-    global entries
-    bind . $ev $script
-    set escript [bind Entry $ev]
-    if {$escript == {}} {
-	set escript [bind Entry <Key>]
-    }
-    foreach e $entries {
-	bind $e $ev "$escript; break"
-    }
-}
-
-proc bindmodfunctionkey {mod n script} {
-    bind . <$mod-F$n> $script
-    catch { bind . <$mod-XF86_Switch_VT_$n> $script }
-}
-
-# set the focus back to the toplevel for any click outside
-# the entry widgets
-proc click {w} {
-    global ctext entries
-    foreach e [concat $entries $ctext] {
-	if {$w == $e} return
-    }
-    focus .
-}
-
-# Adjust the progress bar for a change in requested extent or canvas size
-proc adjustprogress {} {
-    global progresscanv progressitem progresscoords
-    global fprogitem fprogcoord lastprogupdate progupdatepending
-    global rprogitem rprogcoord use_ttk
-
-    if {$use_ttk} {
-	$progresscanv configure -value [expr {int($fprogcoord * 100)}]
-	return
-    }
-
-    set w [expr {[winfo width $progresscanv] - 4}]
-    set x0 [expr {$w * [lindex $progresscoords 0]}]
-    set x1 [expr {$w * [lindex $progresscoords 1]}]
-    set h [winfo height $progresscanv]
-    $progresscanv coords $progressitem $x0 0 $x1 $h
-    $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
-    $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
-    set now [clock clicks -milliseconds]
-    if {$now >= $lastprogupdate + 100} {
-	set progupdatepending 0
-	update
-    } elseif {!$progupdatepending} {
-	set progupdatepending 1
-	after [expr {$lastprogupdate + 100 - $now}] doprogupdate
-    }
-}
-
-proc doprogupdate {} {
-    global lastprogupdate progupdatepending
-
-    if {$progupdatepending} {
-	set progupdatepending 0
-	set lastprogupdate [clock clicks -milliseconds]
-	update
-    }
-}
-
-proc config_check_tmp_exists {tries_left} {
-    global config_file_tmp
-
-    if {[file exists $config_file_tmp]} {
-	incr tries_left -1
-	if {$tries_left > 0} {
-	    after 100 [list config_check_tmp_exists $tries_left]
-	} else {
-	    error_popup "There appears to be a stale $config_file_tmp\
- file, which will prevent gitk from saving its configuration on exit.\
- Please remove it if it is not being used by any existing gitk process."
-	}
-    }
-}
-
-proc config_init_trace {name} {
-    global config_variable_changed config_variable_original
-
-    upvar #0 $name var
-    set config_variable_changed($name) 0
-    set config_variable_original($name) $var
-}
-
-proc config_variable_change_cb {name name2 op} {
-    global config_variable_changed config_variable_original
-
-    upvar #0 $name var
-    if {$op eq "write" &&
-	(![info exists config_variable_original($name)] ||
-	 $config_variable_original($name) ne $var)} {
-	set config_variable_changed($name) 1
-    }
-}
-
-proc savestuff {w} {
-    global stuffsaved
-    global config_file config_file_tmp
-    global config_variables config_variable_changed
-    global viewchanged
-
-    upvar #0 viewname current_viewname
-    upvar #0 viewfiles current_viewfiles
-    upvar #0 viewargs current_viewargs
-    upvar #0 viewargscmd current_viewargscmd
-    upvar #0 viewperm current_viewperm
-    upvar #0 nextviewnum current_nextviewnum
-    upvar #0 use_ttk current_use_ttk
-
-    if {$stuffsaved} return
-    if {![winfo viewable .]} return
-    set remove_tmp 0
-    if {[catch {
-	set try_count 0
-	while {[catch {set f [open $config_file_tmp {WRONLY CREAT EXCL}]}]} {
-	    if {[incr try_count] > 50} {
-		error "Unable to write config file: $config_file_tmp exists"
-	    }
-	    after 100
-	}
-	set remove_tmp 1
-	if {$::tcl_platform(platform) eq {windows}} {
-	    file attributes $config_file_tmp -hidden true
-	}
-	if {[file exists $config_file]} {
-	    source $config_file
-	}
-	foreach var_name $config_variables {
-	    upvar #0 $var_name var
-	    upvar 0 $var_name old_var
-	    if {!$config_variable_changed($var_name) && [info exists old_var]} {
-		puts $f [list set $var_name $old_var]
-	    } else {
-		puts $f [list set $var_name $var]
-	    }
-	}
-
-	puts $f "set geometry(main) [wm geometry .]"
-	puts $f "set geometry(state) [wm state .]"
-	puts $f "set geometry(topwidth) [winfo width .tf]"
-	puts $f "set geometry(topheight) [winfo height .tf]"
-	if {$current_use_ttk} {
-	    puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
-	    puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
-	} else {
-	    puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
-	    puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
-	}
-	puts $f "set geometry(botwidth) [winfo width .bleft]"
-	puts $f "set geometry(botheight) [winfo height .bleft]"
-
-	array set view_save {}
-	array set views {}
-	if {![info exists permviews]} { set permviews {} }
-	foreach view $permviews {
-	    set view_save([lindex $view 0]) 1
-	    set views([lindex $view 0]) $view
-	}
-	puts -nonewline $f "set permviews {"
-	for {set v 1} {$v < $current_nextviewnum} {incr v} {
-	    if {$viewchanged($v)} {
-		if {$current_viewperm($v)} {
-		    set views($current_viewname($v)) [list $current_viewname($v) $current_viewfiles($v) $current_viewargs($v) $current_viewargscmd($v)]
-		} else {
-		    set view_save($current_viewname($v)) 0
-		}
-	    }
-	}
-	# write old and updated view to their places and append remaining to the end
-	foreach view $permviews {
-	    set view_name [lindex $view 0]
-	    if {$view_save($view_name)} {
-		puts $f "{$views($view_name)}"
-	    }
-	    unset views($view_name)
-	}
-	foreach view_name [array names views] {
-	    puts $f "{$views($view_name)}"
-	}
-	puts $f "}"
-	close $f
-	file rename -force $config_file_tmp $config_file
-	set remove_tmp 0
-    } err]} {
-        puts "Error saving config: $err"
-    }
-    if {$remove_tmp} {
-	file delete -force $config_file_tmp
-    }
-    set stuffsaved 1
-}
-
-proc resizeclistpanes {win w} {
-    global oldwidth use_ttk
-    if {[info exists oldwidth($win)]} {
-	if {$use_ttk} {
-	    set s0 [$win sashpos 0]
-	    set s1 [$win sashpos 1]
-	} else {
-	    set s0 [$win sash coord 0]
-	    set s1 [$win sash coord 1]
-	}
-	if {$w < 60} {
-	    set sash0 [expr {int($w/2 - 2)}]
-	    set sash1 [expr {int($w*5/6 - 2)}]
-	} else {
-	    set factor [expr {1.0 * $w / $oldwidth($win)}]
-	    set sash0 [expr {int($factor * [lindex $s0 0])}]
-	    set sash1 [expr {int($factor * [lindex $s1 0])}]
-	    if {$sash0 < 30} {
-		set sash0 30
-	    }
-	    if {$sash1 < $sash0 + 20} {
-		set sash1 [expr {$sash0 + 20}]
-	    }
-	    if {$sash1 > $w - 10} {
-		set sash1 [expr {$w - 10}]
-		if {$sash0 > $sash1 - 20} {
-		    set sash0 [expr {$sash1 - 20}]
-		}
-	    }
-	}
-	if {$use_ttk} {
-	    $win sashpos 0 $sash0
-	    $win sashpos 1 $sash1
-	} else {
-	    $win sash place 0 $sash0 [lindex $s0 1]
-	    $win sash place 1 $sash1 [lindex $s1 1]
-	}
-    }
-    set oldwidth($win) $w
-}
-
-proc resizecdetpanes {win w} {
-    global oldwidth use_ttk
-    if {[info exists oldwidth($win)]} {
-	if {$use_ttk} {
-	    set s0 [$win sashpos 0]
-	} else {
-	    set s0 [$win sash coord 0]
-	}
-	if {$w < 60} {
-	    set sash0 [expr {int($w*3/4 - 2)}]
-	} else {
-	    set factor [expr {1.0 * $w / $oldwidth($win)}]
-	    set sash0 [expr {int($factor * [lindex $s0 0])}]
-	    if {$sash0 < 45} {
-		set sash0 45
-	    }
-	    if {$sash0 > $w - 15} {
-		set sash0 [expr {$w - 15}]
-	    }
-	}
-	if {$use_ttk} {
-	    $win sashpos 0 $sash0
-	} else {
-	    $win sash place 0 $sash0 [lindex $s0 1]
-	}
-    }
-    set oldwidth($win) $w
-}
-
-proc allcanvs args {
-    global canv canv2 canv3
-    eval $canv $args
-    eval $canv2 $args
-    eval $canv3 $args
-}
-
-proc bindall {event action} {
-    global canv canv2 canv3
-    bind $canv $event $action
-    bind $canv2 $event $action
-    bind $canv3 $event $action
-}
-
-proc about {} {
-    global bgcolor NS
-    set w .about
-    if {[winfo exists $w]} {
-	raise $w
-	return
-    }
-    ttk_toplevel $w
-    wm title $w [mc "About gitk"]
-    make_transient $w .
-    message $w.m -text [mc "
-Gitk - a commit viewer for git
-
-Copyright \u00a9 2005-2016 Paul Mackerras
-
-Use and redistribute under the terms of the GNU General Public License"] \
-	    -justify center -aspect 400 -border 2 -bg $bgcolor -relief groove
-    pack $w.m -side top -fill x -padx 2 -pady 2
-    ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
-    pack $w.ok -side bottom
-    bind $w <Visibility> "focus $w.ok"
-    bind $w <Key-Escape> "destroy $w"
-    bind $w <Key-Return> "destroy $w"
-    tk::PlaceWindow $w widget .
-}
-
-proc keys {} {
-    global bgcolor NS
-    set w .keys
-    if {[winfo exists $w]} {
-	raise $w
-	return
-    }
-    if {[tk windowingsystem] eq {aqua}} {
-	set M1T Cmd
-    } else {
-	set M1T Ctrl
-    }
-    ttk_toplevel $w
-    wm title $w [mc "Gitk key bindings"]
-    make_transient $w .
-    message $w.m -text "
-[mc "Gitk key bindings:"]
-
-[mc "<%s-Q>		Quit" $M1T]
-[mc "<%s-W>		Close window" $M1T]
-[mc "<Home>		Move to first commit"]
-[mc "<End>		Move to last commit"]
-[mc "<Up>, p, k	Move up one commit"]
-[mc "<Down>, n, j	Move down one commit"]
-[mc "<Left>, z, h	Go back in history list"]
-[mc "<Right>, x, l	Go forward in history list"]
-[mc "<%s-n>	Go to n-th parent of current commit in history list" $M1T]
-[mc "<PageUp>	Move up one page in commit list"]
-[mc "<PageDown>	Move down one page in commit list"]
-[mc "<%s-Home>	Scroll to top of commit list" $M1T]
-[mc "<%s-End>	Scroll to bottom of commit list" $M1T]
-[mc "<%s-Up>	Scroll commit list up one line" $M1T]
-[mc "<%s-Down>	Scroll commit list down one line" $M1T]
-[mc "<%s-PageUp>	Scroll commit list up one page" $M1T]
-[mc "<%s-PageDown>	Scroll commit list down one page" $M1T]
-[mc "<Shift-Up>	Find backwards (upwards, later commits)"]
-[mc "<Shift-Down>	Find forwards (downwards, earlier commits)"]
-[mc "<Delete>, b	Scroll diff view up one page"]
-[mc "<Backspace>	Scroll diff view up one page"]
-[mc "<Space>		Scroll diff view down one page"]
-[mc "u		Scroll diff view up 18 lines"]
-[mc "d		Scroll diff view down 18 lines"]
-[mc "<%s-F>		Find" $M1T]
-[mc "<%s-G>		Move to next find hit" $M1T]
-[mc "<Return>	Move to next find hit"]
-[mc "g		Go to commit"]
-[mc "/		Focus the search box"]
-[mc "?		Move to previous find hit"]
-[mc "f		Scroll diff view to next file"]
-[mc "<%s-S>		Search for next hit in diff view" $M1T]
-[mc "<%s-R>		Search for previous hit in diff view" $M1T]
-[mc "<%s-KP+>	Increase font size" $M1T]
-[mc "<%s-plus>	Increase font size" $M1T]
-[mc "<%s-KP->	Decrease font size" $M1T]
-[mc "<%s-minus>	Decrease font size" $M1T]
-[mc "<F5>		Update"]
-" \
-	    -justify left -bg $bgcolor -border 2 -relief groove
-    pack $w.m -side top -fill both -padx 2 -pady 2
-    ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
-    bind $w <Key-Escape> [list destroy $w]
-    pack $w.ok -side bottom
-    bind $w <Visibility> "focus $w.ok"
-    bind $w <Key-Escape> "destroy $w"
-    bind $w <Key-Return> "destroy $w"
-}
-
-# Procedures for manipulating the file list window at the
-# bottom right of the overall window.
-
-proc treeview {w l openlevs} {
-    global treecontents treediropen treeheight treeparent treeindex
-
-    set ix 0
-    set treeindex() 0
-    set lev 0
-    set prefix {}
-    set prefixend -1
-    set prefendstack {}
-    set htstack {}
-    set ht 0
-    set treecontents() {}
-    $w conf -state normal
-    foreach f $l {
-	while {[string range $f 0 $prefixend] ne $prefix} {
-	    if {$lev <= $openlevs} {
-		$w mark set e:$treeindex($prefix) "end -1c"
-		$w mark gravity e:$treeindex($prefix) left
-	    }
-	    set treeheight($prefix) $ht
-	    incr ht [lindex $htstack end]
-	    set htstack [lreplace $htstack end end]
-	    set prefixend [lindex $prefendstack end]
-	    set prefendstack [lreplace $prefendstack end end]
-	    set prefix [string range $prefix 0 $prefixend]
-	    incr lev -1
-	}
-	set tail [string range $f [expr {$prefixend+1}] end]
-	while {[set slash [string first "/" $tail]] >= 0} {
-	    lappend htstack $ht
-	    set ht 0
-	    lappend prefendstack $prefixend
-	    incr prefixend [expr {$slash + 1}]
-	    set d [string range $tail 0 $slash]
-	    lappend treecontents($prefix) $d
-	    set oldprefix $prefix
-	    append prefix $d
-	    set treecontents($prefix) {}
-	    set treeindex($prefix) [incr ix]
-	    set treeparent($prefix) $oldprefix
-	    set tail [string range $tail [expr {$slash+1}] end]
-	    if {$lev <= $openlevs} {
-		set ht 1
-		set treediropen($prefix) [expr {$lev < $openlevs}]
-		set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
-		$w mark set d:$ix "end -1c"
-		$w mark gravity d:$ix left
-		set str "\n"
-		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
-		$w insert end $str
-		$w image create end -align center -image $bm -padx 1 \
-		    -name a:$ix
-		$w insert end $d [highlight_tag $prefix]
-		$w mark set s:$ix "end -1c"
-		$w mark gravity s:$ix left
-	    }
-	    incr lev
-	}
-	if {$tail ne {}} {
-	    if {$lev <= $openlevs} {
-		incr ht
-		set str "\n"
-		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
-		$w insert end $str
-		$w insert end $tail [highlight_tag $f]
-	    }
-	    lappend treecontents($prefix) $tail
-	}
-    }
-    while {$htstack ne {}} {
-	set treeheight($prefix) $ht
-	incr ht [lindex $htstack end]
-	set htstack [lreplace $htstack end end]
-	set prefixend [lindex $prefendstack end]
-	set prefendstack [lreplace $prefendstack end end]
-	set prefix [string range $prefix 0 $prefixend]
-    }
-    $w conf -state disabled
-}
-
-proc linetoelt {l} {
-    global treeheight treecontents
-
-    set y 2
-    set prefix {}
-    while {1} {
-	foreach e $treecontents($prefix) {
-	    if {$y == $l} {
-		return "$prefix$e"
-	    }
-	    set n 1
-	    if {[string index $e end] eq "/"} {
-		set n $treeheight($prefix$e)
-		if {$y + $n > $l} {
-		    append prefix $e
-		    incr y
-		    break
-		}
-	    }
-	    incr y $n
-	}
-    }
-}
-
-proc highlight_tree {y prefix} {
-    global treeheight treecontents cflist
-
-    foreach e $treecontents($prefix) {
-	set path $prefix$e
-	if {[highlight_tag $path] ne {}} {
-	    $cflist tag add bold $y.0 "$y.0 lineend"
-	}
-	incr y
-	if {[string index $e end] eq "/" && $treeheight($path) > 1} {
-	    set y [highlight_tree $y $path]
-	}
-    }
-    return $y
-}
-
-proc treeclosedir {w dir} {
-    global treediropen treeheight treeparent treeindex
-
-    set ix $treeindex($dir)
-    $w conf -state normal
-    $w delete s:$ix e:$ix
-    set treediropen($dir) 0
-    $w image configure a:$ix -image tri-rt
-    $w conf -state disabled
-    set n [expr {1 - $treeheight($dir)}]
-    while {$dir ne {}} {
-	incr treeheight($dir) $n
-	set dir $treeparent($dir)
-    }
-}
-
-proc treeopendir {w dir} {
-    global treediropen treeheight treeparent treecontents treeindex
-
-    set ix $treeindex($dir)
-    $w conf -state normal
-    $w image configure a:$ix -image tri-dn
-    $w mark set e:$ix s:$ix
-    $w mark gravity e:$ix right
-    set lev 0
-    set str "\n"
-    set n [llength $treecontents($dir)]
-    for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
-	incr lev
-	append str "\t"
-	incr treeheight($x) $n
-    }
-    foreach e $treecontents($dir) {
-	set de $dir$e
-	if {[string index $e end] eq "/"} {
-	    set iy $treeindex($de)
-	    $w mark set d:$iy e:$ix
-	    $w mark gravity d:$iy left
-	    $w insert e:$ix $str
-	    set treediropen($de) 0
-	    $w image create e:$ix -align center -image tri-rt -padx 1 \
-		-name a:$iy
-	    $w insert e:$ix $e [highlight_tag $de]
-	    $w mark set s:$iy e:$ix
-	    $w mark gravity s:$iy left
-	    set treeheight($de) 1
-	} else {
-	    $w insert e:$ix $str
-	    $w insert e:$ix $e [highlight_tag $de]
-	}
-    }
-    $w mark gravity e:$ix right
-    $w conf -state disabled
-    set treediropen($dir) 1
-    set top [lindex [split [$w index @0,0] .] 0]
-    set ht [$w cget -height]
-    set l [lindex [split [$w index s:$ix] .] 0]
-    if {$l < $top} {
-	$w yview $l.0
-    } elseif {$l + $n + 1 > $top + $ht} {
-	set top [expr {$l + $n + 2 - $ht}]
-	if {$l < $top} {
-	    set top $l
-	}
-	$w yview $top.0
-    }
-}
-
-proc treeclick {w x y} {
-    global treediropen cmitmode ctext cflist cflist_top
-
-    if {$cmitmode ne "tree"} return
-    if {![info exists cflist_top]} return
-    set l [lindex [split [$w index "@$x,$y"] "."] 0]
-    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
-    $cflist tag add highlight $l.0 "$l.0 lineend"
-    set cflist_top $l
-    if {$l == 1} {
-	$ctext yview 1.0
-	return
-    }
-    set e [linetoelt $l]
-    if {[string index $e end] ne "/"} {
-	showfile $e
-    } elseif {$treediropen($e)} {
-	treeclosedir $w $e
-    } else {
-	treeopendir $w $e
-    }
-}
-
-proc setfilelist {id} {
-    global treefilelist cflist jump_to_here
-
-    treeview $cflist $treefilelist($id) 0
-    if {$jump_to_here ne {}} {
-	set f [lindex $jump_to_here 0]
-	if {[lsearch -exact $treefilelist($id) $f] >= 0} {
-	    showfile $f
-	}
-    }
-}
-
-image create bitmap tri-rt -background black -foreground blue -data {
-    #define tri-rt_width 13
-    #define tri-rt_height 13
-    static unsigned char tri-rt_bits[] = {
-       0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
-       0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
-       0x00, 0x00};
-} -maskdata {
-    #define tri-rt-mask_width 13
-    #define tri-rt-mask_height 13
-    static unsigned char tri-rt-mask_bits[] = {
-       0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
-       0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
-       0x08, 0x00};
-}
-image create bitmap tri-dn -background black -foreground blue -data {
-    #define tri-dn_width 13
-    #define tri-dn_height 13
-    static unsigned char tri-dn_bits[] = {
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
-       0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00};
-} -maskdata {
-    #define tri-dn-mask_width 13
-    #define tri-dn-mask_height 13
-    static unsigned char tri-dn-mask_bits[] = {
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
-       0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00};
-}
-
-image create bitmap reficon-T -background black -foreground yellow -data {
-    #define tagicon_width 13
-    #define tagicon_height 9
-    static unsigned char tagicon_bits[] = {
-       0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
-       0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
-} -maskdata {
-    #define tagicon-mask_width 13
-    #define tagicon-mask_height 9
-    static unsigned char tagicon-mask_bits[] = {
-       0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
-       0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
-}
-set rectdata {
-    #define headicon_width 13
-    #define headicon_height 9
-    static unsigned char headicon_bits[] = {
-       0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
-       0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
-}
-set rectmask {
-    #define headicon-mask_width 13
-    #define headicon-mask_height 9
-    static unsigned char headicon-mask_bits[] = {
-       0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
-       0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
-}
-image create bitmap reficon-H -background black -foreground "#00ff00" \
-    -data $rectdata -maskdata $rectmask
-image create bitmap reficon-o -background black -foreground "#ddddff" \
-    -data $rectdata -maskdata $rectmask
-
-proc init_flist {first} {
-    global cflist cflist_top difffilestart
-
-    $cflist conf -state normal
-    $cflist delete 0.0 end
-    if {$first ne {}} {
-	$cflist insert end $first
-	set cflist_top 1
-	$cflist tag add highlight 1.0 "1.0 lineend"
-    } else {
-	unset -nocomplain cflist_top
-    }
-    $cflist conf -state disabled
-    set difffilestart {}
-}
-
-proc highlight_tag {f} {
-    global highlight_paths
-
-    foreach p $highlight_paths {
-	if {[string match $p $f]} {
-	    return "bold"
-	}
-    }
-    return {}
-}
-
-proc highlight_filelist {} {
-    global cmitmode cflist
-
-    $cflist conf -state normal
-    if {$cmitmode ne "tree"} {
-	set end [lindex [split [$cflist index end] .] 0]
-	for {set l 2} {$l < $end} {incr l} {
-	    set line [$cflist get $l.0 "$l.0 lineend"]
-	    if {[highlight_tag $line] ne {}} {
-		$cflist tag add bold $l.0 "$l.0 lineend"
-	    }
-	}
-    } else {
-	highlight_tree 2 {}
-    }
-    $cflist conf -state disabled
-}
-
-proc unhighlight_filelist {} {
-    global cflist
-
-    $cflist conf -state normal
-    $cflist tag remove bold 1.0 end
-    $cflist conf -state disabled
-}
-
-proc add_flist {fl} {
-    global cflist
-
-    $cflist conf -state normal
-    foreach f $fl {
-	$cflist insert end "\n"
-	$cflist insert end $f [highlight_tag $f]
-    }
-    $cflist conf -state disabled
-}
-
-proc sel_flist {w x y} {
-    global ctext difffilestart cflist cflist_top cmitmode
-
-    if {$cmitmode eq "tree"} return
-    if {![info exists cflist_top]} return
-    set l [lindex [split [$w index "@$x,$y"] "."] 0]
-    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
-    $cflist tag add highlight $l.0 "$l.0 lineend"
-    set cflist_top $l
-    if {$l == 1} {
-	$ctext yview 1.0
-    } else {
-	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
-    }
-    suppress_highlighting_file_for_current_scrollpos
-}
-
-proc pop_flist_menu {w X Y x y} {
-    global ctext cflist cmitmode flist_menu flist_menu_file
-    global treediffs diffids
-
-    stopfinding
-    set l [lindex [split [$w index "@$x,$y"] "."] 0]
-    if {$l <= 1} return
-    if {$cmitmode eq "tree"} {
-	set e [linetoelt $l]
-	if {[string index $e end] eq "/"} return
-    } else {
-	set e [lindex $treediffs($diffids) [expr {$l-2}]]
-    }
-    set flist_menu_file $e
-    set xdiffstate "normal"
-    if {$cmitmode eq "tree"} {
-	set xdiffstate "disabled"
-    }
-    # Disable "External diff" item in tree mode
-    $flist_menu entryconf 2 -state $xdiffstate
-    tk_popup $flist_menu $X $Y
-}
-
-proc find_ctext_fileinfo {line} {
-    global ctext_file_names ctext_file_lines
-
-    set ok [bsearch $ctext_file_lines $line]
-    set tline [lindex $ctext_file_lines $ok]
-
-    if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
-        return {}
-    } else {
-        return [list [lindex $ctext_file_names $ok] $tline]
-    }
-}
-
-proc pop_diff_menu {w X Y x y} {
-    global ctext diff_menu flist_menu_file
-    global diff_menu_txtpos diff_menu_line
-    global diff_menu_filebase
-
-    set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
-    set diff_menu_line [lindex $diff_menu_txtpos 0]
-    # don't pop up the menu on hunk-separator or file-separator lines
-    if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
-	return
-    }
-    stopfinding
-    set f [find_ctext_fileinfo $diff_menu_line]
-    if {$f eq {}} return
-    set flist_menu_file [lindex $f 0]
-    set diff_menu_filebase [lindex $f 1]
-    tk_popup $diff_menu $X $Y
-}
-
-proc flist_hl {only} {
-    global flist_menu_file findstring gdttype
-
-    set x [shellquote $flist_menu_file]
-    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
-	set findstring $x
-    } else {
-	append findstring " " $x
-    }
-    set gdttype [mc "touching paths:"]
-}
-
-proc gitknewtmpdir {} {
-    global diffnum gitktmpdir gitdir env
-
-    if {![info exists gitktmpdir]} {
-	if {[info exists env(GITK_TMPDIR)]} {
-	    set tmpdir $env(GITK_TMPDIR)
-	} elseif {[info exists env(TMPDIR)]} {
-	    set tmpdir $env(TMPDIR)
-	} else {
-	    set tmpdir $gitdir
-	}
-	set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
-	if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
-	    set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
-	}
-	if {[catch {file mkdir $gitktmpdir} err]} {
-	    error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
-	    unset gitktmpdir
-	    return {}
-	}
-	set diffnum 0
-    }
-    incr diffnum
-    set diffdir [file join $gitktmpdir $diffnum]
-    if {[catch {file mkdir $diffdir} err]} {
-	error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
-	return {}
-    }
-    return $diffdir
-}
-
-proc save_file_from_commit {filename output what} {
-    global nullfile
-
-    if {[catch {exec git show $filename -- > $output} err]} {
-	if {[string match "fatal: bad revision *" $err]} {
-	    return $nullfile
-	}
-	error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
-	return {}
-    }
-    return $output
-}
-
-proc external_diff_get_one_file {diffid filename diffdir} {
-    global nullid nullid2 nullfile
-    global worktree
-
-    if {$diffid == $nullid} {
-        set difffile [file join $worktree $filename]
-	if {[file exists $difffile]} {
-	    return $difffile
-	}
-	return $nullfile
-    }
-    if {$diffid == $nullid2} {
-        set difffile [file join $diffdir "\[index\] [file tail $filename]"]
-        return [save_file_from_commit :$filename $difffile index]
-    }
-    set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
-    return [save_file_from_commit $diffid:$filename $difffile \
-	       "revision $diffid"]
-}
-
-proc external_diff {} {
-    global nullid nullid2
-    global flist_menu_file
-    global diffids
-    global extdifftool
-
-    if {[llength $diffids] == 1} {
-        # no reference commit given
-        set diffidto [lindex $diffids 0]
-        if {$diffidto eq $nullid} {
-            # diffing working copy with index
-            set diffidfrom $nullid2
-        } elseif {$diffidto eq $nullid2} {
-            # diffing index with HEAD
-            set diffidfrom "HEAD"
-        } else {
-            # use first parent commit
-            global parentlist selectedline
-            set diffidfrom [lindex $parentlist $selectedline 0]
-        }
-    } else {
-        set diffidfrom [lindex $diffids 0]
-        set diffidto [lindex $diffids 1]
-    }
-
-    # make sure that several diffs wont collide
-    set diffdir [gitknewtmpdir]
-    if {$diffdir eq {}} return
-
-    # gather files to diff
-    set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
-    set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
-
-    if {$difffromfile ne {} && $difftofile ne {}} {
-        set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile]
-        if {[catch {set fl [open |$cmd r]} err]} {
-            file delete -force $diffdir
-            error_popup "$extdifftool: [mc "command failed:"] $err"
-        } else {
-            fconfigure $fl -blocking 0
-            filerun $fl [list delete_at_eof $fl $diffdir]
-        }
-    }
-}
-
-proc find_hunk_blamespec {base line} {
-    global ctext
-
-    # Find and parse the hunk header
-    set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
-    if {$s_lix eq {}} return
-
-    set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
-    if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
-	    s_line old_specs osz osz1 new_line nsz]} {
-	return
-    }
-
-    # base lines for the parents
-    set base_lines [list $new_line]
-    foreach old_spec [lrange [split $old_specs " "] 1 end] {
-	if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
-	        old_spec old_line osz]} {
-	    return
-	}
-	lappend base_lines $old_line
-    }
-
-    # Now scan the lines to determine offset within the hunk
-    set max_parent [expr {[llength $base_lines]-2}]
-    set dline 0
-    set s_lno [lindex [split $s_lix "."] 0]
-
-    # Determine if the line is removed
-    set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
-    if {[string match {[-+ ]*} $chunk]} {
-	set removed_idx [string first "-" $chunk]
-	# Choose a parent index
-	if {$removed_idx >= 0} {
-	    set parent $removed_idx
-	} else {
-	    set unchanged_idx [string first " " $chunk]
-	    if {$unchanged_idx >= 0} {
-		set parent $unchanged_idx
-	    } else {
-		# blame the current commit
-		set parent -1
-	    }
-	}
-	# then count other lines that belong to it
-	for {set i $line} {[incr i -1] > $s_lno} {} {
-	    set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
-	    # Determine if the line is removed
-	    set removed_idx [string first "-" $chunk]
-	    if {$parent >= 0} {
-		set code [string index $chunk $parent]
-		if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
-		    incr dline
-		}
-	    } else {
-		if {$removed_idx < 0} {
-		    incr dline
-		}
-	    }
-	}
-	incr parent
-    } else {
-	set parent 0
-    }
-
-    incr dline [lindex $base_lines $parent]
-    return [list $parent $dline]
-}
-
-proc external_blame_diff {} {
-    global currentid cmitmode
-    global diff_menu_txtpos diff_menu_line
-    global diff_menu_filebase flist_menu_file
-
-    if {$cmitmode eq "tree"} {
-	set parent_idx 0
-	set line [expr {$diff_menu_line - $diff_menu_filebase}]
-    } else {
-	set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
-	if {$hinfo ne {}} {
-	    set parent_idx [lindex $hinfo 0]
-	    set line [lindex $hinfo 1]
-	} else {
-	    set parent_idx 0
-	    set line 0
-	}
-    }
-
-    external_blame $parent_idx $line
-}
-
-# Find the SHA1 ID of the blob for file $fname in the index
-# at stage 0 or 2
-proc index_sha1 {fname} {
-    set f [open [list | git ls-files -s $fname] r]
-    while {[gets $f line] >= 0} {
-	set info [lindex [split $line "\t"] 0]
-	set stage [lindex $info 2]
-	if {$stage eq "0" || $stage eq "2"} {
-	    close $f
-	    return [lindex $info 1]
-	}
-    }
-    close $f
-    return {}
-}
-
-# Turn an absolute path into one relative to the current directory
-proc make_relative {f} {
-    if {[file pathtype $f] eq "relative"} {
-	return $f
-    }
-    set elts [file split $f]
-    set here [file split [pwd]]
-    set ei 0
-    set hi 0
-    set res {}
-    foreach d $here {
-	if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
-	    lappend res ".."
-	} else {
-	    incr ei
-	}
-	incr hi
-    }
-    set elts [concat $res [lrange $elts $ei end]]
-    return [eval file join $elts]
-}
-
-proc external_blame {parent_idx {line {}}} {
-    global flist_menu_file cdup
-    global nullid nullid2
-    global parentlist selectedline currentid
-
-    if {$parent_idx > 0} {
-	set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
-    } else {
-	set base_commit $currentid
-    }
-
-    if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
-	error_popup [mc "No such commit"]
-	return
-    }
-
-    set cmdline [list git gui blame]
-    if {$line ne {} && $line > 1} {
-	lappend cmdline "--line=$line"
-    }
-    set f [file join $cdup $flist_menu_file]
-    # Unfortunately it seems git gui blame doesn't like
-    # being given an absolute path...
-    set f [make_relative $f]
-    lappend cmdline $base_commit $f
-    if {[catch {eval exec $cmdline &} err]} {
-	error_popup "[mc "git gui blame: command failed:"] $err"
-    }
-}
-
-proc show_line_source {} {
-    global cmitmode currentid parents curview blamestuff blameinst
-    global diff_menu_line diff_menu_filebase flist_menu_file
-    global nullid nullid2 gitdir cdup
-
-    set from_index {}
-    if {$cmitmode eq "tree"} {
-	set id $currentid
-	set line [expr {$diff_menu_line - $diff_menu_filebase}]
-    } else {
-	set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
-	if {$h eq {}} return
-	set pi [lindex $h 0]
-	if {$pi == 0} {
-	    mark_ctext_line $diff_menu_line
-	    return
-	}
-	incr pi -1
-	if {$currentid eq $nullid} {
-	    if {$pi > 0} {
-		# must be a merge in progress...
-		if {[catch {
-		    # get the last line from .git/MERGE_HEAD
-		    set f [open [file join $gitdir MERGE_HEAD] r]
-		    set id [lindex [split [read $f] "\n"] end-1]
-		    close $f
-		} err]} {
-		    error_popup [mc "Couldn't read merge head: %s" $err]
-		    return
-		}
-	    } elseif {$parents($curview,$currentid) eq $nullid2} {
-		# need to do the blame from the index
-		if {[catch {
-		    set from_index [index_sha1 $flist_menu_file]
-		} err]} {
-		    error_popup [mc "Error reading index: %s" $err]
-		    return
-		}
-	    } else {
-		set id $parents($curview,$currentid)
-	    }
-	} else {
-	    set id [lindex $parents($curview,$currentid) $pi]
-	}
-	set line [lindex $h 1]
-    }
-    set blameargs {}
-    if {$from_index ne {}} {
-	lappend blameargs | git cat-file blob $from_index
-    }
-    lappend blameargs | git blame -p -L$line,+1
-    if {$from_index ne {}} {
-	lappend blameargs --contents -
-    } else {
-	lappend blameargs $id
-    }
-    lappend blameargs -- [file join $cdup $flist_menu_file]
-    if {[catch {
-	set f [open $blameargs r]
-    } err]} {
-	error_popup [mc "Couldn't start git blame: %s" $err]
-	return
-    }
-    nowbusy blaming [mc "Searching"]
-    fconfigure $f -blocking 0
-    set i [reg_instance $f]
-    set blamestuff($i) {}
-    set blameinst $i
-    filerun $f [list read_line_source $f $i]
-}
-
-proc stopblaming {} {
-    global blameinst
-
-    if {[info exists blameinst]} {
-	stop_instance $blameinst
-	unset blameinst
-	notbusy blaming
-    }
-}
-
-proc read_line_source {fd inst} {
-    global blamestuff curview commfd blameinst nullid nullid2
-
-    while {[gets $fd line] >= 0} {
-	lappend blamestuff($inst) $line
-    }
-    if {![eof $fd]} {
-	return 1
-    }
-    unset commfd($inst)
-    unset blameinst
-    notbusy blaming
-    fconfigure $fd -blocking 1
-    if {[catch {close $fd} err]} {
-	error_popup [mc "Error running git blame: %s" $err]
-	return 0
-    }
-
-    set fname {}
-    set line [split [lindex $blamestuff($inst) 0] " "]
-    set id [lindex $line 0]
-    set lnum [lindex $line 1]
-    if {[string length $id] == 40 && [string is xdigit $id] &&
-	[string is digit -strict $lnum]} {
-	# look for "filename" line
-	foreach l $blamestuff($inst) {
-	    if {[string match "filename *" $l]} {
-		set fname [string range $l 9 end]
-		break
-	    }
-	}
-    }
-    if {$fname ne {}} {
-	# all looks good, select it
-	if {$id eq $nullid} {
-	    # blame uses all-zeroes to mean not committed,
-	    # which would mean a change in the index
-	    set id $nullid2
-	}
-	if {[commitinview $id $curview]} {
-	    selectline [rowofcommit $id] 1 [list $fname $lnum] 1
-	} else {
-	    error_popup [mc "That line comes from commit %s, \
-			     which is not in this view" [shortids $id]]
-	}
-    } else {
-	puts "oops couldn't parse git blame output"
-    }
-    return 0
-}
-
-# delete $dir when we see eof on $f (presumably because the child has exited)
-proc delete_at_eof {f dir} {
-    while {[gets $f line] >= 0} {}
-    if {[eof $f]} {
-	if {[catch {close $f} err]} {
-	    error_popup "[mc "External diff viewer failed:"] $err"
-	}
-	file delete -force $dir
-	return 0
-    }
-    return 1
-}
-
-# Functions for adding and removing shell-type quoting
-
-proc shellquote {str} {
-    if {![string match "*\['\"\\ \t]*" $str]} {
-	return $str
-    }
-    if {![string match "*\['\"\\]*" $str]} {
-	return "\"$str\""
-    }
-    if {![string match "*'*" $str]} {
-	return "'$str'"
-    }
-    return "\"[string map {\" \\\" \\ \\\\} $str]\""
-}
-
-proc shellarglist {l} {
-    set str {}
-    foreach a $l {
-	if {$str ne {}} {
-	    append str " "
-	}
-	append str [shellquote $a]
-    }
-    return $str
-}
-
-proc shelldequote {str} {
-    set ret {}
-    set used -1
-    while {1} {
-	incr used
-	if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
-	    append ret [string range $str $used end]
-	    set used [string length $str]
-	    break
-	}
-	set first [lindex $first 0]
-	set ch [string index $str $first]
-	if {$first > $used} {
-	    append ret [string range $str $used [expr {$first - 1}]]
-	    set used $first
-	}
-	if {$ch eq " " || $ch eq "\t"} break
-	incr used
-	if {$ch eq "'"} {
-	    set first [string first "'" $str $used]
-	    if {$first < 0} {
-		error "unmatched single-quote"
-	    }
-	    append ret [string range $str $used [expr {$first - 1}]]
-	    set used $first
-	    continue
-	}
-	if {$ch eq "\\"} {
-	    if {$used >= [string length $str]} {
-		error "trailing backslash"
-	    }
-	    append ret [string index $str $used]
-	    continue
-	}
-	# here ch == "\""
-	while {1} {
-	    if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
-		error "unmatched double-quote"
-	    }
-	    set first [lindex $first 0]
-	    set ch [string index $str $first]
-	    if {$first > $used} {
-		append ret [string range $str $used [expr {$first - 1}]]
-		set used $first
-	    }
-	    if {$ch eq "\""} break
-	    incr used
-	    append ret [string index $str $used]
-	    incr used
-	}
-    }
-    return [list $used $ret]
-}
-
-proc shellsplit {str} {
-    set l {}
-    while {1} {
-	set str [string trimleft $str]
-	if {$str eq {}} break
-	set dq [shelldequote $str]
-	set n [lindex $dq 0]
-	set word [lindex $dq 1]
-	set str [string range $str $n end]
-	lappend l $word
-    }
-    return $l
-}
-
-proc set_window_title {} {
-    global appname curview viewname vrevs
-    set rev [mc "All files"]
-    if {$curview ne 0} {
-	if {$viewname($curview) eq [mc "Command line"]} {
-	    set rev [string map {"--gitk-symmetric-diff-marker" "--merge"} $vrevs($curview)]
-	} else {
-	    set rev $viewname($curview)
-	}
-    }
-    wm title . "[reponame]: $rev - $appname"
-}
-
-# Code to implement multiple views
-
-proc newview {ishighlight} {
-    global nextviewnum newviewname newishighlight
-    global revtreeargs viewargscmd newviewopts curview
-
-    set newishighlight $ishighlight
-    set top .gitkview
-    if {[winfo exists $top]} {
-	raise $top
-	return
-    }
-    decode_view_opts $nextviewnum $revtreeargs
-    set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
-    set newviewopts($nextviewnum,perm) 0
-    set newviewopts($nextviewnum,cmd)  $viewargscmd($curview)
-    vieweditor $top $nextviewnum [mc "Gitk view definition"]
-}
-
-set known_view_options {
-    {perm      b    .  {}               {mc "Remember this view"}}
-    {reflabel  l    +  {}               {mc "References (space separated list):"}}
-    {refs      t15  .. {}               {mc "Branches & tags:"}}
-    {allrefs   b    *. "--all"          {mc "All refs"}}
-    {branches  b    .  "--branches"     {mc "All (local) branches"}}
-    {tags      b    .  "--tags"         {mc "All tags"}}
-    {remotes   b    .  "--remotes"      {mc "All remote-tracking branches"}}
-    {commitlbl l    +  {}               {mc "Commit Info (regular expressions):"}}
-    {author    t15  .. "--author=*"     {mc "Author:"}}
-    {committer t15  .  "--committer=*"  {mc "Committer:"}}
-    {loginfo   t15  .. "--grep=*"       {mc "Commit Message:"}}
-    {allmatch  b    .. "--all-match"    {mc "Matches all Commit Info criteria"}}
-    {igrep     b    .. "--invert-grep"  {mc "Matches no Commit Info criteria"}}
-    {changes_l l    +  {}               {mc "Changes to Files:"}}
-    {pickaxe_s r0   .  {}               {mc "Fixed String"}}
-    {pickaxe_t r1   .  "--pickaxe-regex"  {mc "Regular Expression"}}
-    {pickaxe   t15  .. "-S*"            {mc "Search string:"}}
-    {datelabel l    +  {}               {mc "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 15:27:38\"):"}}
-    {since     t15  ..  {"--since=*" "--after=*"}  {mc "Since:"}}
-    {until     t15  .   {"--until=*" "--before=*"} {mc "Until:"}}
-    {limit_lbl l    +  {}               {mc "Limit and/or skip a number of revisions (positive integer):"}}
-    {limit     t10  *. "--max-count=*"  {mc "Number to show:"}}
-    {skip      t10  .  "--skip=*"       {mc "Number to skip:"}}
-    {misc_lbl  l    +  {}               {mc "Miscellaneous options:"}}
-    {dorder    b    *. {"--date-order" "-d"}      {mc "Strictly sort by date"}}
-    {lright    b    .  "--left-right"   {mc "Mark branch sides"}}
-    {first     b    .  "--first-parent" {mc "Limit to first parent"}}
-    {smplhst   b    .  "--simplify-by-decoration"   {mc "Simple history"}}
-    {args      t50  *. {}               {mc "Additional arguments to git log:"}}
-    {allpaths  path +  {}               {mc "Enter files and directories to include, one per line:"}}
-    {cmd       t50= +  {}               {mc "Command to generate more commits to include:"}}
-    }
-
-# Convert $newviewopts($n, ...) into args for git log.
-proc encode_view_opts {n} {
-    global known_view_options newviewopts
-
-    set rargs [list]
-    foreach opt $known_view_options {
-	set patterns [lindex $opt 3]
-	if {$patterns eq {}} continue
-	set pattern [lindex $patterns 0]
-
-	if {[lindex $opt 1] eq "b"} {
-	    set val $newviewopts($n,[lindex $opt 0])
-	    if {$val} {
-		lappend rargs $pattern
-	    }
-	} elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
-	    regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
-	    set val $newviewopts($n,$button_id)
-	    if {$val eq $value} {
-		lappend rargs $pattern
-	    }
-	} else {
-	    set val $newviewopts($n,[lindex $opt 0])
-	    set val [string trim $val]
-	    if {$val ne {}} {
-		set pfix [string range $pattern 0 end-1]
-		lappend rargs $pfix$val
-	    }
-	}
-    }
-    set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]]
-    return [concat $rargs [shellsplit $newviewopts($n,args)]]
-}
-
-# Fill $newviewopts($n, ...) based on args for git log.
-proc decode_view_opts {n view_args} {
-    global known_view_options newviewopts
-
-    foreach opt $known_view_options {
-	set id [lindex $opt 0]
-	if {[lindex $opt 1] eq "b"} {
-	    # Checkboxes
-	    set val 0
-        } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} {
-	    # Radiobuttons
-	    regexp {^(.*_)} $id uselessvar id
-	    set val 0
-	} else {
-	    # Text fields
-	    set val {}
-	}
-	set newviewopts($n,$id) $val
-    }
-    set oargs [list]
-    set refargs [list]
-    foreach arg $view_args {
-	if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
-	    && ![info exists found(limit)]} {
-	    set newviewopts($n,limit) $cnt
-	    set found(limit) 1
-	    continue
-	}
-	catch { unset val }
-	foreach opt $known_view_options {
-	    set id [lindex $opt 0]
-	    if {[info exists found($id)]} continue
-	    foreach pattern [lindex $opt 3] {
-		if {![string match $pattern $arg]} continue
-		if {[lindex $opt 1] eq "b"} {
-		    # Check buttons
-		    set val 1
-		} elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
-		    # Radio buttons
-		    regexp {^(.*_)} $id uselessvar id
-		    set val $num
-		} else {
-		    # Text input fields
-		    set size [string length $pattern]
-		    set val [string range $arg [expr {$size-1}] end]
-		}
-		set newviewopts($n,$id) $val
-		set found($id) 1
-		break
-	    }
-	    if {[info exists val]} break
-	}
-	if {[info exists val]} continue
-	if {[regexp {^-} $arg]} {
-	    lappend oargs $arg
-	} else {
-	    lappend refargs $arg
-	}
-    }
-    set newviewopts($n,refs) [shellarglist $refargs]
-    set newviewopts($n,args) [shellarglist $oargs]
-}
-
-proc edit_or_newview {} {
-    global curview
-
-    if {$curview > 0} {
-	editview
-    } else {
-	newview 0
-    }
-}
-
-proc editview {} {
-    global curview
-    global viewname viewperm newviewname newviewopts
-    global viewargs viewargscmd
-
-    set top .gitkvedit-$curview
-    if {[winfo exists $top]} {
-	raise $top
-	return
-    }
-    decode_view_opts $curview $viewargs($curview)
-    set newviewname($curview)      $viewname($curview)
-    set newviewopts($curview,perm) $viewperm($curview)
-    set newviewopts($curview,cmd)  $viewargscmd($curview)
-    vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
-}
-
-proc vieweditor {top n title} {
-    global newviewname newviewopts viewfiles bgcolor
-    global known_view_options NS
-
-    ttk_toplevel $top
-    wm title $top [concat $title [mc "-- criteria for selecting revisions"]]
-    make_transient $top .
-
-    # View name
-    ${NS}::frame $top.nfr
-    ${NS}::label $top.nl -text [mc "View Name"]
-    ${NS}::entry $top.name -width 20 -textvariable newviewname($n)
-    pack $top.nfr -in $top -fill x -pady 5 -padx 3
-    pack $top.nl -in $top.nfr -side left -padx {0 5}
-    pack $top.name -in $top.nfr -side left -padx {0 25}
-
-    # View options
-    set cframe $top.nfr
-    set cexpand 0
-    set cnt 0
-    foreach opt $known_view_options {
-	set id [lindex $opt 0]
-	set type [lindex $opt 1]
-	set flags [lindex $opt 2]
-	set title [eval [lindex $opt 4]]
-	set lxpad 0
-
-	if {$flags eq "+" || $flags eq "*"} {
-	    set cframe $top.fr$cnt
-	    incr cnt
-	    ${NS}::frame $cframe
-	    pack $cframe -in $top -fill x -pady 3 -padx 3
-	    set cexpand [expr {$flags eq "*"}]
-        } elseif {$flags eq ".." || $flags eq "*."} {
-	    set cframe $top.fr$cnt
-	    incr cnt
-	    ${NS}::frame $cframe
-	    pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
-	    set cexpand [expr {$flags eq "*."}]
-	} else {
-	    set lxpad 5
-	}
-
-	if {$type eq "l"} {
-            ${NS}::label $cframe.l_$id -text $title
-            pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w
-	} elseif {$type eq "b"} {
-	    ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
-	    pack $cframe.c_$id -in $cframe -side left \
-		-padx [list $lxpad 0] -expand $cexpand -anchor w
-	} elseif {[regexp {^r(\d+)$} $type type sz]} {
-	    regexp {^(.*_)} $id uselessvar button_id
-	    ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
-	    pack $cframe.c_$id -in $cframe -side left \
-		-padx [list $lxpad 0] -expand $cexpand -anchor w
-	} elseif {[regexp {^t(\d+)$} $type type sz]} {
-	    ${NS}::label $cframe.l_$id -text $title
-	    ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
-		-textvariable newviewopts($n,$id)
-	    pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
-	    pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
-	} elseif {[regexp {^t(\d+)=$} $type type sz]} {
-	    ${NS}::label $cframe.l_$id -text $title
-	    ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
-		-textvariable newviewopts($n,$id)
-	    pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
-	    pack $cframe.e_$id -in $cframe -side top -fill x
-	} elseif {$type eq "path"} {
-	    ${NS}::label $top.l -text $title
-	    pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
-	    text $top.t -width 40 -height 5 -background $bgcolor
-	    if {[info exists viewfiles($n)]} {
-		foreach f $viewfiles($n) {
-		    $top.t insert end $f
-		    $top.t insert end "\n"
-		}
-		$top.t delete {end - 1c} end
-		$top.t mark set insert 0.0
-	    }
-	    pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
-	}
-    }
-
-    ${NS}::frame $top.buts
-    ${NS}::button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
-    ${NS}::button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
-    ${NS}::button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
-    bind $top <Control-Return> [list newviewok $top $n]
-    bind $top <F5> [list newviewok $top $n 1]
-    bind $top <Escape> [list destroy $top]
-    grid $top.buts.ok $top.buts.apply $top.buts.can
-    grid columnconfigure $top.buts 0 -weight 1 -uniform a
-    grid columnconfigure $top.buts 1 -weight 1 -uniform a
-    grid columnconfigure $top.buts 2 -weight 1 -uniform a
-    pack $top.buts -in $top -side top -fill x
-    focus $top.t
-}
-
-proc doviewmenu {m first cmd op argv} {
-    set nmenu [$m index end]
-    for {set i $first} {$i <= $nmenu} {incr i} {
-	if {[$m entrycget $i -command] eq $cmd} {
-	    eval $m $op $i $argv
-	    break
-	}
-    }
-}
-
-proc allviewmenus {n op args} {
-    # global viewhlmenu
-
-    doviewmenu .bar.view 5 [list showview $n] $op $args
-    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
-}
-
-proc newviewok {top n {apply 0}} {
-    global nextviewnum newviewperm newviewname newishighlight
-    global viewname viewfiles viewperm viewchanged selectedview curview
-    global viewargs viewargscmd newviewopts viewhlmenu
-
-    if {[catch {
-	set newargs [encode_view_opts $n]
-    } err]} {
-	error_popup "[mc "Error in commit selection arguments:"] $err" $top
-	return
-    }
-    set files {}
-    foreach f [split [$top.t get 0.0 end] "\n"] {
-	set ft [string trim $f]
-	if {$ft ne {}} {
-	    lappend files $ft
-	}
-    }
-    if {![info exists viewfiles($n)]} {
-	# creating a new view
-	incr nextviewnum
-	set viewname($n) $newviewname($n)
-	set viewperm($n) $newviewopts($n,perm)
-	set viewchanged($n) 1
-	set viewfiles($n) $files
-	set viewargs($n) $newargs
-	set viewargscmd($n) $newviewopts($n,cmd)
-	addviewmenu $n
-	if {!$newishighlight} {
-	    run showview $n
-	} else {
-	    run addvhighlight $n
-	}
-    } else {
-	# editing an existing view
-	set viewperm($n) $newviewopts($n,perm)
-	set viewchanged($n) 1
-	if {$newviewname($n) ne $viewname($n)} {
-	    set viewname($n) $newviewname($n)
-	    doviewmenu .bar.view 5 [list showview $n] \
-		entryconf [list -label $viewname($n)]
-	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
-		# entryconf [list -label $viewname($n) -value $viewname($n)]
-	}
-	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
-		$newviewopts($n,cmd) ne $viewargscmd($n)} {
-	    set viewfiles($n) $files
-	    set viewargs($n) $newargs
-	    set viewargscmd($n) $newviewopts($n,cmd)
-	    if {$curview == $n} {
-		run reloadcommits
-	    }
-	}
-    }
-    if {$apply} return
-    catch {destroy $top}
-}
-
-proc delview {} {
-    global curview viewperm hlview selectedhlview viewchanged
-
-    if {$curview == 0} return
-    if {[info exists hlview] && $hlview == $curview} {
-	set selectedhlview [mc "None"]
-	unset hlview
-    }
-    allviewmenus $curview delete
-    set viewperm($curview) 0
-    set viewchanged($curview) 1
-    showview 0
-}
-
-proc addviewmenu {n} {
-    global viewname viewhlmenu
-
-    .bar.view add radiobutton -label $viewname($n) \
-	-command [list showview $n] -variable selectedview -value $n
-    #$viewhlmenu add radiobutton -label $viewname($n) \
-    #	-command [list addvhighlight $n] -variable selectedhlview
-}
-
-proc showview {n} {
-    global curview cached_commitrow ordertok
-    global displayorder parentlist rowidlist rowisopt rowfinal
-    global colormap rowtextx nextcolor canvxmax
-    global numcommits viewcomplete
-    global selectedline currentid canv canvy0
-    global treediffs
-    global pending_select mainheadid
-    global commitidx
-    global selectedview
-    global hlview selectedhlview commitinterest
-
-    if {$n == $curview} return
-    set selid {}
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    set span [$canv yview]
-    set ytop [expr {[lindex $span 0] * $ymax}]
-    set ybot [expr {[lindex $span 1] * $ymax}]
-    set yscreen [expr {($ybot - $ytop) / 2}]
-    if {$selectedline ne {}} {
-	set selid $currentid
-	set y [yc $selectedline]
-	if {$ytop < $y && $y < $ybot} {
-	    set yscreen [expr {$y - $ytop}]
-	}
-    } elseif {[info exists pending_select]} {
-	set selid $pending_select
-	unset pending_select
-    }
-    unselectline
-    normalline
-    unset -nocomplain treediffs
-    clear_display
-    if {[info exists hlview] && $hlview == $n} {
-	unset hlview
-	set selectedhlview [mc "None"]
-    }
-    unset -nocomplain commitinterest
-    unset -nocomplain cached_commitrow
-    unset -nocomplain ordertok
-
-    set curview $n
-    set selectedview $n
-    .bar.view entryconf [mca "&Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
-    .bar.view entryconf [mca "&Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
-
-    run refill_reflist
-    if {![info exists viewcomplete($n)]} {
-	getcommits $selid
-	return
-    }
-
-    set displayorder {}
-    set parentlist {}
-    set rowidlist {}
-    set rowisopt {}
-    set rowfinal {}
-    set numcommits $commitidx($n)
-
-    unset -nocomplain colormap
-    unset -nocomplain rowtextx
-    set nextcolor 0
-    set canvxmax [$canv cget -width]
-    set curview $n
-    set row 0
-    setcanvscroll
-    set yf 0
-    set row {}
-    if {$selid ne {} && [commitinview $selid $n]} {
-	set row [rowofcommit $selid]
-	# try to get the selected row in the same position on the screen
-	set ymax [lindex [$canv cget -scrollregion] 3]
-	set ytop [expr {[yc $row] - $yscreen}]
-	if {$ytop < 0} {
-	    set ytop 0
-	}
-	set yf [expr {$ytop * 1.0 / $ymax}]
-    }
-    allcanvs yview moveto $yf
-    drawvisible
-    if {$row ne {}} {
-	selectline $row 0
-    } elseif {!$viewcomplete($n)} {
-	reset_pending_select $selid
-    } else {
-	reset_pending_select {}
-
-	if {[commitinview $pending_select $curview]} {
-	    selectline [rowofcommit $pending_select] 1
-	} else {
-	    set row [first_real_row]
-	    if {$row < $numcommits} {
-		selectline $row 0
-	    }
-	}
-    }
-    if {!$viewcomplete($n)} {
-	if {$numcommits == 0} {
-	    show_status [mc "Reading commits..."]
-	}
-    } elseif {$numcommits == 0} {
-	show_status [mc "No commits selected"]
-    }
-    set_window_title
-}
-
-# Stuff relating to the highlighting facility
-
-proc ishighlighted {id} {
-    global vhighlights fhighlights nhighlights rhighlights
-
-    if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
-	return $nhighlights($id)
-    }
-    if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
-	return $vhighlights($id)
-    }
-    if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
-	return $fhighlights($id)
-    }
-    if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
-	return $rhighlights($id)
-    }
-    return 0
-}
-
-proc bolden {id font} {
-    global canv linehtag currentid boldids need_redisplay markedid
-
-    # need_redisplay = 1 means the display is stale and about to be redrawn
-    if {$need_redisplay} return
-    lappend boldids $id
-    $canv itemconf $linehtag($id) -font $font
-    if {[info exists currentid] && $id eq $currentid} {
-	$canv delete secsel
-	set t [eval $canv create rect [$canv bbox $linehtag($id)] \
-		   -outline {{}} -tags secsel \
-		   -fill [$canv cget -selectbackground]]
-	$canv lower $t
-    }
-    if {[info exists markedid] && $id eq $markedid} {
-	make_idmark $id
-    }
-}
-
-proc bolden_name {id font} {
-    global canv2 linentag currentid boldnameids need_redisplay
-
-    if {$need_redisplay} return
-    lappend boldnameids $id
-    $canv2 itemconf $linentag($id) -font $font
-    if {[info exists currentid] && $id eq $currentid} {
-	$canv2 delete secsel
-	set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
-		   -outline {{}} -tags secsel \
-		   -fill [$canv2 cget -selectbackground]]
-	$canv2 lower $t
-    }
-}
-
-proc unbolden {} {
-    global boldids
-
-    set stillbold {}
-    foreach id $boldids {
-	if {![ishighlighted $id]} {
-	    bolden $id mainfont
-	} else {
-	    lappend stillbold $id
-	}
-    }
-    set boldids $stillbold
-}
-
-proc addvhighlight {n} {
-    global hlview viewcomplete curview vhl_done commitidx
-
-    if {[info exists hlview]} {
-	delvhighlight
-    }
-    set hlview $n
-    if {$n != $curview && ![info exists viewcomplete($n)]} {
-	start_rev_list $n
-    }
-    set vhl_done $commitidx($hlview)
-    if {$vhl_done > 0} {
-	drawvisible
-    }
-}
-
-proc delvhighlight {} {
-    global hlview vhighlights
-
-    if {![info exists hlview]} return
-    unset hlview
-    unset -nocomplain vhighlights
-    unbolden
-}
-
-proc vhighlightmore {} {
-    global hlview vhl_done commitidx vhighlights curview
-
-    set max $commitidx($hlview)
-    set vr [visiblerows]
-    set r0 [lindex $vr 0]
-    set r1 [lindex $vr 1]
-    for {set i $vhl_done} {$i < $max} {incr i} {
-	set id [commitonrow $i $hlview]
-	if {[commitinview $id $curview]} {
-	    set row [rowofcommit $id]
-	    if {$r0 <= $row && $row <= $r1} {
-		if {![highlighted $row]} {
-		    bolden $id mainfontbold
-		}
-		set vhighlights($id) 1
-	    }
-	}
-    }
-    set vhl_done $max
-    return 0
-}
-
-proc askvhighlight {row id} {
-    global hlview vhighlights iddrawn
-
-    if {[commitinview $id $hlview]} {
-	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
-	    bolden $id mainfontbold
-	}
-	set vhighlights($id) 1
-    } else {
-	set vhighlights($id) 0
-    }
-}
-
-proc hfiles_change {} {
-    global highlight_files filehighlight fhighlights fh_serial
-    global highlight_paths
-
-    if {[info exists filehighlight]} {
-	# delete previous highlights
-	catch {close $filehighlight}
-	unset filehighlight
-	unset -nocomplain fhighlights
-	unbolden
-	unhighlight_filelist
-    }
-    set highlight_paths {}
-    after cancel do_file_hl $fh_serial
-    incr fh_serial
-    if {$highlight_files ne {}} {
-	after 300 do_file_hl $fh_serial
-    }
-}
-
-proc gdttype_change {name ix op} {
-    global gdttype highlight_files findstring findpattern
-
-    stopfinding
-    if {$findstring ne {}} {
-	if {$gdttype eq [mc "containing:"]} {
-	    if {$highlight_files ne {}} {
-		set highlight_files {}
-		hfiles_change
-	    }
-	    findcom_change
-	} else {
-	    if {$findpattern ne {}} {
-		set findpattern {}
-		findcom_change
-	    }
-	    set highlight_files $findstring
-	    hfiles_change
-	}
-	drawvisible
-    }
-    # enable/disable findtype/findloc menus too
-}
-
-proc find_change {name ix op} {
-    global gdttype findstring highlight_files
-
-    stopfinding
-    if {$gdttype eq [mc "containing:"]} {
-	findcom_change
-    } else {
-	if {$highlight_files ne $findstring} {
-	    set highlight_files $findstring
-	    hfiles_change
-	}
-    }
-    drawvisible
-}
-
-proc findcom_change args {
-    global nhighlights boldnameids
-    global findpattern findtype findstring gdttype
-
-    stopfinding
-    # delete previous highlights, if any
-    foreach id $boldnameids {
-	bolden_name $id mainfont
-    }
-    set boldnameids {}
-    unset -nocomplain nhighlights
-    unbolden
-    unmarkmatches
-    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
-	set findpattern {}
-    } elseif {$findtype eq [mc "Regexp"]} {
-	set findpattern $findstring
-    } else {
-	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
-		   $findstring]
-	set findpattern "*$e*"
-    }
-}
-
-proc makepatterns {l} {
-    set ret {}
-    foreach e $l {
-	set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
-	if {[string index $ee end] eq "/"} {
-	    lappend ret "$ee*"
-	} else {
-	    lappend ret $ee
-	    lappend ret "$ee/*"
-	}
-    }
-    return $ret
-}
-
-proc do_file_hl {serial} {
-    global highlight_files filehighlight highlight_paths gdttype fhl_list
-    global cdup findtype
-
-    if {$gdttype eq [mc "touching paths:"]} {
-	# If "exact" match then convert backslashes to forward slashes.
-	# Most useful to support Windows-flavoured file paths.
-	if {$findtype eq [mc "Exact"]} {
-	    set highlight_files [string map {"\\" "/"} $highlight_files]
-	}
-	if {[catch {set paths [shellsplit $highlight_files]}]} return
-	set highlight_paths [makepatterns $paths]
-	highlight_filelist
-	set relative_paths {}
-	foreach path $paths {
-	    lappend relative_paths [file join $cdup $path]
-	}
-	set gdtargs [concat -- $relative_paths]
-    } elseif {$gdttype eq [mc "adding/removing string:"]} {
-	set gdtargs [list "-S$highlight_files"]
-    } elseif {$gdttype eq [mc "changing lines matching:"]} {
-	set gdtargs [list "-G$highlight_files"]
-    } else {
-	# must be "containing:", i.e. we're searching commit info
-	return
-    }
-    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
-    set filehighlight [open $cmd r+]
-    fconfigure $filehighlight -blocking 0
-    filerun $filehighlight readfhighlight
-    set fhl_list {}
-    drawvisible
-    flushhighlights
-}
-
-proc flushhighlights {} {
-    global filehighlight fhl_list
-
-    if {[info exists filehighlight]} {
-	lappend fhl_list {}
-	puts $filehighlight ""
-	flush $filehighlight
-    }
-}
-
-proc askfilehighlight {row id} {
-    global filehighlight fhighlights fhl_list
-
-    lappend fhl_list $id
-    set fhighlights($id) -1
-    puts $filehighlight $id
-}
-
-proc readfhighlight {} {
-    global filehighlight fhighlights curview iddrawn
-    global fhl_list find_dirn
-
-    if {![info exists filehighlight]} {
-	return 0
-    }
-    set nr 0
-    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
-	set line [string trim $line]
-	set i [lsearch -exact $fhl_list $line]
-	if {$i < 0} continue
-	for {set j 0} {$j < $i} {incr j} {
-	    set id [lindex $fhl_list $j]
-	    set fhighlights($id) 0
-	}
-	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
-	if {$line eq {}} continue
-	if {![commitinview $line $curview]} continue
-	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
-	    bolden $line mainfontbold
-	}
-	set fhighlights($line) 1
-    }
-    if {[eof $filehighlight]} {
-	# strange...
-	puts "oops, git diff-tree died"
-	catch {close $filehighlight}
-	unset filehighlight
-	return 0
-    }
-    if {[info exists find_dirn]} {
-	run findmore
-    }
-    return 1
-}
-
-proc doesmatch {f} {
-    global findtype findpattern
-
-    if {$findtype eq [mc "Regexp"]} {
-	return [regexp $findpattern $f]
-    } elseif {$findtype eq [mc "IgnCase"]} {
-	return [string match -nocase $findpattern $f]
-    } else {
-	return [string match $findpattern $f]
-    }
-}
-
-proc askfindhighlight {row id} {
-    global nhighlights commitinfo iddrawn
-    global findloc
-    global markingmatches
-
-    if {![info exists commitinfo($id)]} {
-	getcommit $id
-    }
-    set info $commitinfo($id)
-    set isbold 0
-    set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]]
-    foreach f $info ty $fldtypes {
-	if {$ty eq ""} continue
-	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
-	    [doesmatch $f]} {
-	    if {$ty eq [mc "Author"]} {
-		set isbold 2
-		break
-	    }
-	    set isbold 1
-	}
-    }
-    if {$isbold && [info exists iddrawn($id)]} {
-	if {![ishighlighted $id]} {
-	    bolden $id mainfontbold
-	    if {$isbold > 1} {
-		bolden_name $id mainfontbold
-	    }
-	}
-	if {$markingmatches} {
-	    markrowmatches $row $id
-	}
-    }
-    set nhighlights($id) $isbold
-}
-
-proc markrowmatches {row id} {
-    global canv canv2 linehtag linentag commitinfo findloc
-
-    set headline [lindex $commitinfo($id) 0]
-    set author [lindex $commitinfo($id) 1]
-    $canv delete match$row
-    $canv2 delete match$row
-    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
-	set m [findmatches $headline]
-	if {$m ne {}} {
-	    markmatches $canv $row $headline $linehtag($id) $m \
-		[$canv itemcget $linehtag($id) -font] $row
-	}
-    }
-    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
-	set m [findmatches $author]
-	if {$m ne {}} {
-	    markmatches $canv2 $row $author $linentag($id) $m \
-		[$canv2 itemcget $linentag($id) -font] $row
-	}
-    }
-}
-
-proc vrel_change {name ix op} {
-    global highlight_related
-
-    rhighlight_none
-    if {$highlight_related ne [mc "None"]} {
-	run drawvisible
-    }
-}
-
-# prepare for testing whether commits are descendents or ancestors of a
-proc rhighlight_sel {a} {
-    global descendent desc_todo ancestor anc_todo
-    global highlight_related
-
-    unset -nocomplain descendent
-    set desc_todo [list $a]
-    unset -nocomplain ancestor
-    set anc_todo [list $a]
-    if {$highlight_related ne [mc "None"]} {
-	rhighlight_none
-	run drawvisible
-    }
-}
-
-proc rhighlight_none {} {
-    global rhighlights
-
-    unset -nocomplain rhighlights
-    unbolden
-}
-
-proc is_descendent {a} {
-    global curview children descendent desc_todo
-
-    set v $curview
-    set la [rowofcommit $a]
-    set todo $desc_todo
-    set leftover {}
-    set done 0
-    for {set i 0} {$i < [llength $todo]} {incr i} {
-	set do [lindex $todo $i]
-	if {[rowofcommit $do] < $la} {
-	    lappend leftover $do
-	    continue
-	}
-	foreach nk $children($v,$do) {
-	    if {![info exists descendent($nk)]} {
-		set descendent($nk) 1
-		lappend todo $nk
-		if {$nk eq $a} {
-		    set done 1
-		}
-	    }
-	}
-	if {$done} {
-	    set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
-	    return
-	}
-    }
-    set descendent($a) 0
-    set desc_todo $leftover
-}
-
-proc is_ancestor {a} {
-    global curview parents ancestor anc_todo
-
-    set v $curview
-    set la [rowofcommit $a]
-    set todo $anc_todo
-    set leftover {}
-    set done 0
-    for {set i 0} {$i < [llength $todo]} {incr i} {
-	set do [lindex $todo $i]
-	if {![commitinview $do $v] || [rowofcommit $do] > $la} {
-	    lappend leftover $do
-	    continue
-	}
-	foreach np $parents($v,$do) {
-	    if {![info exists ancestor($np)]} {
-		set ancestor($np) 1
-		lappend todo $np
-		if {$np eq $a} {
-		    set done 1
-		}
-	    }
-	}
-	if {$done} {
-	    set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
-	    return
-	}
-    }
-    set ancestor($a) 0
-    set anc_todo $leftover
-}
-
-proc askrelhighlight {row id} {
-    global descendent highlight_related iddrawn rhighlights
-    global selectedline ancestor
-
-    if {$selectedline eq {}} return
-    set isbold 0
-    if {$highlight_related eq [mc "Descendant"] ||
-	$highlight_related eq [mc "Not descendant"]} {
-	if {![info exists descendent($id)]} {
-	    is_descendent $id
-	}
-	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
-	    set isbold 1
-	}
-    } elseif {$highlight_related eq [mc "Ancestor"] ||
-	      $highlight_related eq [mc "Not ancestor"]} {
-	if {![info exists ancestor($id)]} {
-	    is_ancestor $id
-	}
-	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
-	    set isbold 1
-	}
-    }
-    if {[info exists iddrawn($id)]} {
-	if {$isbold && ![ishighlighted $id]} {
-	    bolden $id mainfontbold
-	}
-    }
-    set rhighlights($id) $isbold
-}
-
-# Graph layout functions
-
-proc shortids {ids} {
-    set res {}
-    foreach id $ids {
-	if {[llength $id] > 1} {
-	    lappend res [shortids $id]
-	} elseif {[regexp {^[0-9a-f]{40}$} $id]} {
-	    lappend res [string range $id 0 7]
-	} else {
-	    lappend res $id
-	}
-    }
-    return $res
-}
-
-proc ntimes {n o} {
-    set ret {}
-    set o [list $o]
-    for {set mask 1} {$mask <= $n} {incr mask $mask} {
-	if {($n & $mask) != 0} {
-	    set ret [concat $ret $o]
-	}
-	set o [concat $o $o]
-    }
-    return $ret
-}
-
-proc ordertoken {id} {
-    global ordertok curview varcid varcstart varctok curview parents children
-    global nullid nullid2
-
-    if {[info exists ordertok($id)]} {
-	return $ordertok($id)
-    }
-    set origid $id
-    set todo {}
-    while {1} {
-	if {[info exists varcid($curview,$id)]} {
-	    set a $varcid($curview,$id)
-	    set p [lindex $varcstart($curview) $a]
-	} else {
-	    set p [lindex $children($curview,$id) 0]
-	}
-	if {[info exists ordertok($p)]} {
-	    set tok $ordertok($p)
-	    break
-	}
-	set id [first_real_child $curview,$p]
-	if {$id eq {}} {
-	    # it's a root
-	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
-	    break
-	}
-	if {[llength $parents($curview,$id)] == 1} {
-	    lappend todo [list $p {}]
-	} else {
-	    set j [lsearch -exact $parents($curview,$id) $p]
-	    if {$j < 0} {
-		puts "oops didn't find [shortids $p] in parents of [shortids $id]"
-	    }
-	    lappend todo [list $p [strrep $j]]
-	}
-    }
-    for {set i [llength $todo]} {[incr i -1] >= 0} {} {
-	set p [lindex $todo $i 0]
-	append tok [lindex $todo $i 1]
-	set ordertok($p) $tok
-    }
-    set ordertok($origid) $tok
-    return $tok
-}
-
-# Work out where id should go in idlist so that order-token
-# values increase from left to right
-proc idcol {idlist id {i 0}} {
-    set t [ordertoken $id]
-    if {$i < 0} {
-	set i 0
-    }
-    if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
-	if {$i > [llength $idlist]} {
-	    set i [llength $idlist]
-	}
-	while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
-	incr i
-    } else {
-	if {$t > [ordertoken [lindex $idlist $i]]} {
-	    while {[incr i] < [llength $idlist] &&
-		   $t >= [ordertoken [lindex $idlist $i]]} {}
-	}
-    }
-    return $i
-}
-
-proc initlayout {} {
-    global rowidlist rowisopt rowfinal displayorder parentlist
-    global numcommits canvxmax canv
-    global nextcolor
-    global colormap rowtextx
-
-    set numcommits 0
-    set displayorder {}
-    set parentlist {}
-    set nextcolor 0
-    set rowidlist {}
-    set rowisopt {}
-    set rowfinal {}
-    set canvxmax [$canv cget -width]
-    unset -nocomplain colormap
-    unset -nocomplain rowtextx
-    setcanvscroll
-}
-
-proc setcanvscroll {} {
-    global canv canv2 canv3 numcommits linespc canvxmax canvy0
-    global lastscrollset lastscrollrows
-
-    set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
-    $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
-    $canv2 conf -scrollregion [list 0 0 0 $ymax]
-    $canv3 conf -scrollregion [list 0 0 0 $ymax]
-    set lastscrollset [clock clicks -milliseconds]
-    set lastscrollrows $numcommits
-}
-
-proc visiblerows {} {
-    global canv numcommits linespc
-
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    if {$ymax eq {} || $ymax == 0} return
-    set f [$canv yview]
-    set y0 [expr {int([lindex $f 0] * $ymax)}]
-    set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
-    if {$r0 < 0} {
-	set r0 0
-    }
-    set y1 [expr {int([lindex $f 1] * $ymax)}]
-    set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
-    if {$r1 >= $numcommits} {
-	set r1 [expr {$numcommits - 1}]
-    }
-    return [list $r0 $r1]
-}
-
-proc layoutmore {} {
-    global commitidx viewcomplete curview
-    global numcommits pending_select curview
-    global lastscrollset lastscrollrows
-
-    if {$lastscrollrows < 100 || $viewcomplete($curview) ||
-	[clock clicks -milliseconds] - $lastscrollset > 500} {
-	setcanvscroll
-    }
-    if {[info exists pending_select] &&
-	[commitinview $pending_select $curview]} {
-	update
-	selectline [rowofcommit $pending_select] 1
-    }
-    drawvisible
-}
-
-# With path limiting, we mightn't get the actual HEAD commit,
-# so ask git rev-list what is the first ancestor of HEAD that
-# touches a file in the path limit.
-proc get_viewmainhead {view} {
-    global viewmainheadid vfilelimit viewinstances mainheadid
-
-    catch {
-	set rfd [open [concat | git rev-list -1 $mainheadid \
-			   -- $vfilelimit($view)] r]
-	set j [reg_instance $rfd]
-	lappend viewinstances($view) $j
-	fconfigure $rfd -blocking 0
-	filerun $rfd [list getviewhead $rfd $j $view]
-	set viewmainheadid($curview) {}
-    }
-}
-
-# git rev-list should give us just 1 line to use as viewmainheadid($view)
-proc getviewhead {fd inst view} {
-    global viewmainheadid commfd curview viewinstances showlocalchanges
-
-    set id {}
-    if {[gets $fd line] < 0} {
-	if {![eof $fd]} {
-	    return 1
-	}
-    } elseif {[string length $line] == 40 && [string is xdigit $line]} {
-	set id $line
-    }
-    set viewmainheadid($view) $id
-    close $fd
-    unset commfd($inst)
-    set i [lsearch -exact $viewinstances($view) $inst]
-    if {$i >= 0} {
-	set viewinstances($view) [lreplace $viewinstances($view) $i $i]
-    }
-    if {$showlocalchanges && $id ne {} && $view == $curview} {
-	doshowlocalchanges
-    }
-    return 0
-}
-
-proc doshowlocalchanges {} {
-    global curview viewmainheadid
-
-    if {$viewmainheadid($curview) eq {}} return
-    if {[commitinview $viewmainheadid($curview) $curview]} {
-	dodiffindex
-    } else {
-	interestedin $viewmainheadid($curview) dodiffindex
-    }
-}
-
-proc dohidelocalchanges {} {
-    global nullid nullid2 lserial curview
-
-    if {[commitinview $nullid $curview]} {
-	removefakerow $nullid
-    }
-    if {[commitinview $nullid2 $curview]} {
-	removefakerow $nullid2
-    }
-    incr lserial
-}
-
-# spawn off a process to do git diff-index --cached HEAD
-proc dodiffindex {} {
-    global lserial showlocalchanges vfilelimit curview
-    global hasworktree git_version
-
-    if {!$showlocalchanges || !$hasworktree} return
-    incr lserial
-    if {[package vcompare $git_version "1.7.2"] >= 0} {
-	set cmd "|git diff-index --cached --ignore-submodules=dirty HEAD"
-    } else {
-	set cmd "|git diff-index --cached HEAD"
-    }
-    if {$vfilelimit($curview) ne {}} {
-	set cmd [concat $cmd -- $vfilelimit($curview)]
-    }
-    set fd [open $cmd r]
-    fconfigure $fd -blocking 0
-    set i [reg_instance $fd]
-    filerun $fd [list readdiffindex $fd $lserial $i]
-}
-
-proc readdiffindex {fd serial inst} {
-    global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
-    global vfilelimit
-
-    set isdiff 1
-    if {[gets $fd line] < 0} {
-	if {![eof $fd]} {
-	    return 1
-	}
-	set isdiff 0
-    }
-    # we only need to see one line and we don't really care what it says...
-    stop_instance $inst
-
-    if {$serial != $lserial} {
-	return 0
-    }
-
-    # now see if there are any local changes not checked in to the index
-    set cmd "|git diff-files"
-    if {$vfilelimit($curview) ne {}} {
-	set cmd [concat $cmd -- $vfilelimit($curview)]
-    }
-    set fd [open $cmd r]
-    fconfigure $fd -blocking 0
-    set i [reg_instance $fd]
-    filerun $fd [list readdifffiles $fd $serial $i]
-
-    if {$isdiff && ![commitinview $nullid2 $curview]} {
-	# add the line for the changes in the index to the graph
-	set hl [mc "Local changes checked in to index but not committed"]
-	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
-	set commitdata($nullid2) "\n    $hl\n"
-	if {[commitinview $nullid $curview]} {
-	    removefakerow $nullid
-	}
-	insertfakerow $nullid2 $viewmainheadid($curview)
-    } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
-	if {[commitinview $nullid $curview]} {
-	    removefakerow $nullid
-	}
-	removefakerow $nullid2
-    }
-    return 0
-}
-
-proc readdifffiles {fd serial inst} {
-    global viewmainheadid nullid nullid2 curview
-    global commitinfo commitdata lserial
-
-    set isdiff 1
-    if {[gets $fd line] < 0} {
-	if {![eof $fd]} {
-	    return 1
-	}
-	set isdiff 0
-    }
-    # we only need to see one line and we don't really care what it says...
-    stop_instance $inst
-
-    if {$serial != $lserial} {
-	return 0
-    }
-
-    if {$isdiff && ![commitinview $nullid $curview]} {
-	# add the line for the local diff to the graph
-	set hl [mc "Local uncommitted changes, not checked in to index"]
-	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
-	set commitdata($nullid) "\n    $hl\n"
-	if {[commitinview $nullid2 $curview]} {
-	    set p $nullid2
-	} else {
-	    set p $viewmainheadid($curview)
-	}
-	insertfakerow $nullid $p
-    } elseif {!$isdiff && [commitinview $nullid $curview]} {
-	removefakerow $nullid
-    }
-    return 0
-}
-
-proc nextuse {id row} {
-    global curview children
-
-    if {[info exists children($curview,$id)]} {
-	foreach kid $children($curview,$id) {
-	    if {![commitinview $kid $curview]} {
-		return -1
-	    }
-	    if {[rowofcommit $kid] > $row} {
-		return [rowofcommit $kid]
-	    }
-	}
-    }
-    if {[commitinview $id $curview]} {
-	return [rowofcommit $id]
-    }
-    return -1
-}
-
-proc prevuse {id row} {
-    global curview children
-
-    set ret -1
-    if {[info exists children($curview,$id)]} {
-	foreach kid $children($curview,$id) {
-	    if {![commitinview $kid $curview]} break
-	    if {[rowofcommit $kid] < $row} {
-		set ret [rowofcommit $kid]
-	    }
-	}
-    }
-    return $ret
-}
-
-proc make_idlist {row} {
-    global displayorder parentlist uparrowlen downarrowlen mingaplen
-    global commitidx curview children
-
-    set r [expr {$row - $mingaplen - $downarrowlen - 1}]
-    if {$r < 0} {
-	set r 0
-    }
-    set ra [expr {$row - $downarrowlen}]
-    if {$ra < 0} {
-	set ra 0
-    }
-    set rb [expr {$row + $uparrowlen}]
-    if {$rb > $commitidx($curview)} {
-	set rb $commitidx($curview)
-    }
-    make_disporder $r [expr {$rb + 1}]
-    set ids {}
-    for {} {$r < $ra} {incr r} {
-	set nextid [lindex $displayorder [expr {$r + 1}]]
-	foreach p [lindex $parentlist $r] {
-	    if {$p eq $nextid} continue
-	    set rn [nextuse $p $r]
-	    if {$rn >= $row &&
-		$rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
-		lappend ids [list [ordertoken $p] $p]
-	    }
-	}
-    }
-    for {} {$r < $row} {incr r} {
-	set nextid [lindex $displayorder [expr {$r + 1}]]
-	foreach p [lindex $parentlist $r] {
-	    if {$p eq $nextid} continue
-	    set rn [nextuse $p $r]
-	    if {$rn < 0 || $rn >= $row} {
-		lappend ids [list [ordertoken $p] $p]
-	    }
-	}
-    }
-    set id [lindex $displayorder $row]
-    lappend ids [list [ordertoken $id] $id]
-    while {$r < $rb} {
-	foreach p [lindex $parentlist $r] {
-	    set firstkid [lindex $children($curview,$p) 0]
-	    if {[rowofcommit $firstkid] < $row} {
-		lappend ids [list [ordertoken $p] $p]
-	    }
-	}
-	incr r
-	set id [lindex $displayorder $r]
-	if {$id ne {}} {
-	    set firstkid [lindex $children($curview,$id) 0]
-	    if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
-		lappend ids [list [ordertoken $id] $id]
-	    }
-	}
-    }
-    set idlist {}
-    foreach idx [lsort -unique $ids] {
-	lappend idlist [lindex $idx 1]
-    }
-    return $idlist
-}
-
-proc rowsequal {a b} {
-    while {[set i [lsearch -exact $a {}]] >= 0} {
-	set a [lreplace $a $i $i]
-    }
-    while {[set i [lsearch -exact $b {}]] >= 0} {
-	set b [lreplace $b $i $i]
-    }
-    return [expr {$a eq $b}]
-}
-
-proc makeupline {id row rend col} {
-    global rowidlist uparrowlen downarrowlen mingaplen
-
-    for {set r $rend} {1} {set r $rstart} {
-	set rstart [prevuse $id $r]
-	if {$rstart < 0} return
-	if {$rstart < $row} break
-    }
-    if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
-	set rstart [expr {$rend - $uparrowlen - 1}]
-    }
-    for {set r $rstart} {[incr r] <= $row} {} {
-	set idlist [lindex $rowidlist $r]
-	if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
-	    set col [idcol $idlist $id $col]
-	    lset rowidlist $r [linsert $idlist $col $id]
-	    changedrow $r
-	}
-    }
-}
-
-proc layoutrows {row endrow} {
-    global rowidlist rowisopt rowfinal displayorder
-    global uparrowlen downarrowlen maxwidth mingaplen
-    global children parentlist
-    global commitidx viewcomplete curview
-
-    make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
-    set idlist {}
-    if {$row > 0} {
-	set rm1 [expr {$row - 1}]
-	foreach id [lindex $rowidlist $rm1] {
-	    if {$id ne {}} {
-		lappend idlist $id
-	    }
-	}
-	set final [lindex $rowfinal $rm1]
-    }
-    for {} {$row < $endrow} {incr row} {
-	set rm1 [expr {$row - 1}]
-	if {$rm1 < 0 || $idlist eq {}} {
-	    set idlist [make_idlist $row]
-	    set final 1
-	} else {
-	    set id [lindex $displayorder $rm1]
-	    set col [lsearch -exact $idlist $id]
-	    set idlist [lreplace $idlist $col $col]
-	    foreach p [lindex $parentlist $rm1] {
-		if {[lsearch -exact $idlist $p] < 0} {
-		    set col [idcol $idlist $p $col]
-		    set idlist [linsert $idlist $col $p]
-		    # if not the first child, we have to insert a line going up
-		    if {$id ne [lindex $children($curview,$p) 0]} {
-			makeupline $p $rm1 $row $col
-		    }
-		}
-	    }
-	    set id [lindex $displayorder $row]
-	    if {$row > $downarrowlen} {
-		set termrow [expr {$row - $downarrowlen - 1}]
-		foreach p [lindex $parentlist $termrow] {
-		    set i [lsearch -exact $idlist $p]
-		    if {$i < 0} continue
-		    set nr [nextuse $p $termrow]
-		    if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
-			set idlist [lreplace $idlist $i $i]
-		    }
-		}
-	    }
-	    set col [lsearch -exact $idlist $id]
-	    if {$col < 0} {
-		set col [idcol $idlist $id]
-		set idlist [linsert $idlist $col $id]
-		if {$children($curview,$id) ne {}} {
-		    makeupline $id $rm1 $row $col
-		}
-	    }
-	    set r [expr {$row + $uparrowlen - 1}]
-	    if {$r < $commitidx($curview)} {
-		set x $col
-		foreach p [lindex $parentlist $r] {
-		    if {[lsearch -exact $idlist $p] >= 0} continue
-		    set fk [lindex $children($curview,$p) 0]
-		    if {[rowofcommit $fk] < $row} {
-			set x [idcol $idlist $p $x]
-			set idlist [linsert $idlist $x $p]
-		    }
-		}
-		if {[incr r] < $commitidx($curview)} {
-		    set p [lindex $displayorder $r]
-		    if {[lsearch -exact $idlist $p] < 0} {
-			set fk [lindex $children($curview,$p) 0]
-			if {$fk ne {} && [rowofcommit $fk] < $row} {
-			    set x [idcol $idlist $p $x]
-			    set idlist [linsert $idlist $x $p]
-			}
-		    }
-		}
-	    }
-	}
-	if {$final && !$viewcomplete($curview) &&
-	    $row + $uparrowlen + $mingaplen + $downarrowlen
-		>= $commitidx($curview)} {
-	    set final 0
-	}
-	set l [llength $rowidlist]
-	if {$row == $l} {
-	    lappend rowidlist $idlist
-	    lappend rowisopt 0
-	    lappend rowfinal $final
-	} elseif {$row < $l} {
-	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
-		lset rowidlist $row $idlist
-		changedrow $row
-	    }
-	    lset rowfinal $row $final
-	} else {
-	    set pad [ntimes [expr {$row - $l}] {}]
-	    set rowidlist [concat $rowidlist $pad]
-	    lappend rowidlist $idlist
-	    set rowfinal [concat $rowfinal $pad]
-	    lappend rowfinal $final
-	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
-	}
-    }
-    return $row
-}
-
-proc changedrow {row} {
-    global displayorder iddrawn rowisopt need_redisplay
-
-    set l [llength $rowisopt]
-    if {$row < $l} {
-	lset rowisopt $row 0
-	if {$row + 1 < $l} {
-	    lset rowisopt [expr {$row + 1}] 0
-	    if {$row + 2 < $l} {
-		lset rowisopt [expr {$row + 2}] 0
-	    }
-	}
-    }
-    set id [lindex $displayorder $row]
-    if {[info exists iddrawn($id)]} {
-	set need_redisplay 1
-    }
-}
-
-proc insert_pad {row col npad} {
-    global rowidlist
-
-    set pad [ntimes $npad {}]
-    set idlist [lindex $rowidlist $row]
-    set bef [lrange $idlist 0 [expr {$col - 1}]]
-    set aft [lrange $idlist $col end]
-    set i [lsearch -exact $aft {}]
-    if {$i > 0} {
-	set aft [lreplace $aft $i $i]
-    }
-    lset rowidlist $row [concat $bef $pad $aft]
-    changedrow $row
-}
-
-proc optimize_rows {row col endrow} {
-    global rowidlist rowisopt displayorder curview children
-
-    if {$row < 1} {
-	set row 1
-    }
-    for {} {$row < $endrow} {incr row; set col 0} {
-	if {[lindex $rowisopt $row]} continue
-	set haspad 0
-	set y0 [expr {$row - 1}]
-	set ym [expr {$row - 2}]
-	set idlist [lindex $rowidlist $row]
-	set previdlist [lindex $rowidlist $y0]
-	if {$idlist eq {} || $previdlist eq {}} continue
-	if {$ym >= 0} {
-	    set pprevidlist [lindex $rowidlist $ym]
-	    if {$pprevidlist eq {}} continue
-	} else {
-	    set pprevidlist {}
-	}
-	set x0 -1
-	set xm -1
-	for {} {$col < [llength $idlist]} {incr col} {
-	    set id [lindex $idlist $col]
-	    if {[lindex $previdlist $col] eq $id} continue
-	    if {$id eq {}} {
-		set haspad 1
-		continue
-	    }
-	    set x0 [lsearch -exact $previdlist $id]
-	    if {$x0 < 0} continue
-	    set z [expr {$x0 - $col}]
-	    set isarrow 0
-	    set z0 {}
-	    if {$ym >= 0} {
-		set xm [lsearch -exact $pprevidlist $id]
-		if {$xm >= 0} {
-		    set z0 [expr {$xm - $x0}]
-		}
-	    }
-	    if {$z0 eq {}} {
-		# if row y0 is the first child of $id then it's not an arrow
-		if {[lindex $children($curview,$id) 0] ne
-		    [lindex $displayorder $y0]} {
-		    set isarrow 1
-		}
-	    }
-	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
-		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
-		set isarrow 1
-	    }
-	    # Looking at lines from this row to the previous row,
-	    # make them go straight up if they end in an arrow on
-	    # the previous row; otherwise make them go straight up
-	    # or at 45 degrees.
-	    if {$z < -1 || ($z < 0 && $isarrow)} {
-		# Line currently goes left too much;
-		# insert pads in the previous row, then optimize it
-		set npad [expr {-1 - $z + $isarrow}]
-		insert_pad $y0 $x0 $npad
-		if {$y0 > 0} {
-		    optimize_rows $y0 $x0 $row
-		}
-		set previdlist [lindex $rowidlist $y0]
-		set x0 [lsearch -exact $previdlist $id]
-		set z [expr {$x0 - $col}]
-		if {$z0 ne {}} {
-		    set pprevidlist [lindex $rowidlist $ym]
-		    set xm [lsearch -exact $pprevidlist $id]
-		    set z0 [expr {$xm - $x0}]
-		}
-	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
-		# Line currently goes right too much;
-		# insert pads in this line
-		set npad [expr {$z - 1 + $isarrow}]
-		insert_pad $row $col $npad
-		set idlist [lindex $rowidlist $row]
-		incr col $npad
-		set z [expr {$x0 - $col}]
-		set haspad 1
-	    }
-	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
-		# this line links to its first child on row $row-2
-		set id [lindex $displayorder $ym]
-		set xc [lsearch -exact $pprevidlist $id]
-		if {$xc >= 0} {
-		    set z0 [expr {$xc - $x0}]
-		}
-	    }
-	    # avoid lines jigging left then immediately right
-	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
-		insert_pad $y0 $x0 1
-		incr x0
-		optimize_rows $y0 $x0 $row
-		set previdlist [lindex $rowidlist $y0]
-	    }
-	}
-	if {!$haspad} {
-	    # Find the first column that doesn't have a line going right
-	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
-		set id [lindex $idlist $col]
-		if {$id eq {}} break
-		set x0 [lsearch -exact $previdlist $id]
-		if {$x0 < 0} {
-		    # check if this is the link to the first child
-		    set kid [lindex $displayorder $y0]
-		    if {[lindex $children($curview,$id) 0] eq $kid} {
-			# it is, work out offset to child
-			set x0 [lsearch -exact $previdlist $kid]
-		    }
-		}
-		if {$x0 <= $col} break
-	    }
-	    # Insert a pad at that column as long as it has a line and
-	    # isn't the last column
-	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
-		set idlist [linsert $idlist $col {}]
-		lset rowidlist $row $idlist
-		changedrow $row
-	    }
-	}
-    }
-}
-
-proc xc {row col} {
-    global canvx0 linespc
-    return [expr {$canvx0 + $col * $linespc}]
-}
-
-proc yc {row} {
-    global canvy0 linespc
-    return [expr {$canvy0 + $row * $linespc}]
-}
-
-proc linewidth {id} {
-    global thickerline lthickness
-
-    set wid $lthickness
-    if {[info exists thickerline] && $id eq $thickerline} {
-	set wid [expr {2 * $lthickness}]
-    }
-    return $wid
-}
-
-proc rowranges {id} {
-    global curview children uparrowlen downarrowlen
-    global rowidlist
-
-    set kids $children($curview,$id)
-    if {$kids eq {}} {
-	return {}
-    }
-    set ret {}
-    lappend kids $id
-    foreach child $kids {
-	if {![commitinview $child $curview]} break
-	set row [rowofcommit $child]
-	if {![info exists prev]} {
-	    lappend ret [expr {$row + 1}]
-	} else {
-	    if {$row <= $prevrow} {
-		puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
-	    }
-	    # see if the line extends the whole way from prevrow to row
-	    if {$row > $prevrow + $uparrowlen + $downarrowlen &&
-		[lsearch -exact [lindex $rowidlist \
-			    [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
-		# it doesn't, see where it ends
-		set r [expr {$prevrow + $downarrowlen}]
-		if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
-		    while {[incr r -1] > $prevrow &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
-		} else {
-		    while {[incr r] <= $row &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
-		    incr r -1
-		}
-		lappend ret $r
-		# see where it starts up again
-		set r [expr {$row - $uparrowlen}]
-		if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
-		    while {[incr r] < $row &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
-		} else {
-		    while {[incr r -1] >= $prevrow &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
-		    incr r
-		}
-		lappend ret $r
-	    }
-	}
-	if {$child eq $id} {
-	    lappend ret $row
-	}
-	set prev $child
-	set prevrow $row
-    }
-    return $ret
-}
-
-proc drawlineseg {id row endrow arrowlow} {
-    global rowidlist displayorder iddrawn linesegs
-    global canv colormap linespc curview maxlinelen parentlist
-
-    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
-    set le [expr {$row + 1}]
-    set arrowhigh 1
-    while {1} {
-	set c [lsearch -exact [lindex $rowidlist $le] $id]
-	if {$c < 0} {
-	    incr le -1
-	    break
-	}
-	lappend cols $c
-	set x [lindex $displayorder $le]
-	if {$x eq $id} {
-	    set arrowhigh 0
-	    break
-	}
-	if {[info exists iddrawn($x)] || $le == $endrow} {
-	    set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
-	    if {$c >= 0} {
-		lappend cols $c
-		set arrowhigh 0
-	    }
-	    break
-	}
-	incr le
-    }
-    if {$le <= $row} {
-	return $row
-    }
-
-    set lines {}
-    set i 0
-    set joinhigh 0
-    if {[info exists linesegs($id)]} {
-	set lines $linesegs($id)
-	foreach li $lines {
-	    set r0 [lindex $li 0]
-	    if {$r0 > $row} {
-		if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
-		    set joinhigh 1
-		}
-		break
-	    }
-	    incr i
-	}
-    }
-    set joinlow 0
-    if {$i > 0} {
-	set li [lindex $lines [expr {$i-1}]]
-	set r1 [lindex $li 1]
-	if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
-	    set joinlow 1
-	}
-    }
-
-    set x [lindex $cols [expr {$le - $row}]]
-    set xp [lindex $cols [expr {$le - 1 - $row}]]
-    set dir [expr {$xp - $x}]
-    if {$joinhigh} {
-	set ith [lindex $lines $i 2]
-	set coords [$canv coords $ith]
-	set ah [$canv itemcget $ith -arrow]
-	set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
-	set x2 [lindex $cols [expr {$le + 1 - $row}]]
-	if {$x2 ne {} && $x - $x2 == $dir} {
-	    set coords [lrange $coords 0 end-2]
-	}
-    } else {
-	set coords [list [xc $le $x] [yc $le]]
-    }
-    if {$joinlow} {
-	set itl [lindex $lines [expr {$i-1}] 2]
-	set al [$canv itemcget $itl -arrow]
-	set arrowlow [expr {$al eq "last" || $al eq "both"}]
-    } elseif {$arrowlow} {
-	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
-	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
-	    set arrowlow 0
-	}
-    }
-    set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
-    for {set y $le} {[incr y -1] > $row} {} {
-	set x $xp
-	set xp [lindex $cols [expr {$y - 1 - $row}]]
-	set ndir [expr {$xp - $x}]
-	if {$dir != $ndir || $xp < 0} {
-	    lappend coords [xc $y $x] [yc $y]
-	}
-	set dir $ndir
-    }
-    if {!$joinlow} {
-	if {$xp < 0} {
-	    # join parent line to first child
-	    set ch [lindex $displayorder $row]
-	    set xc [lsearch -exact [lindex $rowidlist $row] $ch]
-	    if {$xc < 0} {
-		puts "oops: drawlineseg: child $ch not on row $row"
-	    } elseif {$xc != $x} {
-		if {($arrowhigh && $le == $row + 1) || $dir == 0} {
-		    set d [expr {int(0.5 * $linespc)}]
-		    set x1 [xc $row $x]
-		    if {$xc < $x} {
-			set x2 [expr {$x1 - $d}]
-		    } else {
-			set x2 [expr {$x1 + $d}]
-		    }
-		    set y2 [yc $row]
-		    set y1 [expr {$y2 + $d}]
-		    lappend coords $x1 $y1 $x2 $y2
-		} elseif {$xc < $x - 1} {
-		    lappend coords [xc $row [expr {$x-1}]] [yc $row]
-		} elseif {$xc > $x + 1} {
-		    lappend coords [xc $row [expr {$x+1}]] [yc $row]
-		}
-		set x $xc
-	    }
-	    lappend coords [xc $row $x] [yc $row]
-	} else {
-	    set xn [xc $row $xp]
-	    set yn [yc $row]
-	    lappend coords $xn $yn
-	}
-	if {!$joinhigh} {
-	    assigncolor $id
-	    set t [$canv create line $coords -width [linewidth $id] \
-		       -fill $colormap($id) -tags lines.$id -arrow $arrow]
-	    $canv lower $t
-	    bindline $t $id
-	    set lines [linsert $lines $i [list $row $le $t]]
-	} else {
-	    $canv coords $ith $coords
-	    if {$arrow ne $ah} {
-		$canv itemconf $ith -arrow $arrow
-	    }
-	    lset lines $i 0 $row
-	}
-    } else {
-	set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
-	set ndir [expr {$xo - $xp}]
-	set clow [$canv coords $itl]
-	if {$dir == $ndir} {
-	    set clow [lrange $clow 2 end]
-	}
-	set coords [concat $coords $clow]
-	if {!$joinhigh} {
-	    lset lines [expr {$i-1}] 1 $le
-	} else {
-	    # coalesce two pieces
-	    $canv delete $ith
-	    set b [lindex $lines [expr {$i-1}] 0]
-	    set e [lindex $lines $i 1]
-	    set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
-	}
-	$canv coords $itl $coords
-	if {$arrow ne $al} {
-	    $canv itemconf $itl -arrow $arrow
-	}
-    }
-
-    set linesegs($id) $lines
-    return $le
-}
-
-proc drawparentlinks {id row} {
-    global rowidlist canv colormap curview parentlist
-    global idpos linespc
-
-    set rowids [lindex $rowidlist $row]
-    set col [lsearch -exact $rowids $id]
-    if {$col < 0} return
-    set olds [lindex $parentlist $row]
-    set row2 [expr {$row + 1}]
-    set x [xc $row $col]
-    set y [yc $row]
-    set y2 [yc $row2]
-    set d [expr {int(0.5 * $linespc)}]
-    set ymid [expr {$y + $d}]
-    set ids [lindex $rowidlist $row2]
-    # rmx = right-most X coord used
-    set rmx 0
-    foreach p $olds {
-	set i [lsearch -exact $ids $p]
-	if {$i < 0} {
-	    puts "oops, parent $p of $id not in list"
-	    continue
-	}
-	set x2 [xc $row2 $i]
-	if {$x2 > $rmx} {
-	    set rmx $x2
-	}
-	set j [lsearch -exact $rowids $p]
-	if {$j < 0} {
-	    # drawlineseg will do this one for us
-	    continue
-	}
-	assigncolor $p
-	# should handle duplicated parents here...
-	set coords [list $x $y]
-	if {$i != $col} {
-	    # if attaching to a vertical segment, draw a smaller
-	    # slant for visual distinctness
-	    if {$i == $j} {
-		if {$i < $col} {
-		    lappend coords [expr {$x2 + $d}] $y $x2 $ymid
-		} else {
-		    lappend coords [expr {$x2 - $d}] $y $x2 $ymid
-		}
-	    } elseif {$i < $col && $i < $j} {
-		# segment slants towards us already
-		lappend coords [xc $row $j] $y
-	    } else {
-		if {$i < $col - 1} {
-		    lappend coords [expr {$x2 + $linespc}] $y
-		} elseif {$i > $col + 1} {
-		    lappend coords [expr {$x2 - $linespc}] $y
-		}
-		lappend coords $x2 $y2
-	    }
-	} else {
-	    lappend coords $x2 $y2
-	}
-	set t [$canv create line $coords -width [linewidth $p] \
-		   -fill $colormap($p) -tags lines.$p]
-	$canv lower $t
-	bindline $t $p
-    }
-    if {$rmx > [lindex $idpos($id) 1]} {
-	lset idpos($id) 1 $rmx
-	redrawtags $id
-    }
-}
-
-proc drawlines {id} {
-    global canv
-
-    $canv itemconf lines.$id -width [linewidth $id]
-}
-
-proc drawcmittext {id row col} {
-    global linespc canv canv2 canv3 fgcolor curview
-    global cmitlisted commitinfo rowidlist parentlist
-    global rowtextx idpos idtags idheads idotherrefs
-    global linehtag linentag linedtag selectedline
-    global canvxmax boldids boldnameids fgcolor markedid
-    global mainheadid nullid nullid2 circleitem circlecolors ctxbut
-    global mainheadcirclecolor workingfilescirclecolor indexcirclecolor
-    global circleoutlinecolor
-
-    # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
-    set listed $cmitlisted($curview,$id)
-    if {$id eq $nullid} {
-	set ofill $workingfilescirclecolor
-    } elseif {$id eq $nullid2} {
-	set ofill $indexcirclecolor
-    } elseif {$id eq $mainheadid} {
-	set ofill $mainheadcirclecolor
-    } else {
-	set ofill [lindex $circlecolors $listed]
-    }
-    set x [xc $row $col]
-    set y [yc $row]
-    set orad [expr {$linespc / 3}]
-    if {$listed <= 2} {
-	set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
-		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
-		   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
-    } elseif {$listed == 3} {
-	# triangle pointing left for left-side commits
-	set t [$canv create polygon \
-		   [expr {$x - $orad}] $y \
-		   [expr {$x + $orad - 1}] [expr {$y - $orad}] \
-		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
-		   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
-    } else {
-	# triangle pointing right for right-side commits
-	set t [$canv create polygon \
-		   [expr {$x + $orad - 1}] $y \
-		   [expr {$x - $orad}] [expr {$y - $orad}] \
-		   [expr {$x - $orad}] [expr {$y + $orad - 1}] \
-		   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
-    }
-    set circleitem($row) $t
-    $canv raise $t
-    $canv bind $t <1> {selcanvline {} %x %y}
-    set rmx [llength [lindex $rowidlist $row]]
-    set olds [lindex $parentlist $row]
-    if {$olds ne {}} {
-	set nextids [lindex $rowidlist [expr {$row + 1}]]
-	foreach p $olds {
-	    set i [lsearch -exact $nextids $p]
-	    if {$i > $rmx} {
-		set rmx $i
-	    }
-	}
-    }
-    set xt [xc $row $rmx]
-    set rowtextx($row) $xt
-    set idpos($id) [list $x $xt $y]
-    if {[info exists idtags($id)] || [info exists idheads($id)]
-	|| [info exists idotherrefs($id)]} {
-	set xt [drawtags $id $x $xt $y]
-    }
-    if {[lindex $commitinfo($id) 6] > 0} {
-	set xt [drawnotesign $xt $y]
-    }
-    set headline [lindex $commitinfo($id) 0]
-    set name [lindex $commitinfo($id) 1]
-    set date [lindex $commitinfo($id) 2]
-    set date [formatdate $date]
-    set font mainfont
-    set nfont mainfont
-    set isbold [ishighlighted $id]
-    if {$isbold > 0} {
-	lappend boldids $id
-	set font mainfontbold
-	if {$isbold > 1} {
-	    lappend boldnameids $id
-	    set nfont mainfontbold
-	}
-    }
-    set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
-			   -text $headline -font $font -tags text]
-    $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
-    set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
-			   -text $name -font $nfont -tags text]
-    set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
-			   -text $date -font mainfont -tags text]
-    if {$selectedline == $row} {
-	make_secsel $id
-    }
-    if {[info exists markedid] && $markedid eq $id} {
-	make_idmark $id
-    }
-    set xr [expr {$xt + [font measure $font $headline]}]
-    if {$xr > $canvxmax} {
-	set canvxmax $xr
-	setcanvscroll
-    }
-}
-
-proc drawcmitrow {row} {
-    global displayorder rowidlist nrows_drawn
-    global iddrawn markingmatches
-    global commitinfo numcommits
-    global filehighlight fhighlights findpattern nhighlights
-    global hlview vhighlights
-    global highlight_related rhighlights
-
-    if {$row >= $numcommits} return
-
-    set id [lindex $displayorder $row]
-    if {[info exists hlview] && ![info exists vhighlights($id)]} {
-	askvhighlight $row $id
-    }
-    if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
-	askfilehighlight $row $id
-    }
-    if {$findpattern ne {} && ![info exists nhighlights($id)]} {
-	askfindhighlight $row $id
-    }
-    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
-	askrelhighlight $row $id
-    }
-    if {![info exists iddrawn($id)]} {
-	set col [lsearch -exact [lindex $rowidlist $row] $id]
-	if {$col < 0} {
-	    puts "oops, row $row id $id not in list"
-	    return
-	}
-	if {![info exists commitinfo($id)]} {
-	    getcommit $id
-	}
-	assigncolor $id
-	drawcmittext $id $row $col
-	set iddrawn($id) 1
-	incr nrows_drawn
-    }
-    if {$markingmatches} {
-	markrowmatches $row $id
-    }
-}
-
-proc drawcommits {row {endrow {}}} {
-    global numcommits iddrawn displayorder curview need_redisplay
-    global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
-
-    if {$row < 0} {
-	set row 0
-    }
-    if {$endrow eq {}} {
-	set endrow $row
-    }
-    if {$endrow >= $numcommits} {
-	set endrow [expr {$numcommits - 1}]
-    }
-
-    set rl1 [expr {$row - $downarrowlen - 3}]
-    if {$rl1 < 0} {
-	set rl1 0
-    }
-    set ro1 [expr {$row - 3}]
-    if {$ro1 < 0} {
-	set ro1 0
-    }
-    set r2 [expr {$endrow + $uparrowlen + 3}]
-    if {$r2 > $numcommits} {
-	set r2 $numcommits
-    }
-    for {set r $rl1} {$r < $r2} {incr r} {
-	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
-	    if {$rl1 < $r} {
-		layoutrows $rl1 $r
-	    }
-	    set rl1 [expr {$r + 1}]
-	}
-    }
-    if {$rl1 < $r} {
-	layoutrows $rl1 $r
-    }
-    optimize_rows $ro1 0 $r2
-    if {$need_redisplay || $nrows_drawn > 2000} {
-	clear_display
-    }
-
-    # make the lines join to already-drawn rows either side
-    set r [expr {$row - 1}]
-    if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
-	set r $row
-    }
-    set er [expr {$endrow + 1}]
-    if {$er >= $numcommits ||
-	![info exists iddrawn([lindex $displayorder $er])]} {
-	set er $endrow
-    }
-    for {} {$r <= $er} {incr r} {
-	set id [lindex $displayorder $r]
-	set wasdrawn [info exists iddrawn($id)]
-	drawcmitrow $r
-	if {$r == $er} break
-	set nextid [lindex $displayorder [expr {$r + 1}]]
-	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
-	drawparentlinks $id $r
-
-	set rowids [lindex $rowidlist $r]
-	foreach lid $rowids {
-	    if {$lid eq {}} continue
-	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
-	    if {$lid eq $id} {
-		# see if this is the first child of any of its parents
-		foreach p [lindex $parentlist $r] {
-		    if {[lsearch -exact $rowids $p] < 0} {
-			# make this line extend up to the child
-			set lineend($p) [drawlineseg $p $r $er 0]
-		    }
-		}
-	    } else {
-		set lineend($lid) [drawlineseg $lid $r $er 1]
-	    }
-	}
-    }
-}
-
-proc undolayout {row} {
-    global uparrowlen mingaplen downarrowlen
-    global rowidlist rowisopt rowfinal need_redisplay
-
-    set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
-    if {$r < 0} {
-	set r 0
-    }
-    if {[llength $rowidlist] > $r} {
-	incr r -1
-	set rowidlist [lrange $rowidlist 0 $r]
-	set rowfinal [lrange $rowfinal 0 $r]
-	set rowisopt [lrange $rowisopt 0 $r]
-	set need_redisplay 1
-	run drawvisible
-    }
-}
-
-proc drawvisible {} {
-    global canv linespc curview vrowmod selectedline targetrow targetid
-    global need_redisplay cscroll numcommits
-
-    set fs [$canv yview]
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
-    set f0 [lindex $fs 0]
-    set f1 [lindex $fs 1]
-    set y0 [expr {int($f0 * $ymax)}]
-    set y1 [expr {int($f1 * $ymax)}]
-
-    if {[info exists targetid]} {
-	if {[commitinview $targetid $curview]} {
-	    set r [rowofcommit $targetid]
-	    if {$r != $targetrow} {
-		# Fix up the scrollregion and change the scrolling position
-		# now that our target row has moved.
-		set diff [expr {($r - $targetrow) * $linespc}]
-		set targetrow $r
-		setcanvscroll
-		set ymax [lindex [$canv cget -scrollregion] 3]
-		incr y0 $diff
-		incr y1 $diff
-		set f0 [expr {$y0 / $ymax}]
-		set f1 [expr {$y1 / $ymax}]
-		allcanvs yview moveto $f0
-		$cscroll set $f0 $f1
-		set need_redisplay 1
-	    }
-	} else {
-	    unset targetid
-	}
-    }
-
-    set row [expr {int(($y0 - 3) / $linespc) - 1}]
-    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
-    if {$endrow >= $vrowmod($curview)} {
-	update_arcrows $curview
-    }
-    if {$selectedline ne {} &&
-	$row <= $selectedline && $selectedline <= $endrow} {
-	set targetrow $selectedline
-    } elseif {[info exists targetid]} {
-	set targetrow [expr {int(($row + $endrow) / 2)}]
-    }
-    if {[info exists targetrow]} {
-	if {$targetrow >= $numcommits} {
-	    set targetrow [expr {$numcommits - 1}]
-	}
-	set targetid [commitonrow $targetrow]
-    }
-    drawcommits $row $endrow
-}
-
-proc clear_display {} {
-    global iddrawn linesegs need_redisplay nrows_drawn
-    global vhighlights fhighlights nhighlights rhighlights
-    global linehtag linentag linedtag boldids boldnameids
-
-    allcanvs delete all
-    unset -nocomplain iddrawn
-    unset -nocomplain linesegs
-    unset -nocomplain linehtag
-    unset -nocomplain linentag
-    unset -nocomplain linedtag
-    set boldids {}
-    set boldnameids {}
-    unset -nocomplain vhighlights
-    unset -nocomplain fhighlights
-    unset -nocomplain nhighlights
-    unset -nocomplain rhighlights
-    set need_redisplay 0
-    set nrows_drawn 0
-}
-
-proc findcrossings {id} {
-    global rowidlist parentlist numcommits displayorder
-
-    set cross {}
-    set ccross {}
-    foreach {s e} [rowranges $id] {
-	if {$e >= $numcommits} {
-	    set e [expr {$numcommits - 1}]
-	}
-	if {$e <= $s} continue
-	for {set row $e} {[incr row -1] >= $s} {} {
-	    set x [lsearch -exact [lindex $rowidlist $row] $id]
-	    if {$x < 0} break
-	    set olds [lindex $parentlist $row]
-	    set kid [lindex $displayorder $row]
-	    set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
-	    if {$kidx < 0} continue
-	    set nextrow [lindex $rowidlist [expr {$row + 1}]]
-	    foreach p $olds {
-		set px [lsearch -exact $nextrow $p]
-		if {$px < 0} continue
-		if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
-		    if {[lsearch -exact $ccross $p] >= 0} continue
-		    if {$x == $px + ($kidx < $px? -1: 1)} {
-			lappend ccross $p
-		    } elseif {[lsearch -exact $cross $p] < 0} {
-			lappend cross $p
-		    }
-		}
-	    }
-	}
-    }
-    return [concat $ccross {{}} $cross]
-}
-
-proc assigncolor {id} {
-    global colormap colors nextcolor
-    global parents children children curview
-
-    if {[info exists colormap($id)]} return
-    set ncolors [llength $colors]
-    if {[info exists children($curview,$id)]} {
-	set kids $children($curview,$id)
-    } else {
-	set kids {}
-    }
-    if {[llength $kids] == 1} {
-	set child [lindex $kids 0]
-	if {[info exists colormap($child)]
-	    && [llength $parents($curview,$child)] == 1} {
-	    set colormap($id) $colormap($child)
-	    return
-	}
-    }
-    set badcolors {}
-    set origbad {}
-    foreach x [findcrossings $id] {
-	if {$x eq {}} {
-	    # delimiter between corner crossings and other crossings
-	    if {[llength $badcolors] >= $ncolors - 1} break
-	    set origbad $badcolors
-	}
-	if {[info exists colormap($x)]
-	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
-	    lappend badcolors $colormap($x)
-	}
-    }
-    if {[llength $badcolors] >= $ncolors} {
-	set badcolors $origbad
-    }
-    set origbad $badcolors
-    if {[llength $badcolors] < $ncolors - 1} {
-	foreach child $kids {
-	    if {[info exists colormap($child)]
-		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
-		lappend badcolors $colormap($child)
-	    }
-	    foreach p $parents($curview,$child) {
-		if {[info exists colormap($p)]
-		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
-		    lappend badcolors $colormap($p)
-		}
-	    }
-	}
-	if {[llength $badcolors] >= $ncolors} {
-	    set badcolors $origbad
-	}
-    }
-    for {set i 0} {$i <= $ncolors} {incr i} {
-	set c [lindex $colors $nextcolor]
-	if {[incr nextcolor] >= $ncolors} {
-	    set nextcolor 0
-	}
-	if {[lsearch -exact $badcolors $c]} break
-    }
-    set colormap($id) $c
-}
-
-proc bindline {t id} {
-    global canv
-
-    $canv bind $t <Enter> "lineenter %x %y $id"
-    $canv bind $t <Motion> "linemotion %x %y $id"
-    $canv bind $t <Leave> "lineleave $id"
-    $canv bind $t <Button-1> "lineclick %x %y $id 1"
-}
-
-proc graph_pane_width {} {
-    global use_ttk
-
-    if {$use_ttk} {
-	set g [.tf.histframe.pwclist sashpos 0]
-    } else {
-	set g [.tf.histframe.pwclist sash coord 0]
-    }
-    return [lindex $g 0]
-}
-
-proc totalwidth {l font extra} {
-    set tot 0
-    foreach str $l {
-	set tot [expr {$tot + [font measure $font $str] + $extra}]
-    }
-    return $tot
-}
-
-proc drawtags {id x xt y1} {
-    global idtags idheads idotherrefs mainhead
-    global linespc lthickness
-    global canv rowtextx curview fgcolor bgcolor ctxbut
-    global headbgcolor headfgcolor headoutlinecolor remotebgcolor
-    global tagbgcolor tagfgcolor tagoutlinecolor
-    global reflinecolor
-
-    set marks {}
-    set ntags 0
-    set nheads 0
-    set singletag 0
-    set maxtags 3
-    set maxtagpct 25
-    set maxwidth [expr {[graph_pane_width] * $maxtagpct / 100}]
-    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
-    set extra [expr {$delta + $lthickness + $linespc}]
-
-    if {[info exists idtags($id)]} {
-	set marks $idtags($id)
-	set ntags [llength $marks]
-	if {$ntags > $maxtags ||
-	    [totalwidth $marks mainfont $extra] > $maxwidth} {
-	    # show just a single "n tags..." tag
-	    set singletag 1
-	    if {$ntags == 1} {
-		set marks [list "tag..."]
-	    } else {
-		set marks [list [format "%d tags..." $ntags]]
-	    }
-	    set ntags 1
-	}
-    }
-    if {[info exists idheads($id)]} {
-	set marks [concat $marks $idheads($id)]
-	set nheads [llength $idheads($id)]
-    }
-    if {[info exists idotherrefs($id)]} {
-	set marks [concat $marks $idotherrefs($id)]
-    }
-    if {$marks eq {}} {
-	return $xt
-    }
-
-    set yt [expr {$y1 - 0.5 * $linespc}]
-    set yb [expr {$yt + $linespc - 1}]
-    set xvals {}
-    set wvals {}
-    set i -1
-    foreach tag $marks {
-	incr i
-	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
-	    set wid [font measure mainfontbold $tag]
-	} else {
-	    set wid [font measure mainfont $tag]
-	}
-	lappend xvals $xt
-	lappend wvals $wid
-	set xt [expr {$xt + $wid + $extra}]
-    }
-    set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
-	       -width $lthickness -fill $reflinecolor -tags tag.$id]
-    $canv lower $t
-    foreach tag $marks x $xvals wid $wvals {
-	set tag_quoted [string map {% %%} $tag]
-	set xl [expr {$x + $delta}]
-	set xr [expr {$x + $delta + $wid + $lthickness}]
-	set font mainfont
-	if {[incr ntags -1] >= 0} {
-	    # draw a tag
-	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
-		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
-		       -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \
-		       -tags tag.$id]
-	    if {$singletag} {
-		set tagclick [list showtags $id 1]
-	    } else {
-		set tagclick [list showtag $tag_quoted 1]
-	    }
-	    $canv bind $t <1> $tagclick
-	    set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
-	} else {
-	    # draw a head or other ref
-	    if {[incr nheads -1] >= 0} {
-		set col $headbgcolor
-		if {$tag eq $mainhead} {
-		    set font mainfontbold
-		}
-	    } else {
-		set col "#ddddff"
-	    }
-	    set xl [expr {$xl - $delta/2}]
-	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-		-width 1 -outline black -fill $col -tags tag.$id
-	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
-	        set rwid [font measure mainfont $remoteprefix]
-		set xi [expr {$x + 1}]
-		set yti [expr {$yt + 1}]
-		set xri [expr {$x + $rwid}]
-		$canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
-			-width 0 -fill $remotebgcolor -tags tag.$id
-	    }
-	}
-	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \
-		   -font $font -tags [list tag.$id text]]
-	if {$ntags >= 0} {
-	    $canv bind $t <1> $tagclick
-	} elseif {$nheads >= 0} {
-	    $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
-	}
-    }
-    return $xt
-}
-
-proc drawnotesign {xt y} {
-    global linespc canv fgcolor
-
-    set orad [expr {$linespc / 3}]
-    set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \
-	       [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \
-	       -fill yellow -outline $fgcolor -width 1 -tags circle]
-    set xt [expr {$xt + $orad * 3}]
-    return $xt
-}
-
-proc xcoord {i level ln} {
-    global canvx0 xspc1 xspc2
-
-    set x [expr {$canvx0 + $i * $xspc1($ln)}]
-    if {$i > 0 && $i == $level} {
-	set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
-    } elseif {$i > $level} {
-	set x [expr {$x + $xspc2 - $xspc1($ln)}]
-    }
-    return $x
-}
-
-proc show_status {msg} {
-    global canv fgcolor
-
-    clear_display
-    set_window_title
-    $canv create text 3 3 -anchor nw -text $msg -font mainfont \
-	-tags text -fill $fgcolor
-}
-
-# Don't change the text pane cursor if it is currently the hand cursor,
-# showing that we are over a sha1 ID link.
-proc settextcursor {c} {
-    global ctext curtextcursor
-
-    if {[$ctext cget -cursor] == $curtextcursor} {
-	$ctext config -cursor $c
-    }
-    set curtextcursor $c
-}
-
-proc nowbusy {what {name {}}} {
-    global isbusy busyname statusw
-
-    if {[array names isbusy] eq {}} {
-	. config -cursor watch
-	settextcursor watch
-    }
-    set isbusy($what) 1
-    set busyname($what) $name
-    if {$name ne {}} {
-	$statusw conf -text $name
-    }
-}
-
-proc notbusy {what} {
-    global isbusy maincursor textcursor busyname statusw
-
-    catch {
-	unset isbusy($what)
-	if {$busyname($what) ne {} &&
-	    [$statusw cget -text] eq $busyname($what)} {
-	    $statusw conf -text {}
-	}
-    }
-    if {[array names isbusy] eq {}} {
-	. config -cursor $maincursor
-	settextcursor $textcursor
-    }
-}
-
-proc findmatches {f} {
-    global findtype findstring
-    if {$findtype == [mc "Regexp"]} {
-	set matches [regexp -indices -all -inline $findstring $f]
-    } else {
-	set fs $findstring
-	if {$findtype == [mc "IgnCase"]} {
-	    set f [string tolower $f]
-	    set fs [string tolower $fs]
-	}
-	set matches {}
-	set i 0
-	set l [string length $fs]
-	while {[set j [string first $fs $f $i]] >= 0} {
-	    lappend matches [list $j [expr {$j+$l-1}]]
-	    set i [expr {$j + $l}]
-	}
-    }
-    return $matches
-}
-
-proc dofind {{dirn 1} {wrap 1}} {
-    global findstring findstartline findcurline selectedline numcommits
-    global gdttype filehighlight fh_serial find_dirn findallowwrap
-
-    if {[info exists find_dirn]} {
-	if {$find_dirn == $dirn} return
-	stopfinding
-    }
-    focus .
-    if {$findstring eq {} || $numcommits == 0} return
-    if {$selectedline eq {}} {
-	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
-    } else {
-	set findstartline $selectedline
-    }
-    set findcurline $findstartline
-    nowbusy finding [mc "Searching"]
-    if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
-	after cancel do_file_hl $fh_serial
-	do_file_hl $fh_serial
-    }
-    set find_dirn $dirn
-    set findallowwrap $wrap
-    run findmore
-}
-
-proc stopfinding {} {
-    global find_dirn findcurline fprogcoord
-
-    if {[info exists find_dirn]} {
-	unset find_dirn
-	unset findcurline
-	notbusy finding
-	set fprogcoord 0
-	adjustprogress
-    }
-    stopblaming
-}
-
-proc findmore {} {
-    global commitdata commitinfo numcommits findpattern findloc
-    global findstartline findcurline findallowwrap
-    global find_dirn gdttype fhighlights fprogcoord
-    global curview varcorder vrownum varccommits vrowmod
-
-    if {![info exists find_dirn]} {
-	return 0
-    }
-    set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]]
-    set l $findcurline
-    set moretodo 0
-    if {$find_dirn > 0} {
-	incr l
-	if {$l >= $numcommits} {
-	    set l 0
-	}
-	if {$l <= $findstartline} {
-	    set lim [expr {$findstartline + 1}]
-	} else {
-	    set lim $numcommits
-	    set moretodo $findallowwrap
-	}
-    } else {
-	if {$l == 0} {
-	    set l $numcommits
-	}
-	incr l -1
-	if {$l >= $findstartline} {
-	    set lim [expr {$findstartline - 1}]
-	} else {
-	    set lim -1
-	    set moretodo $findallowwrap
-	}
-    }
-    set n [expr {($lim - $l) * $find_dirn}]
-    if {$n > 500} {
-	set n 500
-	set moretodo 1
-    }
-    if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
-	update_arcrows $curview
-    }
-    set found 0
-    set domore 1
-    set ai [bsearch $vrownum($curview) $l]
-    set a [lindex $varcorder($curview) $ai]
-    set arow [lindex $vrownum($curview) $ai]
-    set ids [lindex $varccommits($curview,$a)]
-    set arowend [expr {$arow + [llength $ids]}]
-    if {$gdttype eq [mc "containing:"]} {
-	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
-	    if {$l < $arow || $l >= $arowend} {
-		incr ai $find_dirn
-		set a [lindex $varcorder($curview) $ai]
-		set arow [lindex $vrownum($curview) $ai]
-		set ids [lindex $varccommits($curview,$a)]
-		set arowend [expr {$arow + [llength $ids]}]
-	    }
-	    set id [lindex $ids [expr {$l - $arow}]]
-	    # shouldn't happen unless git log doesn't give all the commits...
-	    if {![info exists commitdata($id)] ||
-		![doesmatch $commitdata($id)]} {
-		continue
-	    }
-	    if {![info exists commitinfo($id)]} {
-		getcommit $id
-	    }
-	    set info $commitinfo($id)
-	    foreach f $info ty $fldtypes {
-		if {$ty eq ""} continue
-		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
-		    [doesmatch $f]} {
-		    set found 1
-		    break
-		}
-	    }
-	    if {$found} break
-	}
-    } else {
-	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
-	    if {$l < $arow || $l >= $arowend} {
-		incr ai $find_dirn
-		set a [lindex $varcorder($curview) $ai]
-		set arow [lindex $vrownum($curview) $ai]
-		set ids [lindex $varccommits($curview,$a)]
-		set arowend [expr {$arow + [llength $ids]}]
-	    }
-	    set id [lindex $ids [expr {$l - $arow}]]
-	    if {![info exists fhighlights($id)]} {
-		# this sets fhighlights($id) to -1
-		askfilehighlight $l $id
-	    }
-	    if {$fhighlights($id) > 0} {
-		set found $domore
-		break
-	    }
-	    if {$fhighlights($id) < 0} {
-		if {$domore} {
-		    set domore 0
-		    set findcurline [expr {$l - $find_dirn}]
-		}
-	    }
-	}
-    }
-    if {$found || ($domore && !$moretodo)} {
-	unset findcurline
-	unset find_dirn
-	notbusy finding
-	set fprogcoord 0
-	adjustprogress
-	if {$found} {
-	    findselectline $l
-	} else {
-	    bell
-	}
-	return 0
-    }
-    if {!$domore} {
-	flushhighlights
-    } else {
-	set findcurline [expr {$l - $find_dirn}]
-    }
-    set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
-    if {$n < 0} {
-	incr n $numcommits
-    }
-    set fprogcoord [expr {$n * 1.0 / $numcommits}]
-    adjustprogress
-    return $domore
-}
-
-proc findselectline {l} {
-    global findloc commentend ctext findcurline markingmatches gdttype
-
-    set markingmatches [expr {$gdttype eq [mc "containing:"]}]
-    set findcurline $l
-    selectline $l 1
-    if {$markingmatches &&
-	($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
-	# highlight the matches in the comments
-	set f [$ctext get 1.0 $commentend]
-	set matches [findmatches $f]
-	foreach match $matches {
-	    set start [lindex $match 0]
-	    set end [expr {[lindex $match 1] + 1}]
-	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
-	}
-    }
-    drawvisible
-}
-
-# mark the bits of a headline or author that match a find string
-proc markmatches {canv l str tag matches font row} {
-    global selectedline
-
-    set bbox [$canv bbox $tag]
-    set x0 [lindex $bbox 0]
-    set y0 [lindex $bbox 1]
-    set y1 [lindex $bbox 3]
-    foreach match $matches {
-	set start [lindex $match 0]
-	set end [lindex $match 1]
-	if {$start > $end} continue
-	set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
-	set xlen [font measure $font [string range $str 0 [expr {$end}]]]
-	set t [$canv create rect [expr {$x0+$xoff}] $y0 \
-		   [expr {$x0+$xlen+2}] $y1 \
-		   -outline {} -tags [list match$l matches] -fill yellow]
-	$canv lower $t
-	if {$row == $selectedline} {
-	    $canv raise $t secsel
-	}
-    }
-}
-
-proc unmarkmatches {} {
-    global markingmatches
-
-    allcanvs delete matches
-    set markingmatches 0
-    stopfinding
-}
-
-proc selcanvline {w x y} {
-    global canv canvy0 ctext linespc
-    global rowtextx
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    if {$ymax == {}} return
-    set yfrac [lindex [$canv yview] 0]
-    set y [expr {$y + $yfrac * $ymax}]
-    set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
-    if {$l < 0} {
-	set l 0
-    }
-    if {$w eq $canv} {
-	set xmax [lindex [$canv cget -scrollregion] 2]
-	set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
-	if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
-    }
-    unmarkmatches
-    selectline $l 1
-}
-
-proc commit_descriptor {p} {
-    global commitinfo
-    if {![info exists commitinfo($p)]} {
-	getcommit $p
-    }
-    set l "..."
-    if {[llength $commitinfo($p)] > 1} {
-	set l [lindex $commitinfo($p) 0]
-    }
-    return "$p ($l)\n"
-}
-
-# append some text to the ctext widget, and make any SHA1 ID
-# that we know about be a clickable link.
-proc appendwithlinks {text tags} {
-    global ctext linknum curview
-
-    set start [$ctext index "end - 1c"]
-    $ctext insert end $text $tags
-    set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
-    foreach l $links {
-	set s [lindex $l 0]
-	set e [lindex $l 1]
-	set linkid [string range $text $s $e]
-	incr e
-	$ctext tag delete link$linknum
-	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
-	setlink $linkid link$linknum
-	incr linknum
-    }
-}
-
-proc setlink {id lk} {
-    global curview ctext pendinglinks
-    global linkfgcolor
-
-    if {[string range $id 0 1] eq "-g"} {
-      set id [string range $id 2 end]
-    }
-
-    set known 0
-    if {[string length $id] < 40} {
-	set matches [longid $id]
-	if {[llength $matches] > 0} {
-	    if {[llength $matches] > 1} return
-	    set known 1
-	    set id [lindex $matches 0]
-	}
-    } else {
-	set known [commitinview $id $curview]
-    }
-    if {$known} {
-	$ctext tag conf $lk -foreground $linkfgcolor -underline 1
-	$ctext tag bind $lk <1> [list selbyid $id]
-	$ctext tag bind $lk <Enter> {linkcursor %W 1}
-	$ctext tag bind $lk <Leave> {linkcursor %W -1}
-    } else {
-	lappend pendinglinks($id) $lk
-	interestedin $id {makelink %P}
-    }
-}
-
-proc appendshortlink {id {pre {}} {post {}}} {
-    global ctext linknum
-
-    $ctext insert end $pre
-    $ctext tag delete link$linknum
-    $ctext insert end [string range $id 0 7] link$linknum
-    $ctext insert end $post
-    setlink $id link$linknum
-    incr linknum
-}
-
-proc makelink {id} {
-    global pendinglinks
-
-    if {![info exists pendinglinks($id)]} return
-    foreach lk $pendinglinks($id) {
-	setlink $id $lk
-    }
-    unset pendinglinks($id)
-}
-
-proc linkcursor {w inc} {
-    global linkentercount curtextcursor
-
-    if {[incr linkentercount $inc] > 0} {
-	$w configure -cursor hand2
-    } else {
-	$w configure -cursor $curtextcursor
-	if {$linkentercount < 0} {
-	    set linkentercount 0
-	}
-    }
-}
-
-proc viewnextline {dir} {
-    global canv linespc
-
-    $canv delete hover
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    set wnow [$canv yview]
-    set wtop [expr {[lindex $wnow 0] * $ymax}]
-    set newtop [expr {$wtop + $dir * $linespc}]
-    if {$newtop < 0} {
-	set newtop 0
-    } elseif {$newtop > $ymax} {
-	set newtop $ymax
-    }
-    allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
-}
-
-# add a list of tag or branch names at position pos
-# returns the number of names inserted
-proc appendrefs {pos ids var} {
-    global ctext linknum curview $var maxrefs visiblerefs mainheadid
-
-    if {[catch {$ctext index $pos}]} {
-	return 0
-    }
-    $ctext conf -state normal
-    $ctext delete $pos "$pos lineend"
-    set tags {}
-    foreach id $ids {
-	foreach tag [set $var\($id\)] {
-	    lappend tags [list $tag $id]
-	}
-    }
-
-    set sep {}
-    set tags [lsort -index 0 -decreasing $tags]
-    set nutags 0
-
-    if {[llength $tags] > $maxrefs} {
-	# If we are displaying heads, and there are too many,
-	# see if there are some important heads to display.
-	# Currently that are the current head and heads listed in $visiblerefs option
-	set itags {}
-	if {$var eq "idheads"} {
-	    set utags {}
-	    foreach ti $tags {
-		set hname [lindex $ti 0]
-		set id [lindex $ti 1]
-		if {([lsearch -exact $visiblerefs $hname] != -1 || $id eq $mainheadid) &&
-		    [llength $itags] < $maxrefs} {
-		    lappend itags $ti
-		} else {
-		    lappend utags $ti
-		}
-	    }
-	    set tags $utags
-	}
-	if {$itags ne {}} {
-	    set str [mc "and many more"]
-	    set sep " "
-	} else {
-	    set str [mc "many"]
-	}
-	$ctext insert $pos "$str ([llength $tags])"
-	set nutags [llength $tags]
-	set tags $itags
-    }
-
-    foreach ti $tags {
-	set id [lindex $ti 1]
-	set lk link$linknum
-	incr linknum
-	$ctext tag delete $lk
-	$ctext insert $pos $sep
-	$ctext insert $pos [lindex $ti 0] $lk
-	setlink $id $lk
-	set sep ", "
-    }
-    $ctext tag add wwrap "$pos linestart" "$pos lineend"
-    $ctext conf -state disabled
-    return [expr {[llength $tags] + $nutags}]
-}
-
-# called when we have finished computing the nearby tags
-proc dispneartags {delay} {
-    global selectedline currentid showneartags tagphase
-
-    if {$selectedline eq {} || !$showneartags} return
-    after cancel dispnexttag
-    if {$delay} {
-	after 200 dispnexttag
-	set tagphase -1
-    } else {
-	after idle dispnexttag
-	set tagphase 0
-    }
-}
-
-proc dispnexttag {} {
-    global selectedline currentid showneartags tagphase ctext
-
-    if {$selectedline eq {} || !$showneartags} return
-    switch -- $tagphase {
-	0 {
-	    set dtags [desctags $currentid]
-	    if {$dtags ne {}} {
-		appendrefs precedes $dtags idtags
-	    }
-	}
-	1 {
-	    set atags [anctags $currentid]
-	    if {$atags ne {}} {
-		appendrefs follows $atags idtags
-	    }
-	}
-	2 {
-	    set dheads [descheads $currentid]
-	    if {$dheads ne {}} {
-		if {[appendrefs branch $dheads idheads] > 1
-		    && [$ctext get "branch -3c"] eq "h"} {
-		    # turn "Branch" into "Branches"
-		    $ctext conf -state normal
-		    $ctext insert "branch -2c" "es"
-		    $ctext conf -state disabled
-		}
-	    }
-	}
-    }
-    if {[incr tagphase] <= 2} {
-	after idle dispnexttag
-    }
-}
-
-proc make_secsel {id} {
-    global linehtag linentag linedtag canv canv2 canv3
-
-    if {![info exists linehtag($id)]} return
-    $canv delete secsel
-    set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
-	       -tags secsel -fill [$canv cget -selectbackground]]
-    $canv lower $t
-    $canv2 delete secsel
-    set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
-	       -tags secsel -fill [$canv2 cget -selectbackground]]
-    $canv2 lower $t
-    $canv3 delete secsel
-    set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
-	       -tags secsel -fill [$canv3 cget -selectbackground]]
-    $canv3 lower $t
-}
-
-proc make_idmark {id} {
-    global linehtag canv fgcolor
-
-    if {![info exists linehtag($id)]} return
-    $canv delete markid
-    set t [eval $canv create rect [$canv bbox $linehtag($id)] \
-	       -tags markid -outline $fgcolor]
-    $canv raise $t
-}
-
-proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
-    global canv ctext commitinfo selectedline
-    global canvy0 linespc parents children curview
-    global currentid sha1entry
-    global commentend idtags linknum
-    global mergemax numcommits pending_select
-    global cmitmode showneartags allcommits
-    global targetrow targetid lastscrollrows
-    global autoselect autosellen jump_to_here
-    global vinlinediff
-
-    unset -nocomplain pending_select
-    $canv delete hover
-    normalline
-    unsel_reflist
-    stopfinding
-    if {$l < 0 || $l >= $numcommits} return
-    set id [commitonrow $l]
-    set targetid $id
-    set targetrow $l
-    set selectedline $l
-    set currentid $id
-    if {$lastscrollrows < $numcommits} {
-	setcanvscroll
-    }
-
-    if {$cmitmode ne "patch" && $switch_to_patch} {
-        set cmitmode "patch"
-    }
-
-    set y [expr {$canvy0 + $l * $linespc}]
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    set ytop [expr {$y - $linespc - 1}]
-    set ybot [expr {$y + $linespc + 1}]
-    set wnow [$canv yview]
-    set wtop [expr {[lindex $wnow 0] * $ymax}]
-    set wbot [expr {[lindex $wnow 1] * $ymax}]
-    set wh [expr {$wbot - $wtop}]
-    set newtop $wtop
-    if {$ytop < $wtop} {
-	if {$ybot < $wtop} {
-	    set newtop [expr {$y - $wh / 2.0}]
-	} else {
-	    set newtop $ytop
-	    if {$newtop > $wtop - $linespc} {
-		set newtop [expr {$wtop - $linespc}]
-	    }
-	}
-    } elseif {$ybot > $wbot} {
-	if {$ytop > $wbot} {
-	    set newtop [expr {$y - $wh / 2.0}]
-	} else {
-	    set newtop [expr {$ybot - $wh}]
-	    if {$newtop < $wtop + $linespc} {
-		set newtop [expr {$wtop + $linespc}]
-	    }
-	}
-    }
-    if {$newtop != $wtop} {
-	if {$newtop < 0} {
-	    set newtop 0
-	}
-	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
-	drawvisible
-    }
-
-    make_secsel $id
-
-    if {$isnew} {
-	addtohistory [list selbyid $id 0] savecmitpos
-    }
-
-    $sha1entry delete 0 end
-    $sha1entry insert 0 $id
-    if {$autoselect} {
-	$sha1entry selection range 0 $autosellen
-    }
-    rhighlight_sel $id
-
-    $ctext conf -state normal
-    clear_ctext
-    set linknum 0
-    if {![info exists commitinfo($id)]} {
-	getcommit $id
-    }
-    set info $commitinfo($id)
-    set date [formatdate [lindex $info 2]]
-    $ctext insert end "[mc "Author"]: [lindex $info 1]  $date\n"
-    set date [formatdate [lindex $info 4]]
-    $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
-    if {[info exists idtags($id)]} {
-	$ctext insert end [mc "Tags:"]
-	foreach tag $idtags($id) {
-	    $ctext insert end " $tag"
-	}
-	$ctext insert end "\n"
-    }
-
-    set headers {}
-    set olds $parents($curview,$id)
-    if {[llength $olds] > 1} {
-	set np 0
-	foreach p $olds {
-	    if {$np >= $mergemax} {
-		set tag mmax
-	    } else {
-		set tag m$np
-	    }
-	    $ctext insert end "[mc "Parent"]: " $tag
-	    appendwithlinks [commit_descriptor $p] {}
-	    incr np
-	}
-    } else {
-	foreach p $olds {
-	    append headers "[mc "Parent"]: [commit_descriptor $p]"
-	}
-    }
-
-    foreach c $children($curview,$id) {
-	append headers "[mc "Child"]:  [commit_descriptor $c]"
-    }
-
-    # make anything that looks like a SHA1 ID be a clickable link
-    appendwithlinks $headers {}
-    if {$showneartags} {
-	if {![info exists allcommits]} {
-	    getallcommits
-	}
-	$ctext insert end "[mc "Branch"]: "
-	$ctext mark set branch "end -1c"
-	$ctext mark gravity branch left
-	$ctext insert end "\n[mc "Follows"]: "
-	$ctext mark set follows "end -1c"
-	$ctext mark gravity follows left
-	$ctext insert end "\n[mc "Precedes"]: "
-	$ctext mark set precedes "end -1c"
-	$ctext mark gravity precedes left
-	$ctext insert end "\n"
-	dispneartags 1
-    }
-    $ctext insert end "\n"
-    set comment [lindex $info 5]
-    if {[string first "\r" $comment] >= 0} {
-	set comment [string map {"\r" "\n    "} $comment]
-    }
-    appendwithlinks $comment {comment}
-
-    $ctext tag remove found 1.0 end
-    $ctext conf -state disabled
-    set commentend [$ctext index "end - 1c"]
-
-    set jump_to_here $desired_loc
-    init_flist [mc "Comments"]
-    if {$cmitmode eq "tree"} {
-	gettree $id
-    } elseif {$vinlinediff($curview) == 1} {
-	showinlinediff $id
-    } elseif {[llength $olds] <= 1} {
-	startdiff $id
-    } else {
-	mergediff $id
-    }
-}
-
-proc selfirstline {} {
-    unmarkmatches
-    selectline 0 1
-}
-
-proc sellastline {} {
-    global numcommits
-    unmarkmatches
-    set l [expr {$numcommits - 1}]
-    selectline $l 1
-}
-
-proc selnextline {dir} {
-    global selectedline
-    focus .
-    if {$selectedline eq {}} return
-    set l [expr {$selectedline + $dir}]
-    unmarkmatches
-    selectline $l 1
-}
-
-proc selnextpage {dir} {
-    global canv linespc selectedline numcommits
-
-    set lpp [expr {([winfo height $canv] - 2) / $linespc}]
-    if {$lpp < 1} {
-	set lpp 1
-    }
-    allcanvs yview scroll [expr {$dir * $lpp}] units
-    drawvisible
-    if {$selectedline eq {}} return
-    set l [expr {$selectedline + $dir * $lpp}]
-    if {$l < 0} {
-	set l 0
-    } elseif {$l >= $numcommits} {
-        set l [expr $numcommits - 1]
-    }
-    unmarkmatches
-    selectline $l 1
-}
-
-proc unselectline {} {
-    global selectedline currentid
-
-    set selectedline {}
-    unset -nocomplain currentid
-    allcanvs delete secsel
-    rhighlight_none
-}
-
-proc reselectline {} {
-    global selectedline
-
-    if {$selectedline ne {}} {
-	selectline $selectedline 0
-    }
-}
-
-proc addtohistory {cmd {saveproc {}}} {
-    global history historyindex curview
-
-    unset_posvars
-    save_position
-    set elt [list $curview $cmd $saveproc {}]
-    if {$historyindex > 0
-	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
-	return
-    }
-
-    if {$historyindex < [llength $history]} {
-	set history [lreplace $history $historyindex end $elt]
-    } else {
-	lappend history $elt
-    }
-    incr historyindex
-    if {$historyindex > 1} {
-	.tf.bar.leftbut conf -state normal
-    } else {
-	.tf.bar.leftbut conf -state disabled
-    }
-    .tf.bar.rightbut conf -state disabled
-}
-
-# save the scrolling position of the diff display pane
-proc save_position {} {
-    global historyindex history
-
-    if {$historyindex < 1} return
-    set hi [expr {$historyindex - 1}]
-    set fn [lindex $history $hi 2]
-    if {$fn ne {}} {
-	lset history $hi 3 [eval $fn]
-    }
-}
-
-proc unset_posvars {} {
-    global last_posvars
-
-    if {[info exists last_posvars]} {
-	foreach {var val} $last_posvars {
-	    global $var
-	    unset -nocomplain $var
-	}
-	unset last_posvars
-    }
-}
-
-proc godo {elt} {
-    global curview last_posvars
-
-    set view [lindex $elt 0]
-    set cmd [lindex $elt 1]
-    set pv [lindex $elt 3]
-    if {$curview != $view} {
-	showview $view
-    }
-    unset_posvars
-    foreach {var val} $pv {
-	global $var
-	set $var $val
-    }
-    set last_posvars $pv
-    eval $cmd
-}
-
-proc goback {} {
-    global history historyindex
-    focus .
-
-    if {$historyindex > 1} {
-	save_position
-	incr historyindex -1
-	godo [lindex $history [expr {$historyindex - 1}]]
-	.tf.bar.rightbut conf -state normal
-    }
-    if {$historyindex <= 1} {
-	.tf.bar.leftbut conf -state disabled
-    }
-}
-
-proc goforw {} {
-    global history historyindex
-    focus .
-
-    if {$historyindex < [llength $history]} {
-	save_position
-	set cmd [lindex $history $historyindex]
-	incr historyindex
-	godo $cmd
-	.tf.bar.leftbut conf -state normal
-    }
-    if {$historyindex >= [llength $history]} {
-	.tf.bar.rightbut conf -state disabled
-    }
-}
-
-proc go_to_parent {i} {
-    global parents curview targetid
-    set ps $parents($curview,$targetid)
-    if {[llength $ps] >= $i} {
-	selbyid [lindex $ps [expr $i - 1]]
-    }
-}
-
-proc gettree {id} {
-    global treefilelist treeidlist diffids diffmergeid treepending
-    global nullid nullid2
-
-    set diffids $id
-    unset -nocomplain diffmergeid
-    if {![info exists treefilelist($id)]} {
-	if {![info exists treepending]} {
-	    if {$id eq $nullid} {
-		set cmd [list | git ls-files]
-	    } elseif {$id eq $nullid2} {
-		set cmd [list | git ls-files --stage -t]
-	    } else {
-		set cmd [list | git ls-tree -r $id]
-	    }
-	    if {[catch {set gtf [open $cmd r]}]} {
-		return
-	    }
-	    set treepending $id
-	    set treefilelist($id) {}
-	    set treeidlist($id) {}
-	    fconfigure $gtf -blocking 0 -encoding binary
-	    filerun $gtf [list gettreeline $gtf $id]
-	}
-    } else {
-	setfilelist $id
-    }
-}
-
-proc gettreeline {gtf id} {
-    global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
-
-    set nl 0
-    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
-	if {$diffids eq $nullid} {
-	    set fname $line
-	} else {
-	    set i [string first "\t" $line]
-	    if {$i < 0} continue
-	    set fname [string range $line [expr {$i+1}] end]
-	    set line [string range $line 0 [expr {$i-1}]]
-	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
-	    set sha1 [lindex $line 2]
-	    lappend treeidlist($id) $sha1
-	}
-	if {[string index $fname 0] eq "\""} {
-	    set fname [lindex $fname 0]
-	}
-	set fname [encoding convertfrom $fname]
-	lappend treefilelist($id) $fname
-    }
-    if {![eof $gtf]} {
-	return [expr {$nl >= 1000? 2: 1}]
-    }
-    close $gtf
-    unset treepending
-    if {$cmitmode ne "tree"} {
-	if {![info exists diffmergeid]} {
-	    gettreediffs $diffids
-	}
-    } elseif {$id ne $diffids} {
-	gettree $diffids
-    } else {
-	setfilelist $id
-    }
-    return 0
-}
-
-proc showfile {f} {
-    global treefilelist treeidlist diffids nullid nullid2
-    global ctext_file_names ctext_file_lines
-    global ctext commentend
-
-    set i [lsearch -exact $treefilelist($diffids) $f]
-    if {$i < 0} {
-	puts "oops, $f not in list for id $diffids"
-	return
-    }
-    if {$diffids eq $nullid} {
-	if {[catch {set bf [open $f r]} err]} {
-	    puts "oops, can't read $f: $err"
-	    return
-	}
-    } else {
-	set blob [lindex $treeidlist($diffids) $i]
-	if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
-	    puts "oops, error reading blob $blob: $err"
-	    return
-	}
-    }
-    fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
-    filerun $bf [list getblobline $bf $diffids]
-    $ctext config -state normal
-    clear_ctext $commentend
-    lappend ctext_file_names $f
-    lappend ctext_file_lines [lindex [split $commentend "."] 0]
-    $ctext insert end "\n"
-    $ctext insert end "$f\n" filesep
-    $ctext config -state disabled
-    $ctext yview $commentend
-    settabs 0
-}
-
-proc getblobline {bf id} {
-    global diffids cmitmode ctext
-
-    if {$id ne $diffids || $cmitmode ne "tree"} {
-	catch {close $bf}
-	return 0
-    }
-    $ctext config -state normal
-    set nl 0
-    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
-	$ctext insert end "$line\n"
-    }
-    if {[eof $bf]} {
-	global jump_to_here ctext_file_names commentend
-
-	# delete last newline
-	$ctext delete "end - 2c" "end - 1c"
-	close $bf
-	if {$jump_to_here ne {} &&
-	    [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
-	    set lnum [expr {[lindex $jump_to_here 1] +
-			    [lindex [split $commentend .] 0]}]
-	    mark_ctext_line $lnum
-	}
-	$ctext config -state disabled
-	return 0
-    }
-    $ctext config -state disabled
-    return [expr {$nl >= 1000? 2: 1}]
-}
-
-proc mark_ctext_line {lnum} {
-    global ctext markbgcolor
-
-    $ctext tag delete omark
-    $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
-    $ctext tag conf omark -background $markbgcolor
-    $ctext see $lnum.0
-}
-
-proc mergediff {id} {
-    global diffmergeid
-    global diffids treediffs
-    global parents curview
-
-    set diffmergeid $id
-    set diffids $id
-    set treediffs($id) {}
-    set np [llength $parents($curview,$id)]
-    settabs $np
-    getblobdiffs $id
-}
-
-proc startdiff {ids} {
-    global treediffs diffids treepending diffmergeid nullid nullid2
-
-    settabs 1
-    set diffids $ids
-    unset -nocomplain diffmergeid
-    if {![info exists treediffs($ids)] ||
-	[lsearch -exact $ids $nullid] >= 0 ||
-	[lsearch -exact $ids $nullid2] >= 0} {
-	if {![info exists treepending]} {
-	    gettreediffs $ids
-	}
-    } else {
-	addtocflist $ids
-    }
-}
-
-proc showinlinediff {ids} {
-    global commitinfo commitdata ctext
-    global treediffs
-
-    set info $commitinfo($ids)
-    set diff [lindex $info 7]
-    set difflines [split $diff "\n"]
-
-    initblobdiffvars
-    set treediff {}
-
-    set inhdr 0
-    foreach line $difflines {
-	if {![string compare -length 5 "diff " $line]} {
-	    set inhdr 1
-	} elseif {$inhdr && ![string compare -length 4 "+++ " $line]} {
-	    # offset also accounts for the b/ prefix
-	    lappend treediff [string range $line 6 end]
-	    set inhdr 0
-	}
-    }
-
-    set treediffs($ids) $treediff
-    add_flist $treediff
-
-    $ctext conf -state normal
-    foreach line $difflines {
-	parseblobdiffline $ids $line
-    }
-    maybe_scroll_ctext 1
-    $ctext conf -state disabled
-}
-
-# If the filename (name) is under any of the passed filter paths
-# then return true to include the file in the listing.
-proc path_filter {filter name} {
-    set worktree [gitworktree]
-    foreach p $filter {
-	set fq_p [file normalize $p]
-	set fq_n [file normalize [file join $worktree $name]]
-	if {[string match [file normalize $fq_p]* $fq_n]} {
-	    return 1
-	}
-    }
-    return 0
-}
-
-proc addtocflist {ids} {
-    global treediffs
-
-    add_flist $treediffs($ids)
-    getblobdiffs $ids
-}
-
-proc diffcmd {ids flags} {
-    global log_showroot nullid nullid2 git_version
-
-    set i [lsearch -exact $ids $nullid]
-    set j [lsearch -exact $ids $nullid2]
-    if {$i >= 0} {
-	if {[llength $ids] > 1 && $j < 0} {
-	    # comparing working directory with some specific revision
-	    set cmd [concat | git diff-index $flags]
-	    if {$i == 0} {
-		lappend cmd -R [lindex $ids 1]
-	    } else {
-		lappend cmd [lindex $ids 0]
-	    }
-	} else {
-	    # comparing working directory with index
-	    set cmd [concat | git diff-files $flags]
-	    if {$j == 1} {
-		lappend cmd -R
-	    }
-	}
-    } elseif {$j >= 0} {
-	if {[package vcompare $git_version "1.7.2"] >= 0} {
-	    set flags "$flags --ignore-submodules=dirty"
-	}
-	set cmd [concat | git diff-index --cached $flags]
-	if {[llength $ids] > 1} {
-	    # comparing index with specific revision
-	    if {$j == 0} {
-		lappend cmd -R [lindex $ids 1]
-	    } else {
-		lappend cmd [lindex $ids 0]
-	    }
-	} else {
-	    # comparing index with HEAD
-	    lappend cmd HEAD
-	}
-    } else {
-	if {$log_showroot} {
-	    lappend flags --root
-	}
-	set cmd [concat | git diff-tree -r $flags $ids]
-    }
-    return $cmd
-}
-
-proc gettreediffs {ids} {
-    global treediff treepending limitdiffs vfilelimit curview
-
-    set cmd [diffcmd $ids {--no-commit-id}]
-    if {$limitdiffs && $vfilelimit($curview) ne {}} {
-	    set cmd [concat $cmd -- $vfilelimit($curview)]
-    }
-    if {[catch {set gdtf [open $cmd r]}]} return
-
-    set treepending $ids
-    set treediff {}
-    fconfigure $gdtf -blocking 0 -encoding binary
-    filerun $gdtf [list gettreediffline $gdtf $ids]
-}
-
-proc gettreediffline {gdtf ids} {
-    global treediff treediffs treepending diffids diffmergeid
-    global cmitmode vfilelimit curview limitdiffs perfile_attrs
-
-    set nr 0
-    set sublist {}
-    set max 1000
-    if {$perfile_attrs} {
-	# cache_gitattr is slow, and even slower on win32 where we
-	# have to invoke it for only about 30 paths at a time
-	set max 500
-	if {[tk windowingsystem] == "win32"} {
-	    set max 120
-	}
-    }
-    while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
-	set i [string first "\t" $line]
-	if {$i >= 0} {
-	    set file [string range $line [expr {$i+1}] end]
-	    if {[string index $file 0] eq "\""} {
-		set file [lindex $file 0]
-	    }
-	    set file [encoding convertfrom $file]
-	    if {$file ne [lindex $treediff end]} {
-		lappend treediff $file
-		lappend sublist $file
-	    }
-	}
-    }
-    if {$perfile_attrs} {
-	cache_gitattr encoding $sublist
-    }
-    if {![eof $gdtf]} {
-	return [expr {$nr >= $max? 2: 1}]
-    }
-    close $gdtf
-    set treediffs($ids) $treediff
-    unset treepending
-    if {$cmitmode eq "tree" && [llength $diffids] == 1} {
-	gettree $diffids
-    } elseif {$ids != $diffids} {
-	if {![info exists diffmergeid]} {
-	    gettreediffs $diffids
-	}
-    } else {
-	addtocflist $ids
-    }
-    return 0
-}
-
-# empty string or positive integer
-proc diffcontextvalidate {v} {
-    return [regexp {^(|[1-9][0-9]*)$} $v]
-}
-
-proc diffcontextchange {n1 n2 op} {
-    global diffcontextstring diffcontext
-
-    if {[string is integer -strict $diffcontextstring]} {
-	if {$diffcontextstring >= 0} {
-	    set diffcontext $diffcontextstring
-	    reselectline
-	}
-    }
-}
-
-proc changeignorespace {} {
-    reselectline
-}
-
-proc changeworddiff {name ix op} {
-    reselectline
-}
-
-proc initblobdiffvars {} {
-    global diffencoding targetline diffnparents
-    global diffinhdr currdiffsubmod diffseehere
-    set targetline {}
-    set diffnparents 0
-    set diffinhdr 0
-    set diffencoding [get_path_encoding {}]
-    set currdiffsubmod ""
-    set diffseehere -1
-}
-
-proc getblobdiffs {ids} {
-    global blobdifffd diffids env
-    global treediffs
-    global diffcontext
-    global ignorespace
-    global worddiff
-    global limitdiffs vfilelimit curview
-    global git_version
-
-    set textconv {}
-    if {[package vcompare $git_version "1.6.1"] >= 0} {
-	set textconv "--textconv"
-    }
-    set submodule {}
-    if {[package vcompare $git_version "1.6.6"] >= 0} {
-	set submodule "--submodule"
-    }
-    set cmd [diffcmd $ids "-p $textconv $submodule  -C --cc --no-commit-id -U$diffcontext"]
-    if {$ignorespace} {
-	append cmd " -w"
-    }
-    if {$worddiff ne [mc "Line diff"]} {
-	append cmd " --word-diff=porcelain"
-    }
-    if {$limitdiffs && $vfilelimit($curview) ne {}} {
-	set cmd [concat $cmd -- $vfilelimit($curview)]
-    }
-    if {[catch {set bdf [open $cmd r]} err]} {
-	error_popup [mc "Error getting diffs: %s" $err]
-	return
-    }
-    fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
-    set blobdifffd($ids) $bdf
-    initblobdiffvars
-    filerun $bdf [list getblobdiffline $bdf $diffids]
-}
-
-proc savecmitpos {} {
-    global ctext cmitmode
-
-    if {$cmitmode eq "tree"} {
-	return {}
-    }
-    return [list target_scrollpos [$ctext index @0,0]]
-}
-
-proc savectextpos {} {
-    global ctext
-
-    return [list target_scrollpos [$ctext index @0,0]]
-}
-
-proc maybe_scroll_ctext {ateof} {
-    global ctext target_scrollpos
-
-    if {![info exists target_scrollpos]} return
-    if {!$ateof} {
-	set nlines [expr {[winfo height $ctext]
-			  / [font metrics textfont -linespace]}]
-	if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
-    }
-    $ctext yview $target_scrollpos
-    unset target_scrollpos
-}
-
-proc setinlist {var i val} {
-    global $var
-
-    while {[llength [set $var]] < $i} {
-	lappend $var {}
-    }
-    if {[llength [set $var]] == $i} {
-	lappend $var $val
-    } else {
-	lset $var $i $val
-    }
-}
-
-proc makediffhdr {fname ids} {
-    global ctext curdiffstart treediffs diffencoding
-    global ctext_file_names jump_to_here targetline diffline
-
-    set fname [encoding convertfrom $fname]
-    set diffencoding [get_path_encoding $fname]
-    set i [lsearch -exact $treediffs($ids) $fname]
-    if {$i >= 0} {
-	setinlist difffilestart $i $curdiffstart
-    }
-    lset ctext_file_names end $fname
-    set l [expr {(78 - [string length $fname]) / 2}]
-    set pad [string range "----------------------------------------" 1 $l]
-    $ctext insert $curdiffstart "$pad $fname $pad" filesep
-    set targetline {}
-    if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
-	set targetline [lindex $jump_to_here 1]
-    }
-    set diffline 0
-}
-
-proc blobdiffmaybeseehere {ateof} {
-    global diffseehere
-    if {$diffseehere >= 0} {
-	mark_ctext_line [lindex [split $diffseehere .] 0]
-    }
-    maybe_scroll_ctext $ateof
-}
-
-proc getblobdiffline {bdf ids} {
-    global diffids blobdifffd
-    global ctext
-
-    set nr 0
-    $ctext conf -state normal
-    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
-	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
-	    # Older diff read. Abort it.
-	    catch {close $bdf}
-	    if {$ids != $diffids} {
-		array unset blobdifffd $ids
-	    }
-	    return 0
-	}
-	parseblobdiffline $ids $line
-    }
-    $ctext conf -state disabled
-    blobdiffmaybeseehere [eof $bdf]
-    if {[eof $bdf]} {
-	catch {close $bdf}
-	array unset blobdifffd $ids
-	return 0
-    }
-    return [expr {$nr >= 1000? 2: 1}]
-}
-
-proc parseblobdiffline {ids line} {
-    global ctext curdiffstart
-    global diffnexthead diffnextnote difffilestart
-    global ctext_file_names ctext_file_lines
-    global diffinhdr treediffs mergemax diffnparents
-    global diffencoding jump_to_here targetline diffline currdiffsubmod
-    global worddiff diffseehere
-
-    if {![string compare -length 5 "diff " $line]} {
-	if {![regexp {^diff (--cc|--git) } $line m type]} {
-	    set line [encoding convertfrom $line]
-	    $ctext insert end "$line\n" hunksep
-	    continue
-	}
-	# start of a new file
-	set diffinhdr 1
-	$ctext insert end "\n"
-	set curdiffstart [$ctext index "end - 1c"]
-	lappend ctext_file_names ""
-	lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
-	$ctext insert end "\n" filesep
-
-	if {$type eq "--cc"} {
-	    # start of a new file in a merge diff
-	    set fname [string range $line 10 end]
-	    if {[lsearch -exact $treediffs($ids) $fname] < 0} {
-		lappend treediffs($ids) $fname
-		add_flist [list $fname]
-	    }
-
-	} else {
-	    set line [string range $line 11 end]
-	    # If the name hasn't changed the length will be odd,
-	    # the middle char will be a space, and the two bits either
-	    # side will be a/name and b/name, or "a/name" and "b/name".
-	    # If the name has changed we'll get "rename from" and
-	    # "rename to" or "copy from" and "copy to" lines following
-	    # this, and we'll use them to get the filenames.
-	    # This complexity is necessary because spaces in the
-	    # filename(s) don't get escaped.
-	    set l [string length $line]
-	    set i [expr {$l / 2}]
-	    if {!(($l & 1) && [string index $line $i] eq " " &&
-		  [string range $line 2 [expr {$i - 1}]] eq \
-		      [string range $line [expr {$i + 3}] end])} {
-		return
-	    }
-	    # unescape if quoted and chop off the a/ from the front
-	    if {[string index $line 0] eq "\""} {
-		set fname [string range [lindex $line 0] 2 end]
-	    } else {
-		set fname [string range $line 2 [expr {$i - 1}]]
-	    }
-	}
-	makediffhdr $fname $ids
-
-    } elseif {![string compare -length 16 "* Unmerged path " $line]} {
-	set fname [encoding convertfrom [string range $line 16 end]]
-	$ctext insert end "\n"
-	set curdiffstart [$ctext index "end - 1c"]
-	lappend ctext_file_names $fname
-	lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
-	$ctext insert end "$line\n" filesep
-	set i [lsearch -exact $treediffs($ids) $fname]
-	if {$i >= 0} {
-	    setinlist difffilestart $i $curdiffstart
-	}
-
-    } elseif {![string compare -length 2 "@@" $line]} {
-	regexp {^@@+} $line ats
-	set line [encoding convertfrom $diffencoding $line]
-	$ctext insert end "$line\n" hunksep
-	if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
-	    set diffline $nl
-	}
-	set diffnparents [expr {[string length $ats] - 1}]
-	set diffinhdr 0
-
-    } elseif {![string compare -length 10 "Submodule " $line]} {
-	# start of a new submodule
-	if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
-	    set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
-	} else {
-	    set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
-	}
-	if {$currdiffsubmod != $fname} {
-	    $ctext insert end "\n";     # Add newline after commit message
-	}
-	set curdiffstart [$ctext index "end - 1c"]
-	lappend ctext_file_names ""
-	if {$currdiffsubmod != $fname} {
-	    lappend ctext_file_lines $fname
-	    makediffhdr $fname $ids
-	    set currdiffsubmod $fname
-	    $ctext insert end "\n$line\n" filesep
-	} else {
-	    $ctext insert end "$line\n" filesep
-	}
-    } elseif {![string compare -length 3 "  >" $line]} {
-	set $currdiffsubmod ""
-	set line [encoding convertfrom $diffencoding $line]
-	$ctext insert end "$line\n" dresult
-    } elseif {![string compare -length 3 "  <" $line]} {
-	set $currdiffsubmod ""
-	set line [encoding convertfrom $diffencoding $line]
-	$ctext insert end "$line\n" d0
-    } elseif {$diffinhdr} {
-	if {![string compare -length 12 "rename from " $line]} {
-	    set fname [string range $line [expr 6 + [string first " from " $line] ] end]
-	    if {[string index $fname 0] eq "\""} {
-		set fname [lindex $fname 0]
-	    }
-	    set fname [encoding convertfrom $fname]
-	    set i [lsearch -exact $treediffs($ids) $fname]
-	    if {$i >= 0} {
-		setinlist difffilestart $i $curdiffstart
-	    }
-	} elseif {![string compare -length 10 $line "rename to "] ||
-		  ![string compare -length 8 $line "copy to "]} {
-	    set fname [string range $line [expr 4 + [string first " to " $line] ] end]
-	    if {[string index $fname 0] eq "\""} {
-		set fname [lindex $fname 0]
-	    }
-	    makediffhdr $fname $ids
-	} elseif {[string compare -length 3 $line "---"] == 0} {
-	    # do nothing
-	    return
-	} elseif {[string compare -length 3 $line "+++"] == 0} {
-	    set diffinhdr 0
-	    return
-	}
-	$ctext insert end "$line\n" filesep
-
-    } else {
-	set line [string map {\x1A ^Z} \
-		      [encoding convertfrom $diffencoding $line]]
-	# parse the prefix - one ' ', '-' or '+' for each parent
-	set prefix [string range $line 0 [expr {$diffnparents - 1}]]
-	set tag [expr {$diffnparents > 1? "m": "d"}]
-	set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}]
-	set words_pre_markup ""
-	set words_post_markup ""
-	if {[string trim $prefix " -+"] eq {}} {
-	    # prefix only has " ", "-" and "+" in it: normal diff line
-	    set num [string first "-" $prefix]
-	    if {$dowords} {
-		set line [string range $line 1 end]
-	    }
-	    if {$num >= 0} {
-		# removed line, first parent with line is $num
-		if {$num >= $mergemax} {
-		    set num "max"
-		}
-		if {$dowords && $worddiff eq [mc "Markup words"]} {
-		    $ctext insert end "\[-$line-\]" $tag$num
-		} else {
-		    $ctext insert end "$line" $tag$num
-		}
-		if {!$dowords} {
-		    $ctext insert end "\n" $tag$num
-		}
-	    } else {
-		set tags {}
-		if {[string first "+" $prefix] >= 0} {
-		    # added line
-		    lappend tags ${tag}result
-		    if {$diffnparents > 1} {
-			set num [string first " " $prefix]
-			if {$num >= 0} {
-			    if {$num >= $mergemax} {
-				set num "max"
-			    }
-			    lappend tags m$num
-			}
-		    }
-		    set words_pre_markup "{+"
-		    set words_post_markup "+}"
-		}
-		if {$targetline ne {}} {
-		    if {$diffline == $targetline} {
-			set diffseehere [$ctext index "end - 1 chars"]
-			set targetline {}
-		    } else {
-			incr diffline
-		    }
-		}
-		if {$dowords && $worddiff eq [mc "Markup words"]} {
-		    $ctext insert end "$words_pre_markup$line$words_post_markup" $tags
-		} else {
-		    $ctext insert end "$line" $tags
-		}
-		if {!$dowords} {
-		    $ctext insert end "\n" $tags
-		}
-	    }
-	} elseif {$dowords && $prefix eq "~"} {
-	    $ctext insert end "\n" {}
-	} else {
-	    # "\ No newline at end of file",
-	    # or something else we don't recognize
-	    $ctext insert end "$line\n" hunksep
-	}
-    }
-}
-
-proc changediffdisp {} {
-    global ctext diffelide
-
-    $ctext tag conf d0 -elide [lindex $diffelide 0]
-    $ctext tag conf dresult -elide [lindex $diffelide 1]
-}
-
-proc highlightfile {cline} {
-    global cflist cflist_top
-
-    if {![info exists cflist_top]} return
-
-    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
-    $cflist tag add highlight $cline.0 "$cline.0 lineend"
-    $cflist see $cline.0
-    set cflist_top $cline
-}
-
-proc highlightfile_for_scrollpos {topidx} {
-    global cmitmode difffilestart
-
-    if {$cmitmode eq "tree"} return
-    if {![info exists difffilestart]} return
-
-    set top [lindex [split $topidx .] 0]
-    if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} {
-	highlightfile 0
-    } else {
-	highlightfile [expr {[bsearch $difffilestart $top] + 2}]
-    }
-}
-
-proc prevfile {} {
-    global difffilestart ctext cmitmode
-
-    if {$cmitmode eq "tree"} return
-    set prev 0.0
-    set here [$ctext index @0,0]
-    foreach loc $difffilestart {
-	if {[$ctext compare $loc >= $here]} {
-	    $ctext yview $prev
-	    return
-	}
-	set prev $loc
-    }
-    $ctext yview $prev
-}
-
-proc nextfile {} {
-    global difffilestart ctext cmitmode
-
-    if {$cmitmode eq "tree"} return
-    set here [$ctext index @0,0]
-    foreach loc $difffilestart {
-	if {[$ctext compare $loc > $here]} {
-	    $ctext yview $loc
-	    return
-	}
-    }
-}
-
-proc clear_ctext {{first 1.0}} {
-    global ctext smarktop smarkbot
-    global ctext_file_names ctext_file_lines
-    global pendinglinks
-
-    set l [lindex [split $first .] 0]
-    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
-	set smarktop $l
-    }
-    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
-	set smarkbot $l
-    }
-    $ctext delete $first end
-    if {$first eq "1.0"} {
-	unset -nocomplain pendinglinks
-    }
-    set ctext_file_names {}
-    set ctext_file_lines {}
-}
-
-proc settabs {{firstab {}}} {
-    global firsttabstop tabstop ctext have_tk85
-
-    if {$firstab ne {} && $have_tk85} {
-	set firsttabstop $firstab
-    }
-    set w [font measure textfont "0"]
-    if {$firsttabstop != 0} {
-	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
-			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
-    } elseif {$have_tk85 || $tabstop != 8} {
-	$ctext conf -tabs [expr {$tabstop * $w}]
-    } else {
-	$ctext conf -tabs {}
-    }
-}
-
-proc incrsearch {name ix op} {
-    global ctext searchstring searchdirn
-
-    if {[catch {$ctext index anchor}]} {
-	# no anchor set, use start of selection, or of visible area
-	set sel [$ctext tag ranges sel]
-	if {$sel ne {}} {
-	    $ctext mark set anchor [lindex $sel 0]
-	} elseif {$searchdirn eq "-forwards"} {
-	    $ctext mark set anchor @0,0
-	} else {
-	    $ctext mark set anchor @0,[winfo height $ctext]
-	}
-    }
-    if {$searchstring ne {}} {
-	set here [$ctext search -count mlen $searchdirn -- $searchstring anchor]
-	if {$here ne {}} {
-	    $ctext see $here
-	    set mend "$here + $mlen c"
-	    $ctext tag remove sel 1.0 end
-	    $ctext tag add sel $here $mend
-	    suppress_highlighting_file_for_current_scrollpos
-	    highlightfile_for_scrollpos $here
-	}
-    }
-    rehighlight_search_results
-}
-
-proc dosearch {} {
-    global sstring ctext searchstring searchdirn
-
-    focus $sstring
-    $sstring icursor end
-    set searchdirn -forwards
-    if {$searchstring ne {}} {
-	set sel [$ctext tag ranges sel]
-	if {$sel ne {}} {
-	    set start "[lindex $sel 0] + 1c"
-	} elseif {[catch {set start [$ctext index anchor]}]} {
-	    set start "@0,0"
-	}
-	set match [$ctext search -count mlen -- $searchstring $start]
-	$ctext tag remove sel 1.0 end
-	if {$match eq {}} {
-	    bell
-	    return
-	}
-	$ctext see $match
-	suppress_highlighting_file_for_current_scrollpos
-	highlightfile_for_scrollpos $match
-	set mend "$match + $mlen c"
-	$ctext tag add sel $match $mend
-	$ctext mark unset anchor
-	rehighlight_search_results
-    }
-}
-
-proc dosearchback {} {
-    global sstring ctext searchstring searchdirn
-
-    focus $sstring
-    $sstring icursor end
-    set searchdirn -backwards
-    if {$searchstring ne {}} {
-	set sel [$ctext tag ranges sel]
-	if {$sel ne {}} {
-	    set start [lindex $sel 0]
-	} elseif {[catch {set start [$ctext index anchor]}]} {
-	    set start @0,[winfo height $ctext]
-	}
-	set match [$ctext search -backwards -count ml -- $searchstring $start]
-	$ctext tag remove sel 1.0 end
-	if {$match eq {}} {
-	    bell
-	    return
-	}
-	$ctext see $match
-	suppress_highlighting_file_for_current_scrollpos
-	highlightfile_for_scrollpos $match
-	set mend "$match + $ml c"
-	$ctext tag add sel $match $mend
-	$ctext mark unset anchor
-	rehighlight_search_results
-    }
-}
-
-proc rehighlight_search_results {} {
-    global ctext searchstring
-
-    $ctext tag remove found 1.0 end
-    $ctext tag remove currentsearchhit 1.0 end
-
-    if {$searchstring ne {}} {
-	searchmarkvisible 1
-    }
-}
-
-proc searchmark {first last} {
-    global ctext searchstring
-
-    set sel [$ctext tag ranges sel]
-
-    set mend $first.0
-    while {1} {
-	set match [$ctext search -count mlen -- $searchstring $mend $last.end]
-	if {$match eq {}} break
-	set mend "$match + $mlen c"
-	if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} {
-	    $ctext tag add currentsearchhit $match $mend
-	} else {
-	    $ctext tag add found $match $mend
-	}
-    }
-}
-
-proc searchmarkvisible {doall} {
-    global ctext smarktop smarkbot
-
-    set topline [lindex [split [$ctext index @0,0] .] 0]
-    set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
-    if {$doall || $botline < $smarktop || $topline > $smarkbot} {
-	# no overlap with previous
-	searchmark $topline $botline
-	set smarktop $topline
-	set smarkbot $botline
-    } else {
-	if {$topline < $smarktop} {
-	    searchmark $topline [expr {$smarktop-1}]
-	    set smarktop $topline
-	}
-	if {$botline > $smarkbot} {
-	    searchmark [expr {$smarkbot+1}] $botline
-	    set smarkbot $botline
-	}
-    }
-}
-
-proc suppress_highlighting_file_for_current_scrollpos {} {
-    global ctext suppress_highlighting_file_for_this_scrollpos
-
-    set suppress_highlighting_file_for_this_scrollpos [$ctext index @0,0]
-}
-
-proc scrolltext {f0 f1} {
-    global searchstring cmitmode ctext
-    global suppress_highlighting_file_for_this_scrollpos
-
-    set topidx [$ctext index @0,0]
-    if {![info exists suppress_highlighting_file_for_this_scrollpos]
-	|| $topidx ne $suppress_highlighting_file_for_this_scrollpos} {
-	highlightfile_for_scrollpos $topidx
-    }
-
-    unset -nocomplain suppress_highlighting_file_for_this_scrollpos
-
-    .bleft.bottom.sb set $f0 $f1
-    if {$searchstring ne {}} {
-	searchmarkvisible 0
-    }
-}
-
-proc setcoords {} {
-    global linespc charspc canvx0 canvy0
-    global xspc1 xspc2 lthickness
-
-    set linespc [font metrics mainfont -linespace]
-    set charspc [font measure mainfont "m"]
-    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
-    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
-    set lthickness [expr {int($linespc / 9) + 1}]
-    set xspc1(0) $linespc
-    set xspc2 $linespc
-}
-
-proc redisplay {} {
-    global canv
-    global selectedline
-
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    if {$ymax eq {} || $ymax == 0} return
-    set span [$canv yview]
-    clear_display
-    setcanvscroll
-    allcanvs yview moveto [lindex $span 0]
-    drawvisible
-    if {$selectedline ne {}} {
-	selectline $selectedline 0
-	allcanvs yview moveto [lindex $span 0]
-    }
-}
-
-proc parsefont {f n} {
-    global fontattr
-
-    set fontattr($f,family) [lindex $n 0]
-    set s [lindex $n 1]
-    if {$s eq {} || $s == 0} {
-	set s 10
-    } elseif {$s < 0} {
-	set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
-    }
-    set fontattr($f,size) $s
-    set fontattr($f,weight) normal
-    set fontattr($f,slant) roman
-    foreach style [lrange $n 2 end] {
-	switch -- $style {
-	    "normal" -
-	    "bold"   {set fontattr($f,weight) $style}
-	    "roman" -
-	    "italic" {set fontattr($f,slant) $style}
-	}
-    }
-}
-
-proc fontflags {f {isbold 0}} {
-    global fontattr
-
-    return [list -family $fontattr($f,family) -size $fontattr($f,size) \
-		-weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
-		-slant $fontattr($f,slant)]
-}
-
-proc fontname {f} {
-    global fontattr
-
-    set n [list $fontattr($f,family) $fontattr($f,size)]
-    if {$fontattr($f,weight) eq "bold"} {
-	lappend n "bold"
-    }
-    if {$fontattr($f,slant) eq "italic"} {
-	lappend n "italic"
-    }
-    return $n
-}
-
-proc incrfont {inc} {
-    global mainfont textfont ctext canv cflist showrefstop
-    global stopped entries fontattr
-
-    unmarkmatches
-    set s $fontattr(mainfont,size)
-    incr s $inc
-    if {$s < 1} {
-	set s 1
-    }
-    set fontattr(mainfont,size) $s
-    font config mainfont -size $s
-    font config mainfontbold -size $s
-    set mainfont [fontname mainfont]
-    set s $fontattr(textfont,size)
-    incr s $inc
-    if {$s < 1} {
-	set s 1
-    }
-    set fontattr(textfont,size) $s
-    font config textfont -size $s
-    font config textfontbold -size $s
-    set textfont [fontname textfont]
-    setcoords
-    settabs
-    redisplay
-}
-
-proc clearsha1 {} {
-    global sha1entry sha1string
-    if {[string length $sha1string] == 40} {
-	$sha1entry delete 0 end
-    }
-}
-
-proc sha1change {n1 n2 op} {
-    global sha1string currentid sha1but
-    if {$sha1string == {}
-	|| ([info exists currentid] && $sha1string == $currentid)} {
-	set state disabled
-    } else {
-	set state normal
-    }
-    if {[$sha1but cget -state] == $state} return
-    if {$state == "normal"} {
-	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
-    } else {
-	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
-    }
-}
-
-proc gotocommit {} {
-    global sha1string tagids headids curview varcid
-
-    if {$sha1string == {}
-	|| ([info exists currentid] && $sha1string == $currentid)} return
-    if {[info exists tagids($sha1string)]} {
-	set id $tagids($sha1string)
-    } elseif {[info exists headids($sha1string)]} {
-	set id $headids($sha1string)
-    } else {
-	set id [string tolower $sha1string]
-	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
-	    set matches [longid $id]
-	    if {$matches ne {}} {
-		if {[llength $matches] > 1} {
-		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
-		    return
-		}
-		set id [lindex $matches 0]
-	    }
-	} else {
-	    if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
-		error_popup [mc "Revision %s is not known" $sha1string]
-		return
-	    }
-	}
-    }
-    if {[commitinview $id $curview]} {
-	selectline [rowofcommit $id] 1
-	return
-    }
-    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
-	set msg [mc "SHA1 id %s is not known" $sha1string]
-    } else {
-	set msg [mc "Revision %s is not in the current view" $sha1string]
-    }
-    error_popup $msg
-}
-
-proc lineenter {x y id} {
-    global hoverx hovery hoverid hovertimer
-    global commitinfo canv
-
-    if {![info exists commitinfo($id)] && ![getcommit $id]} return
-    set hoverx $x
-    set hovery $y
-    set hoverid $id
-    if {[info exists hovertimer]} {
-	after cancel $hovertimer
-    }
-    set hovertimer [after 500 linehover]
-    $canv delete hover
-}
-
-proc linemotion {x y id} {
-    global hoverx hovery hoverid hovertimer
-
-    if {[info exists hoverid] && $id == $hoverid} {
-	set hoverx $x
-	set hovery $y
-	if {[info exists hovertimer]} {
-	    after cancel $hovertimer
-	}
-	set hovertimer [after 500 linehover]
-    }
-}
-
-proc lineleave {id} {
-    global hoverid hovertimer canv
-
-    if {[info exists hoverid] && $id == $hoverid} {
-	$canv delete hover
-	if {[info exists hovertimer]} {
-	    after cancel $hovertimer
-	    unset hovertimer
-	}
-	unset hoverid
-    }
-}
-
-proc linehover {} {
-    global hoverx hovery hoverid hovertimer
-    global canv linespc lthickness
-    global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor
-
-    global commitinfo
-
-    set text [lindex $commitinfo($hoverid) 0]
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    if {$ymax == {}} return
-    set yfrac [lindex [$canv yview] 0]
-    set x [expr {$hoverx + 2 * $linespc}]
-    set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
-    set x0 [expr {$x - 2 * $lthickness}]
-    set y0 [expr {$y - 2 * $lthickness}]
-    set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
-    set y1 [expr {$y + $linespc + 2 * $lthickness}]
-    set t [$canv create rectangle $x0 $y0 $x1 $y1 \
-	       -fill $linehoverbgcolor -outline $linehoveroutlinecolor \
-	       -width 1 -tags hover]
-    $canv raise $t
-    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
-	       -font mainfont -fill $linehoverfgcolor]
-    $canv raise $t
-}
-
-proc clickisonarrow {id y} {
-    global lthickness
-
-    set ranges [rowranges $id]
-    set thresh [expr {2 * $lthickness + 6}]
-    set n [expr {[llength $ranges] - 1}]
-    for {set i 1} {$i < $n} {incr i} {
-	set row [lindex $ranges $i]
-	if {abs([yc $row] - $y) < $thresh} {
-	    return $i
-	}
-    }
-    return {}
-}
-
-proc arrowjump {id n y} {
-    global canv
-
-    # 1 <-> 2, 3 <-> 4, etc...
-    set n [expr {(($n - 1) ^ 1) + 1}]
-    set row [lindex [rowranges $id] $n]
-    set yt [yc $row]
-    set ymax [lindex [$canv cget -scrollregion] 3]
-    if {$ymax eq {} || $ymax <= 0} return
-    set view [$canv yview]
-    set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
-    set yfrac [expr {$yt / $ymax - $yspan / 2}]
-    if {$yfrac < 0} {
-	set yfrac 0
-    }
-    allcanvs yview moveto $yfrac
-}
-
-proc lineclick {x y id isnew} {
-    global ctext commitinfo children canv thickerline curview
-
-    if {![info exists commitinfo($id)] && ![getcommit $id]} return
-    unmarkmatches
-    unselectline
-    normalline
-    $canv delete hover
-    # draw this line thicker than normal
-    set thickerline $id
-    drawlines $id
-    if {$isnew} {
-	set ymax [lindex [$canv cget -scrollregion] 3]
-	if {$ymax eq {}} return
-	set yfrac [lindex [$canv yview] 0]
-	set y [expr {$y + $yfrac * $ymax}]
-    }
-    set dirn [clickisonarrow $id $y]
-    if {$dirn ne {}} {
-	arrowjump $id $dirn $y
-	return
-    }
-
-    if {$isnew} {
-	addtohistory [list lineclick $x $y $id 0] savectextpos
-    }
-    # fill the details pane with info about this line
-    $ctext conf -state normal
-    clear_ctext
-    settabs 0
-    $ctext insert end "[mc "Parent"]:\t"
-    $ctext insert end $id link0
-    setlink $id link0
-    set info $commitinfo($id)
-    $ctext insert end "\n\t[lindex $info 0]\n"
-    $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
-    set date [formatdate [lindex $info 2]]
-    $ctext insert end "\t[mc "Date"]:\t$date\n"
-    set kids $children($curview,$id)
-    if {$kids ne {}} {
-	$ctext insert end "\n[mc "Children"]:"
-	set i 0
-	foreach child $kids {
-	    incr i
-	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
-	    set info $commitinfo($child)
-	    $ctext insert end "\n\t"
-	    $ctext insert end $child link$i
-	    setlink $child link$i
-	    $ctext insert end "\n\t[lindex $info 0]"
-	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
-	    set date [formatdate [lindex $info 2]]
-	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
-	}
-    }
-    maybe_scroll_ctext 1
-    $ctext conf -state disabled
-    init_flist {}
-}
-
-proc normalline {} {
-    global thickerline
-    if {[info exists thickerline]} {
-	set id $thickerline
-	unset thickerline
-	drawlines $id
-    }
-}
-
-proc selbyid {id {isnew 1}} {
-    global curview
-    if {[commitinview $id $curview]} {
-	selectline [rowofcommit $id] $isnew
-    }
-}
-
-proc mstime {} {
-    global startmstime
-    if {![info exists startmstime]} {
-	set startmstime [clock clicks -milliseconds]
-    }
-    return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
-}
-
-proc rowmenu {x y id} {
-    global rowctxmenu selectedline rowmenuid curview
-    global nullid nullid2 fakerowmenu mainhead markedid
-
-    stopfinding
-    set rowmenuid $id
-    if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
-	set state disabled
-    } else {
-	set state normal
-    }
-    if {[info exists markedid] && $markedid ne $id} {
-	set mstate normal
-    } else {
-	set mstate disabled
-    }
-    if {$id ne $nullid && $id ne $nullid2} {
-	set menu $rowctxmenu
-	if {$mainhead ne {}} {
-	    $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal
-	} else {
-	    $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled
-	}
-	$menu entryconfigure 10 -state $mstate
-	$menu entryconfigure 11 -state $mstate
-	$menu entryconfigure 12 -state $mstate
-    } else {
-	set menu $fakerowmenu
-    }
-    $menu entryconfigure [mca "Diff this -> selected"] -state $state
-    $menu entryconfigure [mca "Diff selected -> this"] -state $state
-    $menu entryconfigure [mca "Make patch"] -state $state
-    $menu entryconfigure [mca "Diff this -> marked commit"] -state $mstate
-    $menu entryconfigure [mca "Diff marked commit -> this"] -state $mstate
-    tk_popup $menu $x $y
-}
-
-proc markhere {} {
-    global rowmenuid markedid canv
-
-    set markedid $rowmenuid
-    make_idmark $markedid
-}
-
-proc gotomark {} {
-    global markedid
-
-    if {[info exists markedid]} {
-	selbyid $markedid
-    }
-}
-
-proc replace_by_kids {l r} {
-    global curview children
-
-    set id [commitonrow $r]
-    set l [lreplace $l 0 0]
-    foreach kid $children($curview,$id) {
-	lappend l [rowofcommit $kid]
-    }
-    return [lsort -integer -decreasing -unique $l]
-}
-
-proc find_common_desc {} {
-    global markedid rowmenuid curview children
-
-    if {![info exists markedid]} return
-    if {![commitinview $markedid $curview] ||
-	![commitinview $rowmenuid $curview]} return
-    #set t1 [clock clicks -milliseconds]
-    set l1 [list [rowofcommit $markedid]]
-    set l2 [list [rowofcommit $rowmenuid]]
-    while 1 {
-	set r1 [lindex $l1 0]
-	set r2 [lindex $l2 0]
-	if {$r1 eq {} || $r2 eq {}} break
-	if {$r1 == $r2} {
-	    selectline $r1 1
-	    break
-	}
-	if {$r1 > $r2} {
-	    set l1 [replace_by_kids $l1 $r1]
-	} else {
-	    set l2 [replace_by_kids $l2 $r2]
-	}
-    }
-    #set t2 [clock clicks -milliseconds]
-    #puts "took [expr {$t2-$t1}]ms"
-}
-
-proc compare_commits {} {
-    global markedid rowmenuid curview children
-
-    if {![info exists markedid]} return
-    if {![commitinview $markedid $curview]} return
-    addtohistory [list do_cmp_commits $markedid $rowmenuid]
-    do_cmp_commits $markedid $rowmenuid
-}
-
-proc getpatchid {id} {
-    global patchids
-
-    if {![info exists patchids($id)]} {
-	set cmd [diffcmd [list $id] {-p --root}]
-	# trim off the initial "|"
-	set cmd [lrange $cmd 1 end]
-	if {[catch {
-	    set x [eval exec $cmd | git patch-id]
-	    set patchids($id) [lindex $x 0]
-	}]} {
-	    set patchids($id) "error"
-	}
-    }
-    return $patchids($id)
-}
-
-proc do_cmp_commits {a b} {
-    global ctext curview parents children patchids commitinfo
-
-    $ctext conf -state normal
-    clear_ctext
-    init_flist {}
-    for {set i 0} {$i < 100} {incr i} {
-	set skipa 0
-	set skipb 0
-	if {[llength $parents($curview,$a)] > 1} {
-	    appendshortlink $a [mc "Skipping merge commit "] "\n"
-	    set skipa 1
-	} else {
-	    set patcha [getpatchid $a]
-	}
-	if {[llength $parents($curview,$b)] > 1} {
-	    appendshortlink $b [mc "Skipping merge commit "] "\n"
-	    set skipb 1
-	} else {
-	    set patchb [getpatchid $b]
-	}
-	if {!$skipa && !$skipb} {
-	    set heada [lindex $commitinfo($a) 0]
-	    set headb [lindex $commitinfo($b) 0]
-	    if {$patcha eq "error"} {
-		appendshortlink $a [mc "Error getting patch ID for "] \
-		    [mc " - stopping\n"]
-		break
-	    }
-	    if {$patchb eq "error"} {
-		appendshortlink $b [mc "Error getting patch ID for "] \
-		    [mc " - stopping\n"]
-		break
-	    }
-	    if {$patcha eq $patchb} {
-		if {$heada eq $headb} {
-		    appendshortlink $a [mc "Commit "]
-		    appendshortlink $b " == " "  $heada\n"
-		} else {
-		    appendshortlink $a [mc "Commit "] "  $heada\n"
-		    appendshortlink $b [mc " is the same patch as\n       "] \
-			"  $headb\n"
-		}
-		set skipa 1
-		set skipb 1
-	    } else {
-		$ctext insert end "\n"
-		appendshortlink $a [mc "Commit "] "  $heada\n"
-		appendshortlink $b [mc " differs from\n       "] \
-		    "  $headb\n"
-		$ctext insert end [mc "Diff of commits:\n\n"]
-		$ctext conf -state disabled
-		update
-		diffcommits $a $b
-		return
-	    }
-	}
-	if {$skipa} {
-	    set kids [real_children $curview,$a]
-	    if {[llength $kids] != 1} {
-		$ctext insert end "\n"
-		appendshortlink $a [mc "Commit "] \
-		    [mc " has %s children - stopping\n" [llength $kids]]
-		break
-	    }
-	    set a [lindex $kids 0]
-	}
-	if {$skipb} {
-	    set kids [real_children $curview,$b]
-	    if {[llength $kids] != 1} {
-		appendshortlink $b [mc "Commit "] \
-		    [mc " has %s children - stopping\n" [llength $kids]]
-		break
-	    }
-	    set b [lindex $kids 0]
-	}
-    }
-    $ctext conf -state disabled
-}
-
-proc diffcommits {a b} {
-    global diffcontext diffids blobdifffd diffinhdr currdiffsubmod
-
-    set tmpdir [gitknewtmpdir]
-    set fna [file join $tmpdir "commit-[string range $a 0 7]"]
-    set fnb [file join $tmpdir "commit-[string range $b 0 7]"]
-    if {[catch {
-	exec git diff-tree -p --pretty $a >$fna
-	exec git diff-tree -p --pretty $b >$fnb
-    } err]} {
-	error_popup [mc "Error writing commit to file: %s" $err]
-	return
-    }
-    if {[catch {
-	set fd [open "| diff -U$diffcontext $fna $fnb" r]
-    } err]} {
-	error_popup [mc "Error diffing commits: %s" $err]
-	return
-    }
-    set diffids [list commits $a $b]
-    set blobdifffd($diffids) $fd
-    set diffinhdr 0
-    set currdiffsubmod ""
-    filerun $fd [list getblobdiffline $fd $diffids]
-}
-
-proc diffvssel {dirn} {
-    global rowmenuid selectedline
-
-    if {$selectedline eq {}} return
-    if {$dirn} {
-	set oldid [commitonrow $selectedline]
-	set newid $rowmenuid
-    } else {
-	set oldid $rowmenuid
-	set newid [commitonrow $selectedline]
-    }
-    addtohistory [list doseldiff $oldid $newid] savectextpos
-    doseldiff $oldid $newid
-}
-
-proc diffvsmark {dirn} {
-    global rowmenuid markedid
-
-    if {![info exists markedid]} return
-    if {$dirn} {
-	set oldid $markedid
-	set newid $rowmenuid
-    } else {
-	set oldid $rowmenuid
-	set newid $markedid
-    }
-    addtohistory [list doseldiff $oldid $newid] savectextpos
-    doseldiff $oldid $newid
-}
-
-proc doseldiff {oldid newid} {
-    global ctext
-    global commitinfo
-
-    $ctext conf -state normal
-    clear_ctext
-    init_flist [mc "Top"]
-    $ctext insert end "[mc "From"] "
-    $ctext insert end $oldid link0
-    setlink $oldid link0
-    $ctext insert end "\n     "
-    $ctext insert end [lindex $commitinfo($oldid) 0]
-    $ctext insert end "\n\n[mc "To"]   "
-    $ctext insert end $newid link1
-    setlink $newid link1
-    $ctext insert end "\n     "
-    $ctext insert end [lindex $commitinfo($newid) 0]
-    $ctext insert end "\n"
-    $ctext conf -state disabled
-    $ctext tag remove found 1.0 end
-    startdiff [list $oldid $newid]
-}
-
-proc mkpatch {} {
-    global rowmenuid currentid commitinfo patchtop patchnum NS
-
-    if {![info exists currentid]} return
-    set oldid $currentid
-    set oldhead [lindex $commitinfo($oldid) 0]
-    set newid $rowmenuid
-    set newhead [lindex $commitinfo($newid) 0]
-    set top .patch
-    set patchtop $top
-    catch {destroy $top}
-    ttk_toplevel $top
-    make_transient $top .
-    ${NS}::label $top.title -text [mc "Generate patch"]
-    grid $top.title - -pady 10
-    ${NS}::label $top.from -text [mc "From:"]
-    ${NS}::entry $top.fromsha1 -width 40
-    $top.fromsha1 insert 0 $oldid
-    $top.fromsha1 conf -state readonly
-    grid $top.from $top.fromsha1 -sticky w
-    ${NS}::entry $top.fromhead -width 60
-    $top.fromhead insert 0 $oldhead
-    $top.fromhead conf -state readonly
-    grid x $top.fromhead -sticky w
-    ${NS}::label $top.to -text [mc "To:"]
-    ${NS}::entry $top.tosha1 -width 40
-    $top.tosha1 insert 0 $newid
-    $top.tosha1 conf -state readonly
-    grid $top.to $top.tosha1 -sticky w
-    ${NS}::entry $top.tohead -width 60
-    $top.tohead insert 0 $newhead
-    $top.tohead conf -state readonly
-    grid x $top.tohead -sticky w
-    ${NS}::button $top.rev -text [mc "Reverse"] -command mkpatchrev
-    grid $top.rev x -pady 10 -padx 5
-    ${NS}::label $top.flab -text [mc "Output file:"]
-    ${NS}::entry $top.fname -width 60
-    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
-    incr patchnum
-    grid $top.flab $top.fname -sticky w
-    ${NS}::frame $top.buts
-    ${NS}::button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
-    ${NS}::button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
-    bind $top <Key-Return> mkpatchgo
-    bind $top <Key-Escape> mkpatchcan
-    grid $top.buts.gen $top.buts.can
-    grid columnconfigure $top.buts 0 -weight 1 -uniform a
-    grid columnconfigure $top.buts 1 -weight 1 -uniform a
-    grid $top.buts - -pady 10 -sticky ew
-    focus $top.fname
-}
-
-proc mkpatchrev {} {
-    global patchtop
-
-    set oldid [$patchtop.fromsha1 get]
-    set oldhead [$patchtop.fromhead get]
-    set newid [$patchtop.tosha1 get]
-    set newhead [$patchtop.tohead get]
-    foreach e [list fromsha1 fromhead tosha1 tohead] \
-	    v [list $newid $newhead $oldid $oldhead] {
-	$patchtop.$e conf -state normal
-	$patchtop.$e delete 0 end
-	$patchtop.$e insert 0 $v
-	$patchtop.$e conf -state readonly
-    }
-}
-
-proc mkpatchgo {} {
-    global patchtop nullid nullid2
-
-    set oldid [$patchtop.fromsha1 get]
-    set newid [$patchtop.tosha1 get]
-    set fname [$patchtop.fname get]
-    set cmd [diffcmd [list $oldid $newid] -p]
-    # trim off the initial "|"
-    set cmd [lrange $cmd 1 end]
-    lappend cmd >$fname &
-    if {[catch {eval exec $cmd} err]} {
-	error_popup "[mc "Error creating patch:"] $err" $patchtop
-    }
-    catch {destroy $patchtop}
-    unset patchtop
-}
-
-proc mkpatchcan {} {
-    global patchtop
-
-    catch {destroy $patchtop}
-    unset patchtop
-}
-
-proc mktag {} {
-    global rowmenuid mktagtop commitinfo NS
-
-    set top .maketag
-    set mktagtop $top
-    catch {destroy $top}
-    ttk_toplevel $top
-    make_transient $top .
-    ${NS}::label $top.title -text [mc "Create tag"]
-    grid $top.title - -pady 10
-    ${NS}::label $top.id -text [mc "ID:"]
-    ${NS}::entry $top.sha1 -width 40
-    $top.sha1 insert 0 $rowmenuid
-    $top.sha1 conf -state readonly
-    grid $top.id $top.sha1 -sticky w
-    ${NS}::entry $top.head -width 60
-    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
-    $top.head conf -state readonly
-    grid x $top.head -sticky w
-    ${NS}::label $top.tlab -text [mc "Tag name:"]
-    ${NS}::entry $top.tag -width 60
-    grid $top.tlab $top.tag -sticky w
-    ${NS}::label $top.op -text [mc "Tag message is optional"]
-    grid $top.op -columnspan 2 -sticky we
-    ${NS}::label $top.mlab -text [mc "Tag message:"]
-    ${NS}::entry $top.msg -width 60
-    grid $top.mlab $top.msg -sticky w
-    ${NS}::frame $top.buts
-    ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo
-    ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan
-    bind $top <Key-Return> mktaggo
-    bind $top <Key-Escape> mktagcan
-    grid $top.buts.gen $top.buts.can
-    grid columnconfigure $top.buts 0 -weight 1 -uniform a
-    grid columnconfigure $top.buts 1 -weight 1 -uniform a
-    grid $top.buts - -pady 10 -sticky ew
-    focus $top.tag
-}
-
-proc domktag {} {
-    global mktagtop env tagids idtags
-
-    set id [$mktagtop.sha1 get]
-    set tag [$mktagtop.tag get]
-    set msg [$mktagtop.msg get]
-    if {$tag == {}} {
-	error_popup [mc "No tag name specified"] $mktagtop
-	return 0
-    }
-    if {[info exists tagids($tag)]} {
-	error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
-	return 0
-    }
-    if {[catch {
-	if {$msg != {}} {
-	    exec git tag -a -m $msg $tag $id
-	} else {
-	    exec git tag $tag $id
-	}
-    } err]} {
-	error_popup "[mc "Error creating tag:"] $err" $mktagtop
-	return 0
-    }
-
-    set tagids($tag) $id
-    lappend idtags($id) $tag
-    redrawtags $id
-    addedtag $id
-    dispneartags 0
-    run refill_reflist
-    return 1
-}
-
-proc redrawtags {id} {
-    global canv linehtag idpos currentid curview cmitlisted markedid
-    global canvxmax iddrawn circleitem mainheadid circlecolors
-    global mainheadcirclecolor
-
-    if {![commitinview $id $curview]} return
-    if {![info exists iddrawn($id)]} return
-    set row [rowofcommit $id]
-    if {$id eq $mainheadid} {
-	set ofill $mainheadcirclecolor
-    } else {
-	set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
-    }
-    $canv itemconf $circleitem($row) -fill $ofill
-    $canv delete tag.$id
-    set xt [eval drawtags $id $idpos($id)]
-    $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
-    set text [$canv itemcget $linehtag($id) -text]
-    set font [$canv itemcget $linehtag($id) -font]
-    set xr [expr {$xt + [font measure $font $text]}]
-    if {$xr > $canvxmax} {
-	set canvxmax $xr
-	setcanvscroll
-    }
-    if {[info exists currentid] && $currentid == $id} {
-	make_secsel $id
-    }
-    if {[info exists markedid] && $markedid eq $id} {
-	make_idmark $id
-    }
-}
-
-proc mktagcan {} {
-    global mktagtop
-
-    catch {destroy $mktagtop}
-    unset mktagtop
-}
-
-proc mktaggo {} {
-    if {![domktag]} return
-    mktagcan
-}
-
-proc copysummary {} {
-    global rowmenuid autosellen
-
-    set format "%h (\"%s\", %ad)"
-    set cmd [list git show -s --pretty=format:$format --date=short]
-    if {$autosellen < 40} {
-        lappend cmd --abbrev=$autosellen
-    }
-    set summary [eval exec $cmd $rowmenuid]
-
-    clipboard clear
-    clipboard append $summary
-}
-
-proc writecommit {} {
-    global rowmenuid wrcomtop commitinfo wrcomcmd NS
-
-    set top .writecommit
-    set wrcomtop $top
-    catch {destroy $top}
-    ttk_toplevel $top
-    make_transient $top .
-    ${NS}::label $top.title -text [mc "Write commit to file"]
-    grid $top.title - -pady 10
-    ${NS}::label $top.id -text [mc "ID:"]
-    ${NS}::entry $top.sha1 -width 40
-    $top.sha1 insert 0 $rowmenuid
-    $top.sha1 conf -state readonly
-    grid $top.id $top.sha1 -sticky w
-    ${NS}::entry $top.head -width 60
-    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
-    $top.head conf -state readonly
-    grid x $top.head -sticky w
-    ${NS}::label $top.clab -text [mc "Command:"]
-    ${NS}::entry $top.cmd -width 60 -textvariable wrcomcmd
-    grid $top.clab $top.cmd -sticky w -pady 10
-    ${NS}::label $top.flab -text [mc "Output file:"]
-    ${NS}::entry $top.fname -width 60
-    $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
-    grid $top.flab $top.fname -sticky w
-    ${NS}::frame $top.buts
-    ${NS}::button $top.buts.gen -text [mc "Write"] -command wrcomgo
-    ${NS}::button $top.buts.can -text [mc "Cancel"] -command wrcomcan
-    bind $top <Key-Return> wrcomgo
-    bind $top <Key-Escape> wrcomcan
-    grid $top.buts.gen $top.buts.can
-    grid columnconfigure $top.buts 0 -weight 1 -uniform a
-    grid columnconfigure $top.buts 1 -weight 1 -uniform a
-    grid $top.buts - -pady 10 -sticky ew
-    focus $top.fname
-}
-
-proc wrcomgo {} {
-    global wrcomtop
-
-    set id [$wrcomtop.sha1 get]
-    set cmd "echo $id | [$wrcomtop.cmd get]"
-    set fname [$wrcomtop.fname get]
-    if {[catch {exec sh -c $cmd >$fname &} err]} {
-	error_popup "[mc "Error writing commit:"] $err" $wrcomtop
-    }
-    catch {destroy $wrcomtop}
-    unset wrcomtop
-}
-
-proc wrcomcan {} {
-    global wrcomtop
-
-    catch {destroy $wrcomtop}
-    unset wrcomtop
-}
-
-proc mkbranch {} {
-    global NS rowmenuid
-
-    set top .branchdialog
-
-    set val(name) ""
-    set val(id) $rowmenuid
-    set val(command) [list mkbrgo $top]
-
-    set ui(title) [mc "Create branch"]
-    set ui(accept) [mc "Create"]
-
-    branchdia $top val ui
-}
-
-proc mvbranch {} {
-    global NS
-    global headmenuid headmenuhead
-
-    set top .branchdialog
-
-    set val(name) $headmenuhead
-    set val(id) $headmenuid
-    set val(command) [list mvbrgo $top $headmenuhead]
-
-    set ui(title) [mc "Rename branch %s" $headmenuhead]
-    set ui(accept) [mc "Rename"]
-
-    branchdia $top val ui
-}
-
-proc branchdia {top valvar uivar} {
-    global NS commitinfo
-    upvar $valvar val $uivar ui
-
-    catch {destroy $top}
-    ttk_toplevel $top
-    make_transient $top .
-    ${NS}::label $top.title -text $ui(title)
-    grid $top.title - -pady 10
-    ${NS}::label $top.id -text [mc "ID:"]
-    ${NS}::entry $top.sha1 -width 40
-    $top.sha1 insert 0 $val(id)
-    $top.sha1 conf -state readonly
-    grid $top.id $top.sha1 -sticky w
-    ${NS}::entry $top.head -width 60
-    $top.head insert 0 [lindex $commitinfo($val(id)) 0]
-    $top.head conf -state readonly
-    grid x $top.head -sticky ew
-    grid columnconfigure $top 1 -weight 1
-    ${NS}::label $top.nlab -text [mc "Name:"]
-    ${NS}::entry $top.name -width 40
-    $top.name insert 0 $val(name)
-    grid $top.nlab $top.name -sticky w
-    ${NS}::frame $top.buts
-    ${NS}::button $top.buts.go -text $ui(accept) -command $val(command)
-    ${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
-    bind $top <Key-Return> $val(command)
-    bind $top <Key-Escape> "catch {destroy $top}"
-    grid $top.buts.go $top.buts.can
-    grid columnconfigure $top.buts 0 -weight 1 -uniform a
-    grid columnconfigure $top.buts 1 -weight 1 -uniform a
-    grid $top.buts - -pady 10 -sticky ew
-    focus $top.name
-}
-
-proc mkbrgo {top} {
-    global headids idheads
-
-    set name [$top.name get]
-    set id [$top.sha1 get]
-    set cmdargs {}
-    set old_id {}
-    if {$name eq {}} {
-	error_popup [mc "Please specify a name for the new branch"] $top
-	return
-    }
-    if {[info exists headids($name)]} {
-	if {![confirm_popup [mc \
-		"Branch '%s' already exists. Overwrite?" $name] $top]} {
-	    return
-	}
-	set old_id $headids($name)
-	lappend cmdargs -f
-    }
-    catch {destroy $top}
-    lappend cmdargs $name $id
-    nowbusy newbranch
-    update
-    if {[catch {
-	eval exec git branch $cmdargs
-    } err]} {
-	notbusy newbranch
-	error_popup $err
-    } else {
-	notbusy newbranch
-	if {$old_id ne {}} {
-	    movehead $id $name
-	    movedhead $id $name
-	    redrawtags $old_id
-	    redrawtags $id
-	} else {
-	    set headids($name) $id
-	    lappend idheads($id) $name
-	    addedhead $id $name
-	    redrawtags $id
-	}
-	dispneartags 0
-	run refill_reflist
-    }
-}
-
-proc mvbrgo {top prevname} {
-    global headids idheads mainhead mainheadid
-
-    set name [$top.name get]
-    set id [$top.sha1 get]
-    set cmdargs {}
-    if {$name eq $prevname} {
-	catch {destroy $top}
-	return
-    }
-    if {$name eq {}} {
-	error_popup [mc "Please specify a new name for the branch"] $top
-	return
-    }
-    catch {destroy $top}
-    lappend cmdargs -m $prevname $name
-    nowbusy renamebranch
-    update
-    if {[catch {
-	eval exec git branch $cmdargs
-    } err]} {
-	notbusy renamebranch
-	error_popup $err
-    } else {
-	notbusy renamebranch
-	removehead $id $prevname
-	removedhead $id $prevname
-	set headids($name) $id
-	lappend idheads($id) $name
-	addedhead $id $name
-	if {$prevname eq $mainhead} {
-	    set mainhead $name
-	    set mainheadid $id
-	}
-	redrawtags $id
-	dispneartags 0
-	run refill_reflist
-    }
-}
-
-proc exec_citool {tool_args {baseid {}}} {
-    global commitinfo env
-
-    set save_env [array get env GIT_AUTHOR_*]
-
-    if {$baseid ne {}} {
-	if {![info exists commitinfo($baseid)]} {
-	    getcommit $baseid
-	}
-	set author [lindex $commitinfo($baseid) 1]
-	set date [lindex $commitinfo($baseid) 2]
-	if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
-	            $author author name email]
-	    && $date ne {}} {
-	    set env(GIT_AUTHOR_NAME) $name
-	    set env(GIT_AUTHOR_EMAIL) $email
-	    set env(GIT_AUTHOR_DATE) $date
-	}
-    }
-
-    eval exec git citool $tool_args &
-
-    array unset env GIT_AUTHOR_*
-    array set env $save_env
-}
-
-proc cherrypick {} {
-    global rowmenuid curview
-    global mainhead mainheadid
-    global gitdir
-
-    set oldhead [exec git rev-parse HEAD]
-    set dheads [descheads $rowmenuid]
-    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
-	set ok [confirm_popup [mc "Commit %s is already\
-		included in branch %s -- really re-apply it?" \
-				   [string range $rowmenuid 0 7] $mainhead]]
-	if {!$ok} return
-    }
-    nowbusy cherrypick [mc "Cherry-picking"]
-    update
-    # Unfortunately git-cherry-pick writes stuff to stderr even when
-    # no error occurs, and exec takes that as an indication of error...
-    if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
-	notbusy cherrypick
-	if {[regexp -line \
-		 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
-		 $err msg fname]} {
-	    error_popup [mc "Cherry-pick failed because of local changes\
-			to file '%s'.\nPlease commit, reset or stash\
-			your changes and try again." $fname]
-	} elseif {[regexp -line \
-		       {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
-		       $err]} {
-	    if {[confirm_popup [mc "Cherry-pick failed because of merge\
-			conflict.\nDo you wish to run git citool to\
-			resolve it?"]]} {
-		# Force citool to read MERGE_MSG
-		file delete [file join $gitdir "GITGUI_MSG"]
-		exec_citool {} $rowmenuid
-	    }
-	} else {
-	    error_popup $err
-	}
-	run updatecommits
-	return
-    }
-    set newhead [exec git rev-parse HEAD]
-    if {$newhead eq $oldhead} {
-	notbusy cherrypick
-	error_popup [mc "No changes committed"]
-	return
-    }
-    addnewchild $newhead $oldhead
-    if {[commitinview $oldhead $curview]} {
-	# XXX this isn't right if we have a path limit...
-	insertrow $newhead $oldhead $curview
-	if {$mainhead ne {}} {
-	    movehead $newhead $mainhead
-	    movedhead $newhead $mainhead
-	}
-	set mainheadid $newhead
-	redrawtags $oldhead
-	redrawtags $newhead
-	selbyid $newhead
-    }
-    notbusy cherrypick
-}
-
-proc revert {} {
-    global rowmenuid curview
-    global mainhead mainheadid
-    global gitdir
-
-    set oldhead [exec git rev-parse HEAD]
-    set dheads [descheads $rowmenuid]
-    if { $dheads eq {} || [lsearch -exact $dheads $oldhead] == -1 } {
-       set ok [confirm_popup [mc "Commit %s is not\
-           included in branch %s -- really revert it?" \
-                      [string range $rowmenuid 0 7] $mainhead]]
-       if {!$ok} return
-    }
-    nowbusy revert [mc "Reverting"]
-    update
-
-    if [catch {exec git revert --no-edit $rowmenuid} err] {
-        notbusy revert
-        if [regexp {files would be overwritten by merge:(\n(( |\t)+[^\n]+\n)+)}\
-                $err match files] {
-            regsub {\n( |\t)+} $files "\n" files
-            error_popup [mc "Revert failed because of local changes to\
-                the following files:%s Please commit, reset or stash \
-                your changes and try again." $files]
-        } elseif [regexp {error: could not revert} $err] {
-            if [confirm_popup [mc "Revert failed because of merge conflict.\n\
-                Do you wish to run git citool to resolve it?"]] {
-                # Force citool to read MERGE_MSG
-                file delete [file join $gitdir "GITGUI_MSG"]
-                exec_citool {} $rowmenuid
-            }
-        } else { error_popup $err }
-        run updatecommits
-        return
-    }
-
-    set newhead [exec git rev-parse HEAD]
-    if { $newhead eq $oldhead } {
-        notbusy revert
-        error_popup [mc "No changes committed"]
-        return
-    }
-
-    addnewchild $newhead $oldhead
-
-    if [commitinview $oldhead $curview] {
-        # XXX this isn't right if we have a path limit...
-        insertrow $newhead $oldhead $curview
-        if {$mainhead ne {}} {
-            movehead $newhead $mainhead
-            movedhead $newhead $mainhead
-        }
-        set mainheadid $newhead
-        redrawtags $oldhead
-        redrawtags $newhead
-        selbyid $newhead
-    }
-
-    notbusy revert
-}
-
-proc resethead {} {
-    global mainhead rowmenuid confirm_ok resettype NS
-
-    set confirm_ok 0
-    set w ".confirmreset"
-    ttk_toplevel $w
-    make_transient $w .
-    wm title $w [mc "Confirm reset"]
-    ${NS}::label $w.m -text \
-	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
-    pack $w.m -side top -fill x -padx 20 -pady 20
-    ${NS}::labelframe $w.f -text [mc "Reset type:"]
-    set resettype mixed
-    ${NS}::radiobutton $w.f.soft -value soft -variable resettype \
-	-text [mc "Soft: Leave working tree and index untouched"]
-    grid $w.f.soft -sticky w
-    ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \
-	-text [mc "Mixed: Leave working tree untouched, reset index"]
-    grid $w.f.mixed -sticky w
-    ${NS}::radiobutton $w.f.hard -value hard -variable resettype \
-	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
-    grid $w.f.hard -sticky w
-    pack $w.f -side top -fill x -padx 4
-    ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
-    pack $w.ok -side left -fill x -padx 20 -pady 20
-    ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w"
-    bind $w <Key-Escape> [list destroy $w]
-    pack $w.cancel -side right -fill x -padx 20 -pady 20
-    bind $w <Visibility> "grab $w; focus $w"
-    tkwait window $w
-    if {!$confirm_ok} return
-    if {[catch {set fd [open \
-	    [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
-	error_popup $err
-    } else {
-	dohidelocalchanges
-	filerun $fd [list readresetstat $fd]
-	nowbusy reset [mc "Resetting"]
-	selbyid $rowmenuid
-    }
-}
-
-proc readresetstat {fd} {
-    global mainhead mainheadid showlocalchanges rprogcoord
-
-    if {[gets $fd line] >= 0} {
-	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
-	    set rprogcoord [expr {1.0 * $m / $n}]
-	    adjustprogress
-	}
-	return 1
-    }
-    set rprogcoord 0
-    adjustprogress
-    notbusy reset
-    if {[catch {close $fd} err]} {
-	error_popup $err
-    }
-    set oldhead $mainheadid
-    set newhead [exec git rev-parse HEAD]
-    if {$newhead ne $oldhead} {
-	movehead $newhead $mainhead
-	movedhead $newhead $mainhead
-	set mainheadid $newhead
-	redrawtags $oldhead
-	redrawtags $newhead
-    }
-    if {$showlocalchanges} {
-	doshowlocalchanges
-    }
-    return 0
-}
-
-# context menu for a head
-proc headmenu {x y id head} {
-    global headmenuid headmenuhead headctxmenu mainhead headids
-
-    stopfinding
-    set headmenuid $id
-    set headmenuhead $head
-    array set state {0 normal 1 normal 2 normal}
-    if {[string match "remotes/*" $head]} {
-	set localhead [string range $head [expr [string last / $head] + 1] end]
-	if {[info exists headids($localhead)]} {
-	    set state(0) disabled
-	}
-	array set state {1 disabled 2 disabled}
-    }
-    if {$head eq $mainhead} {
-	array set state {0 disabled 2 disabled}
-    }
-    foreach i {0 1 2} {
-	$headctxmenu entryconfigure $i -state $state($i)
-    }
-    tk_popup $headctxmenu $x $y
-}
-
-proc cobranch {} {
-    global headmenuid headmenuhead headids
-    global showlocalchanges
-
-    # check the tree is clean first??
-    set newhead $headmenuhead
-    set command [list | git checkout]
-    if {[string match "remotes/*" $newhead]} {
-	set remote $newhead
-	set newhead [string range $newhead [expr [string last / $newhead] + 1] end]
-	# The following check is redundant - the menu option should
-	# be disabled to begin with...
-	if {[info exists headids($newhead)]} {
-	    error_popup [mc "A local branch named %s exists already" $newhead]
-	    return
-	}
-	lappend command -b $newhead --track $remote
-    } else {
-	lappend command $newhead
-    }
-    lappend command 2>@1
-    nowbusy checkout [mc "Checking out"]
-    update
-    dohidelocalchanges
-    if {[catch {
-	set fd [open $command r]
-    } err]} {
-	notbusy checkout
-	error_popup $err
-	if {$showlocalchanges} {
-	    dodiffindex
-	}
-    } else {
-	filerun $fd [list readcheckoutstat $fd $newhead $headmenuid]
-    }
-}
-
-proc readcheckoutstat {fd newhead newheadid} {
-    global mainhead mainheadid headids idheads showlocalchanges progresscoords
-    global viewmainheadid curview
-
-    if {[gets $fd line] >= 0} {
-	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
-	    set progresscoords [list 0 [expr {1.0 * $m / $n}]]
-	    adjustprogress
-	}
-	return 1
-    }
-    set progresscoords {0 0}
-    adjustprogress
-    notbusy checkout
-    if {[catch {close $fd} err]} {
-	error_popup $err
-	return
-    }
-    set oldmainid $mainheadid
-    if {! [info exists headids($newhead)]} {
-	set headids($newhead) $newheadid
-	lappend idheads($newheadid) $newhead
-	addedhead $newheadid $newhead
-    }
-    set mainhead $newhead
-    set mainheadid $newheadid
-    set viewmainheadid($curview) $newheadid
-    redrawtags $oldmainid
-    redrawtags $newheadid
-    selbyid $newheadid
-    if {$showlocalchanges} {
-	dodiffindex
-    }
-}
-
-proc rmbranch {} {
-    global headmenuid headmenuhead mainhead
-    global idheads
-
-    set head $headmenuhead
-    set id $headmenuid
-    # this check shouldn't be needed any more...
-    if {$head eq $mainhead} {
-	error_popup [mc "Cannot delete the currently checked-out branch"]
-	return
-    }
-    set dheads [descheads $id]
-    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
-	# the stuff on this branch isn't on any other branch
-	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
-			branch.\nReally delete branch %s?" $head $head]]} return
-    }
-    nowbusy rmbranch
-    update
-    if {[catch {exec git branch -D $head} err]} {
-	notbusy rmbranch
-	error_popup $err
-	return
-    }
-    removehead $id $head
-    removedhead $id $head
-    redrawtags $id
-    notbusy rmbranch
-    dispneartags 0
-    run refill_reflist
-}
-
-# Display a list of tags and heads
-proc showrefs {} {
-    global showrefstop bgcolor fgcolor selectbgcolor NS
-    global bglist fglist reflistfilter reflist maincursor
-
-    set top .showrefs
-    set showrefstop $top
-    if {[winfo exists $top]} {
-	raise $top
-	refill_reflist
-	return
-    }
-    ttk_toplevel $top
-    wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
-    make_transient $top .
-    text $top.list -background $bgcolor -foreground $fgcolor \
-	-selectbackground $selectbgcolor -font mainfont \
-	-xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
-	-width 30 -height 20 -cursor $maincursor \
-	-spacing1 1 -spacing3 1 -state disabled
-    $top.list tag configure highlight -background $selectbgcolor
-    if {![lsearch -exact $bglist $top.list]} {
-	lappend bglist $top.list
-	lappend fglist $top.list
-    }
-    ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
-    ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
-    grid $top.list $top.ysb -sticky nsew
-    grid $top.xsb x -sticky ew
-    ${NS}::frame $top.f
-    ${NS}::label $top.f.l -text "[mc "Filter"]: "
-    ${NS}::entry $top.f.e -width 20 -textvariable reflistfilter
-    set reflistfilter "*"
-    trace add variable reflistfilter write reflistfilter_change
-    pack $top.f.e -side right -fill x -expand 1
-    pack $top.f.l -side left
-    grid $top.f - -sticky ew -pady 2
-    ${NS}::button $top.close -command [list destroy $top] -text [mc "Close"]
-    bind $top <Key-Escape> [list destroy $top]
-    grid $top.close -
-    grid columnconfigure $top 0 -weight 1
-    grid rowconfigure $top 0 -weight 1
-    bind $top.list <1> {break}
-    bind $top.list <B1-Motion> {break}
-    bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
-    set reflist {}
-    refill_reflist
-}
-
-proc sel_reflist {w x y} {
-    global showrefstop reflist headids tagids otherrefids
-
-    if {![winfo exists $showrefstop]} return
-    set l [lindex [split [$w index "@$x,$y"] "."] 0]
-    set ref [lindex $reflist [expr {$l-1}]]
-    set n [lindex $ref 0]
-    switch -- [lindex $ref 1] {
-	"H" {selbyid $headids($n)}
-	"T" {selbyid $tagids($n)}
-	"o" {selbyid $otherrefids($n)}
-    }
-    $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
-}
-
-proc unsel_reflist {} {
-    global showrefstop
-
-    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
-    $showrefstop.list tag remove highlight 0.0 end
-}
-
-proc reflistfilter_change {n1 n2 op} {
-    global reflistfilter
-
-    after cancel refill_reflist
-    after 200 refill_reflist
-}
-
-proc refill_reflist {} {
-    global reflist reflistfilter showrefstop headids tagids otherrefids
-    global curview
-
-    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
-    set refs {}
-    foreach n [array names headids] {
-	if {[string match $reflistfilter $n]} {
-	    if {[commitinview $headids($n) $curview]} {
-		lappend refs [list $n H]
-	    } else {
-		interestedin $headids($n) {run refill_reflist}
-	    }
-	}
-    }
-    foreach n [array names tagids] {
-	if {[string match $reflistfilter $n]} {
-	    if {[commitinview $tagids($n) $curview]} {
-		lappend refs [list $n T]
-	    } else {
-		interestedin $tagids($n) {run refill_reflist}
-	    }
-	}
-    }
-    foreach n [array names otherrefids] {
-	if {[string match $reflistfilter $n]} {
-	    if {[commitinview $otherrefids($n) $curview]} {
-		lappend refs [list $n o]
-	    } else {
-		interestedin $otherrefids($n) {run refill_reflist}
-	    }
-	}
-    }
-    set refs [lsort -index 0 $refs]
-    if {$refs eq $reflist} return
-
-    # Update the contents of $showrefstop.list according to the
-    # differences between $reflist (old) and $refs (new)
-    $showrefstop.list conf -state normal
-    $showrefstop.list insert end "\n"
-    set i 0
-    set j 0
-    while {$i < [llength $reflist] || $j < [llength $refs]} {
-	if {$i < [llength $reflist]} {
-	    if {$j < [llength $refs]} {
-		set cmp [string compare [lindex $reflist $i 0] \
-			     [lindex $refs $j 0]]
-		if {$cmp == 0} {
-		    set cmp [string compare [lindex $reflist $i 1] \
-				 [lindex $refs $j 1]]
-		}
-	    } else {
-		set cmp -1
-	    }
-	} else {
-	    set cmp 1
-	}
-	switch -- $cmp {
-	    -1 {
-		$showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
-		incr i
-	    }
-	    0 {
-		incr i
-		incr j
-	    }
-	    1 {
-		set l [expr {$j + 1}]
-		$showrefstop.list image create $l.0 -align baseline \
-		    -image reficon-[lindex $refs $j 1] -padx 2
-		$showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
-		incr j
-	    }
-	}
-    }
-    set reflist $refs
-    # delete last newline
-    $showrefstop.list delete end-2c end-1c
-    $showrefstop.list conf -state disabled
-}
-
-# Stuff for finding nearby tags
-proc getallcommits {} {
-    global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
-    global idheads idtags idotherrefs allparents tagobjid
-    global gitdir
-
-    if {![info exists allcommits]} {
-	set nextarc 0
-	set allcommits 0
-	set seeds {}
-	set allcwait 0
-	set cachedarcs 0
-	set allccache [file join $gitdir "gitk.cache"]
-	if {![catch {
-	    set f [open $allccache r]
-	    set allcwait 1
-	    getcache $f
-	}]} return
-    }
-
-    if {$allcwait} {
-	return
-    }
-    set cmd [list | git rev-list --parents]
-    set allcupdate [expr {$seeds ne {}}]
-    if {!$allcupdate} {
-	set ids "--all"
-    } else {
-	set refs [concat [array names idheads] [array names idtags] \
-		      [array names idotherrefs]]
-	set ids {}
-	set tagobjs {}
-	foreach name [array names tagobjid] {
-	    lappend tagobjs $tagobjid($name)
-	}
-	foreach id [lsort -unique $refs] {
-	    if {![info exists allparents($id)] &&
-		[lsearch -exact $tagobjs $id] < 0} {
-		lappend ids $id
-	    }
-	}
-	if {$ids ne {}} {
-	    foreach id $seeds {
-		lappend ids "^$id"
-	    }
-	}
-    }
-    if {$ids ne {}} {
-	set fd [open [concat $cmd $ids] r]
-	fconfigure $fd -blocking 0
-	incr allcommits
-	nowbusy allcommits
-	filerun $fd [list getallclines $fd]
-    } else {
-	dispneartags 0
-    }
-}
-
-# Since most commits have 1 parent and 1 child, we group strings of
-# such commits into "arcs" joining branch/merge points (BMPs), which
-# are commits that either don't have 1 parent or don't have 1 child.
-#
-# arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
-# arcout(id) - outgoing arcs for BMP
-# arcids(a) - list of IDs on arc including end but not start
-# arcstart(a) - BMP ID at start of arc
-# arcend(a) - BMP ID at end of arc
-# growing(a) - arc a is still growing
-# arctags(a) - IDs out of arcids (excluding end) that have tags
-# archeads(a) - IDs out of arcids (excluding end) that have heads
-# The start of an arc is at the descendent end, so "incoming" means
-# coming from descendents, and "outgoing" means going towards ancestors.
-
-proc getallclines {fd} {
-    global allparents allchildren idtags idheads nextarc
-    global arcnos arcids arctags arcout arcend arcstart archeads growing
-    global seeds allcommits cachedarcs allcupdate
-
-    set nid 0
-    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
-	set id [lindex $line 0]
-	if {[info exists allparents($id)]} {
-	    # seen it already
-	    continue
-	}
-	set cachedarcs 0
-	set olds [lrange $line 1 end]
-	set allparents($id) $olds
-	if {![info exists allchildren($id)]} {
-	    set allchildren($id) {}
-	    set arcnos($id) {}
-	    lappend seeds $id
-	} else {
-	    set a $arcnos($id)
-	    if {[llength $olds] == 1 && [llength $a] == 1} {
-		lappend arcids($a) $id
-		if {[info exists idtags($id)]} {
-		    lappend arctags($a) $id
-		}
-		if {[info exists idheads($id)]} {
-		    lappend archeads($a) $id
-		}
-		if {[info exists allparents($olds)]} {
-		    # seen parent already
-		    if {![info exists arcout($olds)]} {
-			splitarc $olds
-		    }
-		    lappend arcids($a) $olds
-		    set arcend($a) $olds
-		    unset growing($a)
-		}
-		lappend allchildren($olds) $id
-		lappend arcnos($olds) $a
-		continue
-	    }
-	}
-	foreach a $arcnos($id) {
-	    lappend arcids($a) $id
-	    set arcend($a) $id
-	    unset growing($a)
-	}
-
-	set ao {}
-	foreach p $olds {
-	    lappend allchildren($p) $id
-	    set a [incr nextarc]
-	    set arcstart($a) $id
-	    set archeads($a) {}
-	    set arctags($a) {}
-	    set archeads($a) {}
-	    set arcids($a) {}
-	    lappend ao $a
-	    set growing($a) 1
-	    if {[info exists allparents($p)]} {
-		# seen it already, may need to make a new branch
-		if {![info exists arcout($p)]} {
-		    splitarc $p
-		}
-		lappend arcids($a) $p
-		set arcend($a) $p
-		unset growing($a)
-	    }
-	    lappend arcnos($p) $a
-	}
-	set arcout($id) $ao
-    }
-    if {$nid > 0} {
-	global cached_dheads cached_dtags cached_atags
-	unset -nocomplain cached_dheads
-	unset -nocomplain cached_dtags
-	unset -nocomplain cached_atags
-    }
-    if {![eof $fd]} {
-	return [expr {$nid >= 1000? 2: 1}]
-    }
-    set cacheok 1
-    if {[catch {
-	fconfigure $fd -blocking 1
-	close $fd
-    } err]} {
-	# got an error reading the list of commits
-	# if we were updating, try rereading the whole thing again
-	if {$allcupdate} {
-	    incr allcommits -1
-	    dropcache $err
-	    return
-	}
-	error_popup "[mc "Error reading commit topology information;\
-		branch and preceding/following tag information\
-	        will be incomplete."]\n($err)"
-	set cacheok 0
-    }
-    if {[incr allcommits -1] == 0} {
-	notbusy allcommits
-	if {$cacheok} {
-	    run savecache
-	}
-    }
-    dispneartags 0
-    return 0
-}
-
-proc recalcarc {a} {
-    global arctags archeads arcids idtags idheads
-
-    set at {}
-    set ah {}
-    foreach id [lrange $arcids($a) 0 end-1] {
-	if {[info exists idtags($id)]} {
-	    lappend at $id
-	}
-	if {[info exists idheads($id)]} {
-	    lappend ah $id
-	}
-    }
-    set arctags($a) $at
-    set archeads($a) $ah
-}
-
-proc splitarc {p} {
-    global arcnos arcids nextarc arctags archeads idtags idheads
-    global arcstart arcend arcout allparents growing
-
-    set a $arcnos($p)
-    if {[llength $a] != 1} {
-	puts "oops splitarc called but [llength $a] arcs already"
-	return
-    }
-    set a [lindex $a 0]
-    set i [lsearch -exact $arcids($a) $p]
-    if {$i < 0} {
-	puts "oops splitarc $p not in arc $a"
-	return
-    }
-    set na [incr nextarc]
-    if {[info exists arcend($a)]} {
-	set arcend($na) $arcend($a)
-    } else {
-	set l [lindex $allparents([lindex $arcids($a) end]) 0]
-	set j [lsearch -exact $arcnos($l) $a]
-	set arcnos($l) [lreplace $arcnos($l) $j $j $na]
-    }
-    set tail [lrange $arcids($a) [expr {$i+1}] end]
-    set arcids($a) [lrange $arcids($a) 0 $i]
-    set arcend($a) $p
-    set arcstart($na) $p
-    set arcout($p) $na
-    set arcids($na) $tail
-    if {[info exists growing($a)]} {
-	set growing($na) 1
-	unset growing($a)
-    }
-
-    foreach id $tail {
-	if {[llength $arcnos($id)] == 1} {
-	    set arcnos($id) $na
-	} else {
-	    set j [lsearch -exact $arcnos($id) $a]
-	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
-	}
-    }
-
-    # reconstruct tags and heads lists
-    if {$arctags($a) ne {} || $archeads($a) ne {}} {
-	recalcarc $a
-	recalcarc $na
-    } else {
-	set arctags($na) {}
-	set archeads($na) {}
-    }
-}
-
-# Update things for a new commit added that is a child of one
-# existing commit.  Used when cherry-picking.
-proc addnewchild {id p} {
-    global allparents allchildren idtags nextarc
-    global arcnos arcids arctags arcout arcend arcstart archeads growing
-    global seeds allcommits
-
-    if {![info exists allcommits] || ![info exists arcnos($p)]} return
-    set allparents($id) [list $p]
-    set allchildren($id) {}
-    set arcnos($id) {}
-    lappend seeds $id
-    lappend allchildren($p) $id
-    set a [incr nextarc]
-    set arcstart($a) $id
-    set archeads($a) {}
-    set arctags($a) {}
-    set arcids($a) [list $p]
-    set arcend($a) $p
-    if {![info exists arcout($p)]} {
-	splitarc $p
-    }
-    lappend arcnos($p) $a
-    set arcout($id) [list $a]
-}
-
-# This implements a cache for the topology information.
-# The cache saves, for each arc, the start and end of the arc,
-# the ids on the arc, and the outgoing arcs from the end.
-proc readcache {f} {
-    global arcnos arcids arcout arcstart arcend arctags archeads nextarc
-    global idtags idheads allparents cachedarcs possible_seeds seeds growing
-    global allcwait
-
-    set a $nextarc
-    set lim $cachedarcs
-    if {$lim - $a > 500} {
-	set lim [expr {$a + 500}]
-    }
-    if {[catch {
-	if {$a == $lim} {
-	    # finish reading the cache and setting up arctags, etc.
-	    set line [gets $f]
-	    if {$line ne "1"} {error "bad final version"}
-	    close $f
-	    foreach id [array names idtags] {
-		if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
-		    [llength $allparents($id)] == 1} {
-		    set a [lindex $arcnos($id) 0]
-		    if {$arctags($a) eq {}} {
-			recalcarc $a
-		    }
-		}
-	    }
-	    foreach id [array names idheads] {
-		if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
-		    [llength $allparents($id)] == 1} {
-		    set a [lindex $arcnos($id) 0]
-		    if {$archeads($a) eq {}} {
-			recalcarc $a
-		    }
-		}
-	    }
-	    foreach id [lsort -unique $possible_seeds] {
-		if {$arcnos($id) eq {}} {
-		    lappend seeds $id
-		}
-	    }
-	    set allcwait 0
-	} else {
-	    while {[incr a] <= $lim} {
-		set line [gets $f]
-		if {[llength $line] != 3} {error "bad line"}
-		set s [lindex $line 0]
-		set arcstart($a) $s
-		lappend arcout($s) $a
-		if {![info exists arcnos($s)]} {
-		    lappend possible_seeds $s
-		    set arcnos($s) {}
-		}
-		set e [lindex $line 1]
-		if {$e eq {}} {
-		    set growing($a) 1
-		} else {
-		    set arcend($a) $e
-		    if {![info exists arcout($e)]} {
-			set arcout($e) {}
-		    }
-		}
-		set arcids($a) [lindex $line 2]
-		foreach id $arcids($a) {
-		    lappend allparents($s) $id
-		    set s $id
-		    lappend arcnos($id) $a
-		}
-		if {![info exists allparents($s)]} {
-		    set allparents($s) {}
-		}
-		set arctags($a) {}
-		set archeads($a) {}
-	    }
-	    set nextarc [expr {$a - 1}]
-	}
-    } err]} {
-	dropcache $err
-	return 0
-    }
-    if {!$allcwait} {
-	getallcommits
-    }
-    return $allcwait
-}
-
-proc getcache {f} {
-    global nextarc cachedarcs possible_seeds
-
-    if {[catch {
-	set line [gets $f]
-	if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
-	# make sure it's an integer
-	set cachedarcs [expr {int([lindex $line 1])}]
-	if {$cachedarcs < 0} {error "bad number of arcs"}
-	set nextarc 0
-	set possible_seeds {}
-	run readcache $f
-    } err]} {
-	dropcache $err
-    }
-    return 0
-}
-
-proc dropcache {err} {
-    global allcwait nextarc cachedarcs seeds
-
-    #puts "dropping cache ($err)"
-    foreach v {arcnos arcout arcids arcstart arcend growing \
-		   arctags archeads allparents allchildren} {
-	global $v
-	unset -nocomplain $v
-    }
-    set allcwait 0
-    set nextarc 0
-    set cachedarcs 0
-    set seeds {}
-    getallcommits
-}
-
-proc writecache {f} {
-    global cachearc cachedarcs allccache
-    global arcstart arcend arcnos arcids arcout
-
-    set a $cachearc
-    set lim $cachedarcs
-    if {$lim - $a > 1000} {
-	set lim [expr {$a + 1000}]
-    }
-    if {[catch {
-	while {[incr a] <= $lim} {
-	    if {[info exists arcend($a)]} {
-		puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
-	    } else {
-		puts $f [list $arcstart($a) {} $arcids($a)]
-	    }
-	}
-    } err]} {
-	catch {close $f}
-	catch {file delete $allccache}
-	#puts "writing cache failed ($err)"
-	return 0
-    }
-    set cachearc [expr {$a - 1}]
-    if {$a > $cachedarcs} {
-	puts $f "1"
-	close $f
-	return 0
-    }
-    return 1
-}
-
-proc savecache {} {
-    global nextarc cachedarcs cachearc allccache
-
-    if {$nextarc == $cachedarcs} return
-    set cachearc 0
-    set cachedarcs $nextarc
-    catch {
-	set f [open $allccache w]
-	puts $f [list 1 $cachedarcs]
-	run writecache $f
-    }
-}
-
-# Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
-# or 0 if neither is true.
-proc anc_or_desc {a b} {
-    global arcout arcstart arcend arcnos cached_isanc
-
-    if {$arcnos($a) eq $arcnos($b)} {
-	# Both are on the same arc(s); either both are the same BMP,
-	# or if one is not a BMP, the other is also not a BMP or is
-	# the BMP at end of the arc (and it only has 1 incoming arc).
-	# Or both can be BMPs with no incoming arcs.
-	if {$a eq $b || $arcnos($a) eq {}} {
-	    return 0
-	}
-	# assert {[llength $arcnos($a)] == 1}
-	set arc [lindex $arcnos($a) 0]
-	set i [lsearch -exact $arcids($arc) $a]
-	set j [lsearch -exact $arcids($arc) $b]
-	if {$i < 0 || $i > $j} {
-	    return 1
-	} else {
-	    return -1
-	}
-    }
-
-    if {![info exists arcout($a)]} {
-	set arc [lindex $arcnos($a) 0]
-	if {[info exists arcend($arc)]} {
-	    set aend $arcend($arc)
-	} else {
-	    set aend {}
-	}
-	set a $arcstart($arc)
-    } else {
-	set aend $a
-    }
-    if {![info exists arcout($b)]} {
-	set arc [lindex $arcnos($b) 0]
-	if {[info exists arcend($arc)]} {
-	    set bend $arcend($arc)
-	} else {
-	    set bend {}
-	}
-	set b $arcstart($arc)
-    } else {
-	set bend $b
-    }
-    if {$a eq $bend} {
-	return 1
-    }
-    if {$b eq $aend} {
-	return -1
-    }
-    if {[info exists cached_isanc($a,$bend)]} {
-	if {$cached_isanc($a,$bend)} {
-	    return 1
-	}
-    }
-    if {[info exists cached_isanc($b,$aend)]} {
-	if {$cached_isanc($b,$aend)} {
-	    return -1
-	}
-	if {[info exists cached_isanc($a,$bend)]} {
-	    return 0
-	}
-    }
-
-    set todo [list $a $b]
-    set anc($a) a
-    set anc($b) b
-    for {set i 0} {$i < [llength $todo]} {incr i} {
-	set x [lindex $todo $i]
-	if {$anc($x) eq {}} {
-	    continue
-	}
-	foreach arc $arcnos($x) {
-	    set xd $arcstart($arc)
-	    if {$xd eq $bend} {
-		set cached_isanc($a,$bend) 1
-		set cached_isanc($b,$aend) 0
-		return 1
-	    } elseif {$xd eq $aend} {
-		set cached_isanc($b,$aend) 1
-		set cached_isanc($a,$bend) 0
-		return -1
-	    }
-	    if {![info exists anc($xd)]} {
-		set anc($xd) $anc($x)
-		lappend todo $xd
-	    } elseif {$anc($xd) ne $anc($x)} {
-		set anc($xd) {}
-	    }
-	}
-    }
-    set cached_isanc($a,$bend) 0
-    set cached_isanc($b,$aend) 0
-    return 0
-}
-
-# This identifies whether $desc has an ancestor that is
-# a growing tip of the graph and which is not an ancestor of $anc
-# and returns 0 if so and 1 if not.
-# If we subsequently discover a tag on such a growing tip, and that
-# turns out to be a descendent of $anc (which it could, since we
-# don't necessarily see children before parents), then $desc
-# isn't a good choice to display as a descendent tag of
-# $anc (since it is the descendent of another tag which is
-# a descendent of $anc).  Similarly, $anc isn't a good choice to
-# display as a ancestor tag of $desc.
-#
-proc is_certain {desc anc} {
-    global arcnos arcout arcstart arcend growing problems
-
-    set certain {}
-    if {[llength $arcnos($anc)] == 1} {
-	# tags on the same arc are certain
-	if {$arcnos($desc) eq $arcnos($anc)} {
-	    return 1
-	}
-	if {![info exists arcout($anc)]} {
-	    # if $anc is partway along an arc, use the start of the arc instead
-	    set a [lindex $arcnos($anc) 0]
-	    set anc $arcstart($a)
-	}
-    }
-    if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
-	set x $desc
-    } else {
-	set a [lindex $arcnos($desc) 0]
-	set x $arcend($a)
-    }
-    if {$x == $anc} {
-	return 1
-    }
-    set anclist [list $x]
-    set dl($x) 1
-    set nnh 1
-    set ngrowanc 0
-    for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
-	set x [lindex $anclist $i]
-	if {$dl($x)} {
-	    incr nnh -1
-	}
-	set done($x) 1
-	foreach a $arcout($x) {
-	    if {[info exists growing($a)]} {
-		if {![info exists growanc($x)] && $dl($x)} {
-		    set growanc($x) 1
-		    incr ngrowanc
-		}
-	    } else {
-		set y $arcend($a)
-		if {[info exists dl($y)]} {
-		    if {$dl($y)} {
-			if {!$dl($x)} {
-			    set dl($y) 0
-			    if {![info exists done($y)]} {
-				incr nnh -1
-			    }
-			    if {[info exists growanc($x)]} {
-				incr ngrowanc -1
-			    }
-			    set xl [list $y]
-			    for {set k 0} {$k < [llength $xl]} {incr k} {
-				set z [lindex $xl $k]
-				foreach c $arcout($z) {
-				    if {[info exists arcend($c)]} {
-					set v $arcend($c)
-					if {[info exists dl($v)] && $dl($v)} {
-					    set dl($v) 0
-					    if {![info exists done($v)]} {
-						incr nnh -1
-					    }
-					    if {[info exists growanc($v)]} {
-						incr ngrowanc -1
-					    }
-					    lappend xl $v
-					}
-				    }
-				}
-			    }
-			}
-		    }
-		} elseif {$y eq $anc || !$dl($x)} {
-		    set dl($y) 0
-		    lappend anclist $y
-		} else {
-		    set dl($y) 1
-		    lappend anclist $y
-		    incr nnh
-		}
-	    }
-	}
-    }
-    foreach x [array names growanc] {
-	if {$dl($x)} {
-	    return 0
-	}
-	return 0
-    }
-    return 1
-}
-
-proc validate_arctags {a} {
-    global arctags idtags
-
-    set i -1
-    set na $arctags($a)
-    foreach id $arctags($a) {
-	incr i
-	if {![info exists idtags($id)]} {
-	    set na [lreplace $na $i $i]
-	    incr i -1
-	}
-    }
-    set arctags($a) $na
-}
-
-proc validate_archeads {a} {
-    global archeads idheads
-
-    set i -1
-    set na $archeads($a)
-    foreach id $archeads($a) {
-	incr i
-	if {![info exists idheads($id)]} {
-	    set na [lreplace $na $i $i]
-	    incr i -1
-	}
-    }
-    set archeads($a) $na
-}
-
-# Return the list of IDs that have tags that are descendents of id,
-# ignoring IDs that are descendents of IDs already reported.
-proc desctags {id} {
-    global arcnos arcstart arcids arctags idtags allparents
-    global growing cached_dtags
-
-    if {![info exists allparents($id)]} {
-	return {}
-    }
-    set t1 [clock clicks -milliseconds]
-    set argid $id
-    if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
-	# part-way along an arc; check that arc first
-	set a [lindex $arcnos($id) 0]
-	if {$arctags($a) ne {}} {
-	    validate_arctags $a
-	    set i [lsearch -exact $arcids($a) $id]
-	    set tid {}
-	    foreach t $arctags($a) {
-		set j [lsearch -exact $arcids($a) $t]
-		if {$j >= $i} break
-		set tid $t
-	    }
-	    if {$tid ne {}} {
-		return $tid
-	    }
-	}
-	set id $arcstart($a)
-	if {[info exists idtags($id)]} {
-	    return $id
-	}
-    }
-    if {[info exists cached_dtags($id)]} {
-	return $cached_dtags($id)
-    }
-
-    set origid $id
-    set todo [list $id]
-    set queued($id) 1
-    set nc 1
-    for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
-	set id [lindex $todo $i]
-	set done($id) 1
-	set ta [info exists hastaggedancestor($id)]
-	if {!$ta} {
-	    incr nc -1
-	}
-	# ignore tags on starting node
-	if {!$ta && $i > 0} {
-	    if {[info exists idtags($id)]} {
-		set tagloc($id) $id
-		set ta 1
-	    } elseif {[info exists cached_dtags($id)]} {
-		set tagloc($id) $cached_dtags($id)
-		set ta 1
-	    }
-	}
-	foreach a $arcnos($id) {
-	    set d $arcstart($a)
-	    if {!$ta && $arctags($a) ne {}} {
-		validate_arctags $a
-		if {$arctags($a) ne {}} {
-		    lappend tagloc($id) [lindex $arctags($a) end]
-		}
-	    }
-	    if {$ta || $arctags($a) ne {}} {
-		set tomark [list $d]
-		for {set j 0} {$j < [llength $tomark]} {incr j} {
-		    set dd [lindex $tomark $j]
-		    if {![info exists hastaggedancestor($dd)]} {
-			if {[info exists done($dd)]} {
-			    foreach b $arcnos($dd) {
-				lappend tomark $arcstart($b)
-			    }
-			    if {[info exists tagloc($dd)]} {
-				unset tagloc($dd)
-			    }
-			} elseif {[info exists queued($dd)]} {
-			    incr nc -1
-			}
-			set hastaggedancestor($dd) 1
-		    }
-		}
-	    }
-	    if {![info exists queued($d)]} {
-		lappend todo $d
-		set queued($d) 1
-		if {![info exists hastaggedancestor($d)]} {
-		    incr nc
-		}
-	    }
-	}
-    }
-    set tags {}
-    foreach id [array names tagloc] {
-	if {![info exists hastaggedancestor($id)]} {
-	    foreach t $tagloc($id) {
-		if {[lsearch -exact $tags $t] < 0} {
-		    lappend tags $t
-		}
-	    }
-	}
-    }
-    set t2 [clock clicks -milliseconds]
-    set loopix $i
-
-    # remove tags that are descendents of other tags
-    for {set i 0} {$i < [llength $tags]} {incr i} {
-	set a [lindex $tags $i]
-	for {set j 0} {$j < $i} {incr j} {
-	    set b [lindex $tags $j]
-	    set r [anc_or_desc $a $b]
-	    if {$r == 1} {
-		set tags [lreplace $tags $j $j]
-		incr j -1
-		incr i -1
-	    } elseif {$r == -1} {
-		set tags [lreplace $tags $i $i]
-		incr i -1
-		break
-	    }
-	}
-    }
-
-    if {[array names growing] ne {}} {
-	# graph isn't finished, need to check if any tag could get
-	# eclipsed by another tag coming later.  Simply ignore any
-	# tags that could later get eclipsed.
-	set ctags {}
-	foreach t $tags {
-	    if {[is_certain $t $origid]} {
-		lappend ctags $t
-	    }
-	}
-	if {$tags eq $ctags} {
-	    set cached_dtags($origid) $tags
-	} else {
-	    set tags $ctags
-	}
-    } else {
-	set cached_dtags($origid) $tags
-    }
-    set t3 [clock clicks -milliseconds]
-    if {0 && $t3 - $t1 >= 100} {
-	puts "iterating descendents ($loopix/[llength $todo] nodes) took\
-    	    [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
-    }
-    return $tags
-}
-
-proc anctags {id} {
-    global arcnos arcids arcout arcend arctags idtags allparents
-    global growing cached_atags
-
-    if {![info exists allparents($id)]} {
-	return {}
-    }
-    set t1 [clock clicks -milliseconds]
-    set argid $id
-    if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
-	# part-way along an arc; check that arc first
-	set a [lindex $arcnos($id) 0]
-	if {$arctags($a) ne {}} {
-	    validate_arctags $a
-	    set i [lsearch -exact $arcids($a) $id]
-	    foreach t $arctags($a) {
-		set j [lsearch -exact $arcids($a) $t]
-		if {$j > $i} {
-		    return $t
-		}
-	    }
-	}
-	if {![info exists arcend($a)]} {
-	    return {}
-	}
-	set id $arcend($a)
-	if {[info exists idtags($id)]} {
-	    return $id
-	}
-    }
-    if {[info exists cached_atags($id)]} {
-	return $cached_atags($id)
-    }
-
-    set origid $id
-    set todo [list $id]
-    set queued($id) 1
-    set taglist {}
-    set nc 1
-    for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
-	set id [lindex $todo $i]
-	set done($id) 1
-	set td [info exists hastaggeddescendent($id)]
-	if {!$td} {
-	    incr nc -1
-	}
-	# ignore tags on starting node
-	if {!$td && $i > 0} {
-	    if {[info exists idtags($id)]} {
-		set tagloc($id) $id
-		set td 1
-	    } elseif {[info exists cached_atags($id)]} {
-		set tagloc($id) $cached_atags($id)
-		set td 1
-	    }
-	}
-	foreach a $arcout($id) {
-	    if {!$td && $arctags($a) ne {}} {
-		validate_arctags $a
-		if {$arctags($a) ne {}} {
-		    lappend tagloc($id) [lindex $arctags($a) 0]
-		}
-	    }
-	    if {![info exists arcend($a)]} continue
-	    set d $arcend($a)
-	    if {$td || $arctags($a) ne {}} {
-		set tomark [list $d]
-		for {set j 0} {$j < [llength $tomark]} {incr j} {
-		    set dd [lindex $tomark $j]
-		    if {![info exists hastaggeddescendent($dd)]} {
-			if {[info exists done($dd)]} {
-			    foreach b $arcout($dd) {
-				if {[info exists arcend($b)]} {
-				    lappend tomark $arcend($b)
-				}
-			    }
-			    if {[info exists tagloc($dd)]} {
-				unset tagloc($dd)
-			    }
-			} elseif {[info exists queued($dd)]} {
-			    incr nc -1
-			}
-			set hastaggeddescendent($dd) 1
-		    }
-		}
-	    }
-	    if {![info exists queued($d)]} {
-		lappend todo $d
-		set queued($d) 1
-		if {![info exists hastaggeddescendent($d)]} {
-		    incr nc
-		}
-	    }
-	}
-    }
-    set t2 [clock clicks -milliseconds]
-    set loopix $i
-    set tags {}
-    foreach id [array names tagloc] {
-	if {![info exists hastaggeddescendent($id)]} {
-	    foreach t $tagloc($id) {
-		if {[lsearch -exact $tags $t] < 0} {
-		    lappend tags $t
-		}
-	    }
-	}
-    }
-
-    # remove tags that are ancestors of other tags
-    for {set i 0} {$i < [llength $tags]} {incr i} {
-	set a [lindex $tags $i]
-	for {set j 0} {$j < $i} {incr j} {
-	    set b [lindex $tags $j]
-	    set r [anc_or_desc $a $b]
-	    if {$r == -1} {
-		set tags [lreplace $tags $j $j]
-		incr j -1
-		incr i -1
-	    } elseif {$r == 1} {
-		set tags [lreplace $tags $i $i]
-		incr i -1
-		break
-	    }
-	}
-    }
-
-    if {[array names growing] ne {}} {
-	# graph isn't finished, need to check if any tag could get
-	# eclipsed by another tag coming later.  Simply ignore any
-	# tags that could later get eclipsed.
-	set ctags {}
-	foreach t $tags {
-	    if {[is_certain $origid $t]} {
-		lappend ctags $t
-	    }
-	}
-	if {$tags eq $ctags} {
-	    set cached_atags($origid) $tags
-	} else {
-	    set tags $ctags
-	}
-    } else {
-	set cached_atags($origid) $tags
-    }
-    set t3 [clock clicks -milliseconds]
-    if {0 && $t3 - $t1 >= 100} {
-	puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
-    	    [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
-    }
-    return $tags
-}
-
-# Return the list of IDs that have heads that are descendents of id,
-# including id itself if it has a head.
-proc descheads {id} {
-    global arcnos arcstart arcids archeads idheads cached_dheads
-    global allparents arcout
-
-    if {![info exists allparents($id)]} {
-	return {}
-    }
-    set aret {}
-    if {![info exists arcout($id)]} {
-	# part-way along an arc; check it first
-	set a [lindex $arcnos($id) 0]
-	if {$archeads($a) ne {}} {
-	    validate_archeads $a
-	    set i [lsearch -exact $arcids($a) $id]
-	    foreach t $archeads($a) {
-		set j [lsearch -exact $arcids($a) $t]
-		if {$j > $i} break
-		lappend aret $t
-	    }
-	}
-	set id $arcstart($a)
-    }
-    set origid $id
-    set todo [list $id]
-    set seen($id) 1
-    set ret {}
-    for {set i 0} {$i < [llength $todo]} {incr i} {
-	set id [lindex $todo $i]
-	if {[info exists cached_dheads($id)]} {
-	    set ret [concat $ret $cached_dheads($id)]
-	} else {
-	    if {[info exists idheads($id)]} {
-		lappend ret $id
-	    }
-	    foreach a $arcnos($id) {
-		if {$archeads($a) ne {}} {
-		    validate_archeads $a
-		    if {$archeads($a) ne {}} {
-			set ret [concat $ret $archeads($a)]
-		    }
-		}
-		set d $arcstart($a)
-		if {![info exists seen($d)]} {
-		    lappend todo $d
-		    set seen($d) 1
-		}
-	    }
-	}
-    }
-    set ret [lsort -unique $ret]
-    set cached_dheads($origid) $ret
-    return [concat $ret $aret]
-}
-
-proc addedtag {id} {
-    global arcnos arcout cached_dtags cached_atags
-
-    if {![info exists arcnos($id)]} return
-    if {![info exists arcout($id)]} {
-	recalcarc [lindex $arcnos($id) 0]
-    }
-    unset -nocomplain cached_dtags
-    unset -nocomplain cached_atags
-}
-
-proc addedhead {hid head} {
-    global arcnos arcout cached_dheads
-
-    if {![info exists arcnos($hid)]} return
-    if {![info exists arcout($hid)]} {
-	recalcarc [lindex $arcnos($hid) 0]
-    }
-    unset -nocomplain cached_dheads
-}
-
-proc removedhead {hid head} {
-    global cached_dheads
-
-    unset -nocomplain cached_dheads
-}
-
-proc movedhead {hid head} {
-    global arcnos arcout cached_dheads
-
-    if {![info exists arcnos($hid)]} return
-    if {![info exists arcout($hid)]} {
-	recalcarc [lindex $arcnos($hid) 0]
-    }
-    unset -nocomplain cached_dheads
-}
-
-proc changedrefs {} {
-    global cached_dheads cached_dtags cached_atags cached_tagcontent
-    global arctags archeads arcnos arcout idheads idtags
-
-    foreach id [concat [array names idheads] [array names idtags]] {
-	if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
-	    set a [lindex $arcnos($id) 0]
-	    if {![info exists donearc($a)]} {
-		recalcarc $a
-		set donearc($a) 1
-	    }
-	}
-    }
-    unset -nocomplain cached_tagcontent
-    unset -nocomplain cached_dtags
-    unset -nocomplain cached_atags
-    unset -nocomplain cached_dheads
-}
-
-proc rereadrefs {} {
-    global idtags idheads idotherrefs mainheadid
-
-    set refids [concat [array names idtags] \
-		    [array names idheads] [array names idotherrefs]]
-    foreach id $refids {
-	if {![info exists ref($id)]} {
-	    set ref($id) [listrefs $id]
-	}
-    }
-    set oldmainhead $mainheadid
-    readrefs
-    changedrefs
-    set refids [lsort -unique [concat $refids [array names idtags] \
-			[array names idheads] [array names idotherrefs]]]
-    foreach id $refids {
-	set v [listrefs $id]
-	if {![info exists ref($id)] || $ref($id) != $v} {
-	    redrawtags $id
-	}
-    }
-    if {$oldmainhead ne $mainheadid} {
-	redrawtags $oldmainhead
-	redrawtags $mainheadid
-    }
-    run refill_reflist
-}
-
-proc listrefs {id} {
-    global idtags idheads idotherrefs
-
-    set x {}
-    if {[info exists idtags($id)]} {
-	set x $idtags($id)
-    }
-    set y {}
-    if {[info exists idheads($id)]} {
-	set y $idheads($id)
-    }
-    set z {}
-    if {[info exists idotherrefs($id)]} {
-	set z $idotherrefs($id)
-    }
-    return [list $x $y $z]
-}
-
-proc add_tag_ctext {tag} {
-    global ctext cached_tagcontent tagids
-
-    if {![info exists cached_tagcontent($tag)]} {
-	catch {
-	    set cached_tagcontent($tag) [exec git cat-file -p $tag]
-	}
-    }
-    $ctext insert end "[mc "Tag"]: $tag\n" bold
-    if {[info exists cached_tagcontent($tag)]} {
-	set text $cached_tagcontent($tag)
-    } else {
-	set text "[mc "Id"]:  $tagids($tag)"
-    }
-    appendwithlinks $text {}
-}
-
-proc showtag {tag isnew} {
-    global ctext cached_tagcontent tagids linknum tagobjid
-
-    if {$isnew} {
-	addtohistory [list showtag $tag 0] savectextpos
-    }
-    $ctext conf -state normal
-    clear_ctext
-    settabs 0
-    set linknum 0
-    add_tag_ctext $tag
-    maybe_scroll_ctext 1
-    $ctext conf -state disabled
-    init_flist {}
-}
-
-proc showtags {id isnew} {
-    global idtags ctext linknum
-
-    if {$isnew} {
-	addtohistory [list showtags $id 0] savectextpos
-    }
-    $ctext conf -state normal
-    clear_ctext
-    settabs 0
-    set linknum 0
-    set sep {}
-    foreach tag $idtags($id) {
-	$ctext insert end $sep
-	add_tag_ctext $tag
-	set sep "\n\n"
-    }
-    maybe_scroll_ctext 1
-    $ctext conf -state disabled
-    init_flist {}
-}
-
-proc doquit {} {
-    global stopped
-    global gitktmpdir
-
-    set stopped 100
-    savestuff .
-    destroy .
-
-    if {[info exists gitktmpdir]} {
-	catch {file delete -force $gitktmpdir}
-    }
-}
-
-proc mkfontdisp {font top which} {
-    global fontattr fontpref $font NS use_ttk
-
-    set fontpref($font) [set $font]
-    ${NS}::button $top.${font}but -text $which \
-	-command [list choosefont $font $which]
-    ${NS}::label $top.$font -relief flat -font $font \
-	-text $fontattr($font,family) -justify left
-    grid x $top.${font}but $top.$font -sticky w
-}
-
-proc choosefont {font which} {
-    global fontparam fontlist fonttop fontattr
-    global prefstop NS
-
-    set fontparam(which) $which
-    set fontparam(font) $font
-    set fontparam(family) [font actual $font -family]
-    set fontparam(size) $fontattr($font,size)
-    set fontparam(weight) $fontattr($font,weight)
-    set fontparam(slant) $fontattr($font,slant)
-    set top .gitkfont
-    set fonttop $top
-    if {![winfo exists $top]} {
-	font create sample
-	eval font config sample [font actual $font]
-	ttk_toplevel $top
-	make_transient $top $prefstop
-	wm title $top [mc "Gitk font chooser"]
-	${NS}::label $top.l -textvariable fontparam(which)
-	pack $top.l -side top
-	set fontlist [lsort [font families]]
-	${NS}::frame $top.f
-	listbox $top.f.fam -listvariable fontlist \
-	    -yscrollcommand [list $top.f.sb set]
-	bind $top.f.fam <<ListboxSelect>> selfontfam
-	${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
-	pack $top.f.sb -side right -fill y
-	pack $top.f.fam -side left -fill both -expand 1
-	pack $top.f -side top -fill both -expand 1
-	${NS}::frame $top.g
-	spinbox $top.g.size -from 4 -to 40 -width 4 \
-	    -textvariable fontparam(size) \
-	    -validatecommand {string is integer -strict %s}
-	checkbutton $top.g.bold -padx 5 \
-	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
-	    -variable fontparam(weight) -onvalue bold -offvalue normal
-	checkbutton $top.g.ital -padx 5 \
-	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
-	    -variable fontparam(slant) -onvalue italic -offvalue roman
-	pack $top.g.size $top.g.bold $top.g.ital -side left
-	pack $top.g -side top
-	canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
-	    -background white
-	$top.c create text 100 25 -anchor center -text $which -font sample \
-	    -fill black -tags text
-	bind $top.c <Configure> [list centertext $top.c]
-	pack $top.c -side top -fill x
-	${NS}::frame $top.buts
-	${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
-	${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
-	bind $top <Key-Return> fontok
-	bind $top <Key-Escape> fontcan
-	grid $top.buts.ok $top.buts.can
-	grid columnconfigure $top.buts 0 -weight 1 -uniform a
-	grid columnconfigure $top.buts 1 -weight 1 -uniform a
-	pack $top.buts -side bottom -fill x
-	trace add variable fontparam write chg_fontparam
-    } else {
-	raise $top
-	$top.c itemconf text -text $which
-    }
-    set i [lsearch -exact $fontlist $fontparam(family)]
-    if {$i >= 0} {
-	$top.f.fam selection set $i
-	$top.f.fam see $i
-    }
-}
-
-proc centertext {w} {
-    $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
-}
-
-proc fontok {} {
-    global fontparam fontpref prefstop
-
-    set f $fontparam(font)
-    set fontpref($f) [list $fontparam(family) $fontparam(size)]
-    if {$fontparam(weight) eq "bold"} {
-	lappend fontpref($f) "bold"
-    }
-    if {$fontparam(slant) eq "italic"} {
-	lappend fontpref($f) "italic"
-    }
-    set w $prefstop.notebook.fonts.$f
-    $w conf -text $fontparam(family) -font $fontpref($f)
-
-    fontcan
-}
-
-proc fontcan {} {
-    global fonttop fontparam
-
-    if {[info exists fonttop]} {
-	catch {destroy $fonttop}
-	catch {font delete sample}
-	unset fonttop
-	unset fontparam
-    }
-}
-
-if {[package vsatisfies [package provide Tk] 8.6]} {
-    # In Tk 8.6 we have a native font chooser dialog. Overwrite the above
-    # function to make use of it.
-    proc choosefont {font which} {
-	tk fontchooser configure -title $which -font $font \
-	    -command [list on_choosefont $font $which]
-	tk fontchooser show
-    }
-    proc on_choosefont {font which newfont} {
-	global fontparam
-	puts stderr "$font $newfont"
-	array set f [font actual $newfont]
-	set fontparam(which) $which
-	set fontparam(font) $font
-	set fontparam(family) $f(-family)
-	set fontparam(size) $f(-size)
-	set fontparam(weight) $f(-weight)
-	set fontparam(slant) $f(-slant)
-	fontok
-    }
-}
-
-proc selfontfam {} {
-    global fonttop fontparam
-
-    set i [$fonttop.f.fam curselection]
-    if {$i ne {}} {
-	set fontparam(family) [$fonttop.f.fam get $i]
-    }
-}
-
-proc chg_fontparam {v sub op} {
-    global fontparam
-
-    font config sample -$sub $fontparam($sub)
-}
-
-# Create a property sheet tab page
-proc create_prefs_page {w} {
-    global NS
-    set parent [join [lrange [split $w .] 0 end-1] .]
-    if {[winfo class $parent] eq "TNotebook"} {
-	${NS}::frame $w
-    } else {
-	${NS}::labelframe $w
-    }
-}
-
-proc prefspage_general {notebook} {
-    global NS maxwidth maxgraphpct showneartags showlocalchanges
-    global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
-    global hideremotes want_ttk have_ttk maxrefs
-
-    set page [create_prefs_page $notebook.general]
-
-    ${NS}::label $page.ldisp -text [mc "Commit list display options"]
-    grid $page.ldisp - -sticky w -pady 10
-    ${NS}::label $page.spacer -text " "
-    ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"]
-    spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
-    grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w
-                                         #xgettext:no-tcl-format
-    ${NS}::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"]
-    spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
-    grid x $page.maxpctl $page.maxpct -sticky w
-    ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
-	-variable showlocalchanges
-    grid x $page.showlocal -sticky w
-    ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \
-	-variable autoselect
-    spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
-    grid x $page.autoselect $page.autosellen -sticky w
-    ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
-	-variable hideremotes
-    grid x $page.hideremotes -sticky w
-
-    ${NS}::label $page.ddisp -text [mc "Diff display options"]
-    grid $page.ddisp - -sticky w -pady 10
-    ${NS}::label $page.tabstopl -text [mc "Tab spacing"]
-    spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
-    grid x $page.tabstopl $page.tabstop -sticky w
-    ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \
-	-variable showneartags
-    grid x $page.ntag -sticky w
-    ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"]
-    spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs
-    grid x $page.maxrefsl $page.maxrefs -sticky w
-    ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \
-	-variable limitdiffs
-    grid x $page.ldiff -sticky w
-    ${NS}::checkbutton $page.lattr -text [mc "Support per-file encodings"] \
-	-variable perfile_attrs
-    grid x $page.lattr -sticky w
-
-    ${NS}::entry $page.extdifft -textvariable extdifftool
-    ${NS}::frame $page.extdifff
-    ${NS}::label $page.extdifff.l -text [mc "External diff tool" ]
-    ${NS}::button $page.extdifff.b -text [mc "Choose..."] -command choose_extdiff
-    pack $page.extdifff.l $page.extdifff.b -side left
-    pack configure $page.extdifff.l -padx 10
-    grid x $page.extdifff $page.extdifft -sticky ew
-
-    ${NS}::label $page.lgen -text [mc "General options"]
-    grid $page.lgen - -sticky w -pady 10
-    ${NS}::checkbutton $page.want_ttk -variable want_ttk \
-	-text [mc "Use themed widgets"]
-    if {$have_ttk} {
-	${NS}::label $page.ttk_note -text [mc "(change requires restart)"]
-    } else {
-	${NS}::label $page.ttk_note -text [mc "(currently unavailable)"]
-    }
-    grid x $page.want_ttk $page.ttk_note -sticky w
-    return $page
-}
-
-proc prefspage_colors {notebook} {
-    global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
-
-    set page [create_prefs_page $notebook.colors]
-
-    ${NS}::label $page.cdisp -text [mc "Colors: press to choose"]
-    grid $page.cdisp - -sticky w -pady 10
-    label $page.ui -padx 40 -relief sunk -background $uicolor
-    ${NS}::button $page.uibut -text [mc "Interface"] \
-       -command [list choosecolor uicolor {} $page.ui [mc "interface"] setui]
-    grid x $page.uibut $page.ui -sticky w
-    label $page.bg -padx 40 -relief sunk -background $bgcolor
-    ${NS}::button $page.bgbut -text [mc "Background"] \
-	-command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
-    grid x $page.bgbut $page.bg -sticky w
-    label $page.fg -padx 40 -relief sunk -background $fgcolor
-    ${NS}::button $page.fgbut -text [mc "Foreground"] \
-	-command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
-    grid x $page.fgbut $page.fg -sticky w
-    label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
-    ${NS}::button $page.diffoldbut -text [mc "Diff: old lines"] \
-	-command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
-		      [list $ctext tag conf d0 -foreground]]
-    grid x $page.diffoldbut $page.diffold -sticky w
-    label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
-    ${NS}::button $page.diffnewbut -text [mc "Diff: new lines"] \
-	-command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
-		      [list $ctext tag conf dresult -foreground]]
-    grid x $page.diffnewbut $page.diffnew -sticky w
-    label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
-    ${NS}::button $page.hunksepbut -text [mc "Diff: hunk header"] \
-	-command [list choosecolor diffcolors 2 $page.hunksep \
-		      [mc "diff hunk header"] \
-		      [list $ctext tag conf hunksep -foreground]]
-    grid x $page.hunksepbut $page.hunksep -sticky w
-    label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
-    ${NS}::button $page.markbgbut -text [mc "Marked line bg"] \
-	-command [list choosecolor markbgcolor {} $page.markbgsep \
-		      [mc "marked line background"] \
-		      [list $ctext tag conf omark -background]]
-    grid x $page.markbgbut $page.markbgsep -sticky w
-    label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
-    ${NS}::button $page.selbgbut -text [mc "Select bg"] \
-	-command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
-    grid x $page.selbgbut $page.selbgsep -sticky w
-    return $page
-}
-
-proc prefspage_fonts {notebook} {
-    global NS
-    set page [create_prefs_page $notebook.fonts]
-    ${NS}::label $page.cfont -text [mc "Fonts: press to choose"]
-    grid $page.cfont - -sticky w -pady 10
-    mkfontdisp mainfont $page [mc "Main font"]
-    mkfontdisp textfont $page [mc "Diff display font"]
-    mkfontdisp uifont $page [mc "User interface font"]
-    return $page
-}
-
-proc doprefs {} {
-    global maxwidth maxgraphpct use_ttk NS
-    global oldprefs prefstop showneartags showlocalchanges
-    global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
-    global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
-    global hideremotes want_ttk have_ttk
-
-    set top .gitkprefs
-    set prefstop $top
-    if {[winfo exists $top]} {
-	raise $top
-	return
-    }
-    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-		   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
-	set oldprefs($v) [set $v]
-    }
-    ttk_toplevel $top
-    wm title $top [mc "Gitk preferences"]
-    make_transient $top .
-
-    if {[set use_notebook [expr {$use_ttk && [info command ::ttk::notebook] ne ""}]]} {
-	set notebook [ttk::notebook $top.notebook]
-    } else {
-	set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat]
-    }
-
-    lappend pages [prefspage_general $notebook] [mc "General"]
-    lappend pages [prefspage_colors $notebook] [mc "Colors"]
-    lappend pages [prefspage_fonts $notebook] [mc "Fonts"]
-    set col 0
-    foreach {page title} $pages {
-	if {$use_notebook} {
-	    $notebook add $page -text $title
-	} else {
-	    set btn [${NS}::button $notebook.b_[string map {. X} $page] \
-			 -text $title -command [list raise $page]]
-	    $page configure -text $title
-	    grid $btn -row 0 -column [incr col] -sticky w
-	    grid $page -row 1 -column 0 -sticky news -columnspan 100
-	}
-    }
-
-    if {!$use_notebook} {
-	grid columnconfigure $notebook 0 -weight 1
-	grid rowconfigure $notebook 1 -weight 1
-	raise [lindex $pages 0]
-    }
-
-    grid $notebook -sticky news -padx 2 -pady 2
-    grid rowconfigure $top 0 -weight 1
-    grid columnconfigure $top 0 -weight 1
-
-    ${NS}::frame $top.buts
-    ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
-    ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
-    bind $top <Key-Return> prefsok
-    bind $top <Key-Escape> prefscan
-    grid $top.buts.ok $top.buts.can
-    grid columnconfigure $top.buts 0 -weight 1 -uniform a
-    grid columnconfigure $top.buts 1 -weight 1 -uniform a
-    grid $top.buts - - -pady 10 -sticky ew
-    grid columnconfigure $top 2 -weight 1
-    bind $top <Visibility> [list focus $top.buts.ok]
-}
-
-proc choose_extdiff {} {
-    global extdifftool
-
-    set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
-    if {$prog ne {}} {
-	set extdifftool $prog
-    }
-}
-
-proc choosecolor {v vi w x cmd} {
-    global $v
-
-    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
-	       -title [mc "Gitk: choose color for %s" $x]]
-    if {$c eq {}} return
-    $w conf -background $c
-    lset $v $vi $c
-    eval $cmd $c
-}
-
-proc setselbg {c} {
-    global bglist cflist
-    foreach w $bglist {
-	if {[winfo exists $w]} {
-	    $w configure -selectbackground $c
-	}
-    }
-    $cflist tag configure highlight \
-	-background [$cflist cget -selectbackground]
-    allcanvs itemconf secsel -fill $c
-}
-
-# This sets the background color and the color scheme for the whole UI.
-# For some reason, tk_setPalette chooses a nasty dark red for selectColor
-# if we don't specify one ourselves, which makes the checkbuttons and
-# radiobuttons look bad.  This chooses white for selectColor if the
-# background color is light, or black if it is dark.
-proc setui {c} {
-    if {[tk windowingsystem] eq "win32"} { return }
-    set bg [winfo rgb . $c]
-    set selc black
-    if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} {
-	set selc white
-    }
-    tk_setPalette background $c selectColor $selc
-}
-
-proc setbg {c} {
-    global bglist
-
-    foreach w $bglist {
-	if {[winfo exists $w]} {
-	    $w conf -background $c
-	}
-    }
-}
-
-proc setfg {c} {
-    global fglist canv
-
-    foreach w $fglist {
-	if {[winfo exists $w]} {
-	    $w conf -foreground $c
-	}
-    }
-    allcanvs itemconf text -fill $c
-    $canv itemconf circle -outline $c
-    $canv itemconf markid -outline $c
-}
-
-proc prefscan {} {
-    global oldprefs prefstop
-
-    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-		   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
-	global $v
-	set $v $oldprefs($v)
-    }
-    catch {destroy $prefstop}
-    unset prefstop
-    fontcan
-}
-
-proc prefsok {} {
-    global maxwidth maxgraphpct
-    global oldprefs prefstop showneartags showlocalchanges
-    global fontpref mainfont textfont uifont
-    global limitdiffs treediffs perfile_attrs
-    global hideremotes
-
-    catch {destroy $prefstop}
-    unset prefstop
-    fontcan
-    set fontchanged 0
-    if {$mainfont ne $fontpref(mainfont)} {
-	set mainfont $fontpref(mainfont)
-	parsefont mainfont $mainfont
-	eval font configure mainfont [fontflags mainfont]
-	eval font configure mainfontbold [fontflags mainfont 1]
-	setcoords
-	set fontchanged 1
-    }
-    if {$textfont ne $fontpref(textfont)} {
-	set textfont $fontpref(textfont)
-	parsefont textfont $textfont
-	eval font configure textfont [fontflags textfont]
-	eval font configure textfontbold [fontflags textfont 1]
-    }
-    if {$uifont ne $fontpref(uifont)} {
-	set uifont $fontpref(uifont)
-	parsefont uifont $uifont
-	eval font configure uifont [fontflags uifont]
-    }
-    settabs
-    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
-	if {$showlocalchanges} {
-	    doshowlocalchanges
-	} else {
-	    dohidelocalchanges
-	}
-    }
-    if {$limitdiffs != $oldprefs(limitdiffs) ||
-	($perfile_attrs && !$oldprefs(perfile_attrs))} {
-	# treediffs elements are limited by path;
-	# won't have encodings cached if perfile_attrs was just turned on
-	unset -nocomplain treediffs
-    }
-    if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
-	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
-	redisplay
-    } elseif {$showneartags != $oldprefs(showneartags) ||
-	  $limitdiffs != $oldprefs(limitdiffs)} {
-	reselectline
-    }
-    if {$hideremotes != $oldprefs(hideremotes)} {
-	rereadrefs
-    }
-}
-
-proc formatdate {d} {
-    global datetimeformat
-    if {$d ne {}} {
-	# If $datetimeformat includes a timezone, display in the
-	# timezone of the argument.  Otherwise, display in local time.
-	if {[string match {*%[zZ]*} $datetimeformat]} {
-	    if {[catch {set d [clock format [lindex $d 0] -timezone [lindex $d 1] -format $datetimeformat]}]} {
-		# Tcl < 8.5 does not support -timezone.  Emulate it by
-		# setting TZ (e.g. TZ=<-0430>+04:30).
-		global env
-		if {[info exists env(TZ)]} {
-		    set savedTZ $env(TZ)
-		}
-		set zone [lindex $d 1]
-		set sign [string map {+ - - +} [string index $zone 0]]
-		set env(TZ) <$zone>$sign[string range $zone 1 2]:[string range $zone 3 4]
-		set d [clock format [lindex $d 0] -format $datetimeformat]
-		if {[info exists savedTZ]} {
-		    set env(TZ) $savedTZ
-		} else {
-		    unset env(TZ)
-		}
-	    }
-	} else {
-	    set d [clock format [lindex $d 0] -format $datetimeformat]
-	}
-    }
-    return $d
-}
-
-# This list of encoding names and aliases is distilled from
-# http://www.iana.org/assignments/character-sets.
-# Not all of them are supported by Tcl.
-set encoding_aliases {
-    { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
-      ISO646-US US-ASCII us IBM367 cp367 csASCII }
-    { ISO-10646-UTF-1 csISO10646UTF1 }
-    { ISO_646.basic:1983 ref csISO646basic1983 }
-    { INVARIANT csINVARIANT }
-    { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
-    { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
-    { NATS-SEFI iso-ir-8-1 csNATSSEFI }
-    { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
-    { NATS-DANO iso-ir-9-1 csNATSDANO }
-    { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
-    { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
-    { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
-    { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
-    { ISO-2022-KR csISO2022KR }
-    { EUC-KR csEUCKR }
-    { ISO-2022-JP csISO2022JP }
-    { ISO-2022-JP-2 csISO2022JP2 }
-    { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
-      csISO13JISC6220jp }
-    { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
-    { IT iso-ir-15 ISO646-IT csISO15Italian }
-    { PT iso-ir-16 ISO646-PT csISO16Portuguese }
-    { ES iso-ir-17 ISO646-ES csISO17Spanish }
-    { greek7-old iso-ir-18 csISO18Greek7Old }
-    { latin-greek iso-ir-19 csISO19LatinGreek }
-    { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
-    { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
-    { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
-    { ISO_5427 iso-ir-37 csISO5427Cyrillic }
-    { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
-    { BS_viewdata iso-ir-47 csISO47BSViewdata }
-    { INIS iso-ir-49 csISO49INIS }
-    { INIS-8 iso-ir-50 csISO50INIS8 }
-    { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
-    { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
-    { ISO_5428:1980 iso-ir-55 csISO5428Greek }
-    { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
-    { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
-    { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
-      csISO60Norwegian1 }
-    { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
-    { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
-    { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
-    { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
-    { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
-    { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
-    { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
-    { greek7 iso-ir-88 csISO88Greek7 }
-    { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
-    { iso-ir-90 csISO90 }
-    { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
-    { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
-      csISO92JISC62991984b }
-    { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
-    { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
-    { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
-      csISO95JIS62291984handadd }
-    { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
-    { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
-    { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
-    { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
-      CP819 csISOLatin1 }
-    { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
-    { T.61-7bit iso-ir-102 csISO102T617bit }
-    { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
-    { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
-    { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
-    { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
-    { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
-    { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
-    { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
-    { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
-      arabic csISOLatinArabic }
-    { ISO_8859-6-E csISO88596E ISO-8859-6-E }
-    { ISO_8859-6-I csISO88596I ISO-8859-6-I }
-    { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
-      greek greek8 csISOLatinGreek }
-    { T.101-G2 iso-ir-128 csISO128T101G2 }
-    { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
-      csISOLatinHebrew }
-    { ISO_8859-8-E csISO88598E ISO-8859-8-E }
-    { ISO_8859-8-I csISO88598I ISO-8859-8-I }
-    { CSN_369103 iso-ir-139 csISO139CSN369103 }
-    { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
-    { ISO_6937-2-add iso-ir-142 csISOTextComm }
-    { IEC_P27-1 iso-ir-143 csISO143IECP271 }
-    { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
-      csISOLatinCyrillic }
-    { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
-    { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
-    { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
-    { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
-    { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
-    { ISO_6937-2-25 iso-ir-152 csISO6937Add }
-    { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
-    { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
-    { ISO_10367-box iso-ir-155 csISO10367Box }
-    { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
-    { latin-lap lap iso-ir-158 csISO158Lap }
-    { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
-    { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
-    { us-dk csUSDK }
-    { dk-us csDKUS }
-    { JIS_X0201 X0201 csHalfWidthKatakana }
-    { KSC5636 ISO646-KR csKSC5636 }
-    { ISO-10646-UCS-2 csUnicode }
-    { ISO-10646-UCS-4 csUCS4 }
-    { DEC-MCS dec csDECMCS }
-    { hp-roman8 roman8 r8 csHPRoman8 }
-    { macintosh mac csMacintosh }
-    { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
-      csIBM037 }
-    { IBM038 EBCDIC-INT cp038 csIBM038 }
-    { IBM273 CP273 csIBM273 }
-    { IBM274 EBCDIC-BE CP274 csIBM274 }
-    { IBM275 EBCDIC-BR cp275 csIBM275 }
-    { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
-    { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
-    { IBM280 CP280 ebcdic-cp-it csIBM280 }
-    { IBM281 EBCDIC-JP-E cp281 csIBM281 }
-    { IBM284 CP284 ebcdic-cp-es csIBM284 }
-    { IBM285 CP285 ebcdic-cp-gb csIBM285 }
-    { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
-    { IBM297 cp297 ebcdic-cp-fr csIBM297 }
-    { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
-    { IBM423 cp423 ebcdic-cp-gr csIBM423 }
-    { IBM424 cp424 ebcdic-cp-he csIBM424 }
-    { IBM437 cp437 437 csPC8CodePage437 }
-    { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
-    { IBM775 cp775 csPC775Baltic }
-    { IBM850 cp850 850 csPC850Multilingual }
-    { IBM851 cp851 851 csIBM851 }
-    { IBM852 cp852 852 csPCp852 }
-    { IBM855 cp855 855 csIBM855 }
-    { IBM857 cp857 857 csIBM857 }
-    { IBM860 cp860 860 csIBM860 }
-    { IBM861 cp861 861 cp-is csIBM861 }
-    { IBM862 cp862 862 csPC862LatinHebrew }
-    { IBM863 cp863 863 csIBM863 }
-    { IBM864 cp864 csIBM864 }
-    { IBM865 cp865 865 csIBM865 }
-    { IBM866 cp866 866 csIBM866 }
-    { IBM868 CP868 cp-ar csIBM868 }
-    { IBM869 cp869 869 cp-gr csIBM869 }
-    { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
-    { IBM871 CP871 ebcdic-cp-is csIBM871 }
-    { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
-    { IBM891 cp891 csIBM891 }
-    { IBM903 cp903 csIBM903 }
-    { IBM904 cp904 904 csIBBM904 }
-    { IBM905 CP905 ebcdic-cp-tr csIBM905 }
-    { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
-    { IBM1026 CP1026 csIBM1026 }
-    { EBCDIC-AT-DE csIBMEBCDICATDE }
-    { EBCDIC-AT-DE-A csEBCDICATDEA }
-    { EBCDIC-CA-FR csEBCDICCAFR }
-    { EBCDIC-DK-NO csEBCDICDKNO }
-    { EBCDIC-DK-NO-A csEBCDICDKNOA }
-    { EBCDIC-FI-SE csEBCDICFISE }
-    { EBCDIC-FI-SE-A csEBCDICFISEA }
-    { EBCDIC-FR csEBCDICFR }
-    { EBCDIC-IT csEBCDICIT }
-    { EBCDIC-PT csEBCDICPT }
-    { EBCDIC-ES csEBCDICES }
-    { EBCDIC-ES-A csEBCDICESA }
-    { EBCDIC-ES-S csEBCDICESS }
-    { EBCDIC-UK csEBCDICUK }
-    { EBCDIC-US csEBCDICUS }
-    { UNKNOWN-8BIT csUnknown8BiT }
-    { MNEMONIC csMnemonic }
-    { MNEM csMnem }
-    { VISCII csVISCII }
-    { VIQR csVIQR }
-    { KOI8-R csKOI8R }
-    { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
-    { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
-    { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
-    { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
-    { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
-    { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
-    { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
-    { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
-    { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
-    { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
-    { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
-    { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
-    { IBM1047 IBM-1047 }
-    { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
-    { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
-    { UNICODE-1-1 csUnicode11 }
-    { CESU-8 csCESU-8 }
-    { BOCU-1 csBOCU-1 }
-    { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
-    { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
-      l8 }
-    { ISO-8859-15 ISO_8859-15 Latin-9 }
-    { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
-    { GBK CP936 MS936 windows-936 }
-    { JIS_Encoding csJISEncoding }
-    { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
-    { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
-      EUC-JP }
-    { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
-    { ISO-10646-UCS-Basic csUnicodeASCII }
-    { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
-    { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
-    { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
-    { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
-    { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
-    { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
-    { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
-    { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
-    { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
-    { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
-    { Adobe-Standard-Encoding csAdobeStandardEncoding }
-    { Ventura-US csVenturaUS }
-    { Ventura-International csVenturaInternational }
-    { PC8-Danish-Norwegian csPC8DanishNorwegian }
-    { PC8-Turkish csPC8Turkish }
-    { IBM-Symbols csIBMSymbols }
-    { IBM-Thai csIBMThai }
-    { HP-Legal csHPLegal }
-    { HP-Pi-font csHPPiFont }
-    { HP-Math8 csHPMath8 }
-    { Adobe-Symbol-Encoding csHPPSMath }
-    { HP-DeskTop csHPDesktop }
-    { Ventura-Math csVenturaMath }
-    { Microsoft-Publishing csMicrosoftPublishing }
-    { Windows-31J csWindows31J }
-    { GB2312 csGB2312 }
-    { Big5 csBig5 }
-}
-
-proc tcl_encoding {enc} {
-    global encoding_aliases tcl_encoding_cache
-    if {[info exists tcl_encoding_cache($enc)]} {
-	return $tcl_encoding_cache($enc)
-    }
-    set names [encoding names]
-    set lcnames [string tolower $names]
-    set enc [string tolower $enc]
-    set i [lsearch -exact $lcnames $enc]
-    if {$i < 0} {
-	# look for "isonnn" instead of "iso-nnn" or "iso_nnn"
-	if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
-	    set i [lsearch -exact $lcnames $encx]
-	}
-    }
-    if {$i < 0} {
-	foreach l $encoding_aliases {
-	    set ll [string tolower $l]
-	    if {[lsearch -exact $ll $enc] < 0} continue
-	    # look through the aliases for one that tcl knows about
-	    foreach e $ll {
-		set i [lsearch -exact $lcnames $e]
-		if {$i < 0} {
-		    if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
-			set i [lsearch -exact $lcnames $ex]
-		    }
-		}
-		if {$i >= 0} break
-	    }
-	    break
-	}
-    }
-    set tclenc {}
-    if {$i >= 0} {
-	set tclenc [lindex $names $i]
-    }
-    set tcl_encoding_cache($enc) $tclenc
-    return $tclenc
-}
-
-proc gitattr {path attr default} {
-    global path_attr_cache
-    if {[info exists path_attr_cache($attr,$path)]} {
-	set r $path_attr_cache($attr,$path)
-    } else {
-	set r "unspecified"
-	if {![catch {set line [exec git check-attr $attr -- $path]}]} {
-	    regexp "(.*): $attr: (.*)" $line m f r
-	}
-	set path_attr_cache($attr,$path) $r
-    }
-    if {$r eq "unspecified"} {
-	return $default
-    }
-    return $r
-}
-
-proc cache_gitattr {attr pathlist} {
-    global path_attr_cache
-    set newlist {}
-    foreach path $pathlist {
-	if {![info exists path_attr_cache($attr,$path)]} {
-	    lappend newlist $path
-	}
-    }
-    set lim 1000
-    if {[tk windowingsystem] == "win32"} {
-	# windows has a 32k limit on the arguments to a command...
-	set lim 30
-    }
-    while {$newlist ne {}} {
-	set head [lrange $newlist 0 [expr {$lim - 1}]]
-	set newlist [lrange $newlist $lim end]
-	if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
-	    foreach row [split $rlist "\n"] {
-		if {[regexp "(.*): $attr: (.*)" $row m path value]} {
-		    if {[string index $path 0] eq "\""} {
-			set path [encoding convertfrom [lindex $path 0]]
-		    }
-		    set path_attr_cache($attr,$path) $value
-		}
-	    }
-	}
-    }
-}
-
-proc get_path_encoding {path} {
-    global gui_encoding perfile_attrs
-    set tcl_enc $gui_encoding
-    if {$path ne {} && $perfile_attrs} {
-	set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
-	if {$enc2 ne {}} {
-	    set tcl_enc $enc2
-	}
-    }
-    return $tcl_enc
-}
-
-## For msgcat loading, first locate the installation location.
-if { [info exists ::env(GITK_MSGSDIR)] } {
-    ## Msgsdir was manually set in the environment.
-    set gitk_msgsdir $::env(GITK_MSGSDIR)
-} else {
-    ## Let's guess the prefix from argv0.
-    set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
-    set gitk_libdir [file join $gitk_prefix share gitk lib]
-    set gitk_msgsdir [file join $gitk_libdir msgs]
-    unset gitk_prefix
-}
-
-## Internationalization (i18n) through msgcat and gettext. See
-## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
-package require msgcat
-namespace import ::msgcat::mc
-## And eventually load the actual message catalog
-::msgcat::mcload $gitk_msgsdir
-
-# First check that Tcl/Tk is recent enough
-if {[catch {package require Tk 8.4} err]} {
-    show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
-			 Gitk requires at least Tcl/Tk 8.4."]
-    exit 1
-}
-
-# on OSX bring the current Wish process window to front
-if {[tk windowingsystem] eq "aqua"} {
-    exec osascript -e [format {
-        tell application "System Events"
-            set frontmost of processes whose unix id is %d to true
-        end tell
-    } [pid] ]
-}
-
-# Unset GIT_TRACE var if set
-if { [info exists ::env(GIT_TRACE)] } {
-    unset ::env(GIT_TRACE)
-}
-
-# defaults...
-set wrcomcmd "git diff-tree --stdin -p --pretty=email"
-
-set gitencoding {}
-catch {
-    set gitencoding [exec git config --get i18n.commitencoding]
-}
-catch {
-    set gitencoding [exec git config --get i18n.logoutputencoding]
-}
-if {$gitencoding == ""} {
-    set gitencoding "utf-8"
-}
-set tclencoding [tcl_encoding $gitencoding]
-if {$tclencoding == {}} {
-    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
-}
-
-set gui_encoding [encoding system]
-catch {
-    set enc [exec git config --get gui.encoding]
-    if {$enc ne {}} {
-	set tclenc [tcl_encoding $enc]
-	if {$tclenc ne {}} {
-	    set gui_encoding $tclenc
-	} else {
-	    puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
-	}
-    }
-}
-
-set log_showroot true
-catch {
-    set log_showroot [exec git config --bool --get log.showroot]
-}
-
-if {[tk windowingsystem] eq "aqua"} {
-    set mainfont {{Lucida Grande} 9}
-    set textfont {Monaco 9}
-    set uifont {{Lucida Grande} 9 bold}
-} elseif {![catch {::tk::pkgconfig get fontsystem} xft] && $xft eq "xft"} {
-    # fontconfig!
-    set mainfont {sans 9}
-    set textfont {monospace 9}
-    set uifont {sans 9 bold}
-} else {
-    set mainfont {Helvetica 9}
-    set textfont {Courier 9}
-    set uifont {Helvetica 9 bold}
-}
-set tabstop 8
-set findmergefiles 0
-set maxgraphpct 50
-set maxwidth 16
-set revlistorder 0
-set fastdate 0
-set uparrowlen 5
-set downarrowlen 5
-set mingaplen 100
-set cmitmode "patch"
-set wrapcomment "none"
-set showneartags 1
-set hideremotes 0
-set maxrefs 20
-set visiblerefs {"master"}
-set maxlinelen 200
-set showlocalchanges 1
-set limitdiffs 1
-set datetimeformat "%Y-%m-%d %H:%M:%S"
-set autoselect 1
-set autosellen 40
-set perfile_attrs 0
-set want_ttk 1
-
-if {[tk windowingsystem] eq "aqua"} {
-    set extdifftool "opendiff"
-} else {
-    set extdifftool "meld"
-}
-
-set colors {"#00ff00" red blue magenta darkgrey brown orange}
-if {[tk windowingsystem] eq "win32"} {
-    set uicolor SystemButtonFace
-    set uifgcolor SystemButtonText
-    set uifgdisabledcolor SystemDisabledText
-    set bgcolor SystemWindow
-    set fgcolor SystemWindowText
-    set selectbgcolor SystemHighlight
-} else {
-    set uicolor grey85
-    set uifgcolor black
-    set uifgdisabledcolor "#999"
-    set bgcolor white
-    set fgcolor black
-    set selectbgcolor gray85
-}
-set diffcolors {red "#00a000" blue}
-set diffcontext 3
-set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
-set ignorespace 0
-set worddiff ""
-set markbgcolor "#e0e0ff"
-
-set headbgcolor "#00ff00"
-set headfgcolor black
-set headoutlinecolor black
-set remotebgcolor #ffddaa
-set tagbgcolor yellow
-set tagfgcolor black
-set tagoutlinecolor black
-set reflinecolor black
-set filesepbgcolor #aaaaaa
-set filesepfgcolor black
-set linehoverbgcolor #ffff80
-set linehoverfgcolor black
-set linehoveroutlinecolor black
-set mainheadcirclecolor yellow
-set workingfilescirclecolor red
-set indexcirclecolor "#00ff00"
-set circlecolors {white blue gray blue blue}
-set linkfgcolor blue
-set circleoutlinecolor $fgcolor
-set foundbgcolor yellow
-set currentsearchhitbgcolor orange
-
-# button for popping up context menus
-if {[tk windowingsystem] eq "aqua"} {
-    set ctxbut <Button-2>
-} else {
-    set ctxbut <Button-3>
-}
-
-catch {
-    # follow the XDG base directory specification by default. See
-    # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-    if {[info exists env(XDG_CONFIG_HOME)] && $env(XDG_CONFIG_HOME) ne ""} {
-	# XDG_CONFIG_HOME environment variable is set
-	set config_file [file join $env(XDG_CONFIG_HOME) git gitk]
-	set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp]
-    } else {
-	# default XDG_CONFIG_HOME
-	set config_file "~/.config/git/gitk"
-	set config_file_tmp "~/.config/git/gitk-tmp"
-    }
-    if {![file exists $config_file]} {
-	# for backward compatibility use the old config file if it exists
-	if {[file exists "~/.gitk"]} {
-	    set config_file "~/.gitk"
-	    set config_file_tmp "~/.gitk-tmp"
-	} elseif {![file exists [file dirname $config_file]]} {
-	    file mkdir [file dirname $config_file]
-	}
-    }
-    source $config_file
-}
-config_check_tmp_exists 50
-
-set config_variables {
-    mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
-    cmitmode wrapcomment autoselect autosellen showneartags maxrefs visiblerefs
-    hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk
-    bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
-    markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor
-    extdifftool perfile_attrs headbgcolor headfgcolor headoutlinecolor
-    remotebgcolor tagbgcolor tagfgcolor tagoutlinecolor reflinecolor
-    filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor
-    linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor
-    indexcirclecolor circlecolors linkfgcolor circleoutlinecolor
-}
-foreach var $config_variables {
-    config_init_trace $var
-    trace add variable $var write config_variable_change_cb
-}
-
-parsefont mainfont $mainfont
-eval font create mainfont [fontflags mainfont]
-eval font create mainfontbold [fontflags mainfont 1]
-
-parsefont textfont $textfont
-eval font create textfont [fontflags textfont]
-eval font create textfontbold [fontflags textfont 1]
-
-parsefont uifont $uifont
-eval font create uifont [fontflags uifont]
-
-setui $uicolor
-
-setoptions
-
-# check that we can find a .git directory somewhere...
-if {[catch {set gitdir [exec git rev-parse --git-dir]}]} {
-    show_error {} . [mc "Cannot find a git repository here."]
-    exit 1
-}
-
-set selecthead {}
-set selectheadid {}
-
-set revtreeargs {}
-set cmdline_files {}
-set i 0
-set revtreeargscmd {}
-foreach arg $argv {
-    switch -glob -- $arg {
-	"" { }
-	"--" {
-	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
-	    break
-	}
-	"--select-commit=*" {
-	    set selecthead [string range $arg 16 end]
-	}
-	"--argscmd=*" {
-	    set revtreeargscmd [string range $arg 10 end]
-	}
-	default {
-	    lappend revtreeargs $arg
-	}
-    }
-    incr i
-}
-
-if {$selecthead eq "HEAD"} {
-    set selecthead {}
-}
-
-if {$i >= [llength $argv] && $revtreeargs ne {}} {
-    # no -- on command line, but some arguments (other than --argscmd)
-    if {[catch {
-	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
-	set cmdline_files [split $f "\n"]
-	set n [llength $cmdline_files]
-	set revtreeargs [lrange $revtreeargs 0 end-$n]
-	# Unfortunately git rev-parse doesn't produce an error when
-	# something is both a revision and a filename.  To be consistent
-	# with git log and git rev-list, check revtreeargs for filenames.
-	foreach arg $revtreeargs {
-	    if {[file exists $arg]} {
-		show_error {} . [mc "Ambiguous argument '%s': both revision\
-				 and filename" $arg]
-		exit 1
-	    }
-	}
-    } err]} {
-	# unfortunately we get both stdout and stderr in $err,
-	# so look for "fatal:".
-	set i [string first "fatal:" $err]
-	if {$i > 0} {
-	    set err [string range $err [expr {$i + 6}] end]
-	}
-	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
-	exit 1
-    }
-}
-
-set nullid "0000000000000000000000000000000000000000"
-set nullid2 "0000000000000000000000000000000000000001"
-set nullfile "/dev/null"
-
-set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
-if {![info exists have_ttk]} {
-    set have_ttk [llength [info commands ::ttk::style]]
-}
-set use_ttk [expr {$have_ttk && $want_ttk}]
-set NS [expr {$use_ttk ? "ttk" : ""}]
-
-if {$use_ttk} {
-    setttkstyle
-}
-
-regexp {^git version ([\d.]*\d)} [exec git version] _ git_version
-
-set show_notes {}
-if {[package vcompare $git_version "1.6.6.2"] >= 0} {
-    set show_notes "--show-notes"
-}
-
-set appname "gitk"
-
-set runq {}
-set history {}
-set historyindex 0
-set fh_serial 0
-set nhl_names {}
-set highlight_paths {}
-set findpattern {}
-set searchdirn -forwards
-set boldids {}
-set boldnameids {}
-set diffelide {0 0}
-set markingmatches 0
-set linkentercount 0
-set need_redisplay 0
-set nrows_drawn 0
-set firsttabstop 0
-
-set nextviewnum 1
-set curview 0
-set selectedview 0
-set selectedhlview [mc "None"]
-set highlight_related [mc "None"]
-set highlight_files {}
-set viewfiles(0) {}
-set viewperm(0) 0
-set viewchanged(0) 0
-set viewargs(0) {}
-set viewargscmd(0) {}
-
-set selectedline {}
-set numcommits 0
-set loginstance 0
-set cmdlineok 0
-set stopped 0
-set stuffsaved 0
-set patchnum 0
-set lserial 0
-set hasworktree [hasworktree]
-set cdup {}
-if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} {
-    set cdup [exec git rev-parse --show-cdup]
-}
-set worktree [exec git rev-parse --show-toplevel]
-setcoords
-makewindow
-catch {
-    image create photo gitlogo      -width 16 -height 16
-
-    image create photo gitlogominus -width  4 -height  2
-    gitlogominus put #C00000 -to 0 0 4 2
-    gitlogo copy gitlogominus -to  1 5
-    gitlogo copy gitlogominus -to  6 5
-    gitlogo copy gitlogominus -to 11 5
-    image delete gitlogominus
-
-    image create photo gitlogoplus  -width  4 -height  4
-    gitlogoplus  put #008000 -to 1 0 3 4
-    gitlogoplus  put #008000 -to 0 1 4 3
-    gitlogo copy gitlogoplus  -to  1 9
-    gitlogo copy gitlogoplus  -to  6 9
-    gitlogo copy gitlogoplus  -to 11 9
-    image delete gitlogoplus
-
-    image create photo gitlogo32    -width 32 -height 32
-    gitlogo32 copy gitlogo -zoom 2 2
-
-    wm iconphoto . -default gitlogo gitlogo32
-}
-# wait for the window to become visible
-tkwait visibility .
-set_window_title
-update
-readrefs
-
-if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
-    # create a view for the files/dirs specified on the command line
-    set curview 1
-    set selectedview 1
-    set nextviewnum 2
-    set viewname(1) [mc "Command line"]
-    set viewfiles(1) $cmdline_files
-    set viewargs(1) $revtreeargs
-    set viewargscmd(1) $revtreeargscmd
-    set viewperm(1) 0
-    set viewchanged(1) 0
-    set vdatemode(1) 0
-    addviewmenu 1
-    .bar.view entryconf [mca "&Edit view..."] -state normal
-    .bar.view entryconf [mca "&Delete view"] -state normal
-}
-
-if {[info exists permviews]} {
-    foreach v $permviews {
-	set n $nextviewnum
-	incr nextviewnum
-	set viewname($n) [lindex $v 0]
-	set viewfiles($n) [lindex $v 1]
-	set viewargs($n) [lindex $v 2]
-	set viewargscmd($n) [lindex $v 3]
-	set viewperm($n) 1
-	set viewchanged($n) 0
-	addviewmenu $n
-    }
-}
-
-if {[tk windowingsystem] eq "win32"} {
-    focus -force .
-}
-
-getcommits {}
-
-# Local variables:
-# mode: tcl
-# indent-tabs-mode: t
-# tab-width: 8
-# End:
diff --git a/setenv.sh b/setenv.sh
index 043bdad..26e00d3 100644
--- a/setenv.sh
+++ b/setenv.sh
@@ -1,6 +1,9 @@
-source /opt/python-virtual-env/py36/bin/activate
+source .venv/bin/activate
 
-# append_to_ld_library_path_if_not /usr/local/lib
-append_to_ld_library_path_if_not /usr/local/stow/libgit2-26/lib
+# PYTHONPYCACHEPREFIX
+#   If this is set, Python will write .pyc files in a mirror directory tree at this path,
+#   instead of in __pycache__ directories within the source tree.
+#   This is equivalent to specifying the -X pycache_prefix=PATH option.
+export PYTHONPYCACHEPREFIX=$PWD/.pycache
 
-append_to_python_path_if_not ${PWD}
+# append_to_python_path_if_not ${PWD}
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 39f5e8f..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_wheel]
-python-tag = py34
diff --git a/setup.py b/setup.py
deleted file mode 100755
index 5c1a7f3..0000000
--- a/setup.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/env python3
-
-####################################################################################################
-#
-# CodeReview - A Code Review GUI
-# Copyright (C) 2017 Fabrice Salvaire
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-####################################################################################################
-
-####################################################################################################
-
-import glob
-import sys
-
-from setuptools import setup, find_packages, Extension
-setuptools_available = True
-
-####################################################################################################
-
-if sys.version_info < (3,):
-    print('CodeReview requires Python 3', file=sys.stderr)
-    sys.exit(1)
-
-exec(compile(open('setup_data.py').read(), 'setup_data.py', 'exec'))
-
-####################################################################################################
-
-setup_dict.update(dict(
-    # include_package_data=True, # Look in MANIFEST.in
-    scripts=['bin/pyqgit', 'bin/diff-viewer'],
-    packages=find_packages(exclude=['unit-test']),
-    ext_modules=[
-        Extension('CodeReview.PatienceDiff._patiencediff_c',
-                  ['CodeReview/PatienceDiff/_patiencediff_c.c']),
-        Extension('CodeReview.TextDistance.levenshtein_distance_c',
-                  ['CodeReview/TextDistance/levenshtein_distance.c'])
-    ],
-    package_data={
-        'CodeReview.Config': ['logging.yml'],
-    },
-    data_files=[
-        ('share/CodeReview/icons', glob.glob('share/icons/*.png')),
-        ('share/CodeReview/icons/32x32', glob.glob('share/icons/32x32/*.png')),
-        ('share/CodeReview/icons/48x48', glob.glob('share/icons/48x48/*.png')),
-        ('share/CodeReview/icons/svg', glob.glob('share/icons/svg/*.svg')),
-    ],
-
-    platforms='any',
-    zip_safe=False, # due to data files
-
-    # cf. http://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers=[
-        "Topic :: Software Development :: Version Control",
-        "Intended Audience :: Developers",
-        "Development Status :: 5 - Production/Stable",
-        "License :: OSI Approved :: GNU General Public License (GPL)",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3.4",
-        ],
-
-    install_requires=[
-        'PyQt5',
-        'PyYAML',
-        'Pygments',
-        'pygit2',
-    ],
-))
-
-####################################################################################################
-
-setup(**setup_dict)
diff --git a/CodeReview/Application/ApplicationBase.py b/src/CodeReview/Application/ApplicationBase.py
similarity index 96%
rename from CodeReview/Application/ApplicationBase.py
rename to src/CodeReview/Application/ApplicationBase.py
index 9af7839..91ce959 100644
--- a/CodeReview/Application/ApplicationBase.py
+++ b/src/CodeReview/Application/ApplicationBase.py
@@ -26,8 +26,8 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.Path import to_absolute_path
-from CodeReview.Tools.Platform import Platform
+from CodeReview.Common.Path import to_absolute_path
+from CodeReview.Common.Platform import Platform
 
 ####################################################################################################
 
@@ -69,7 +69,6 @@ def _exception_hook(self, exception_type, exception_value, exception_traceback):
     ##############################################
 
     def execute_given_user_script(self):
-
         if self._args.user_script is not None:
             self.execute_user_script(self._args.user_script)
 
@@ -91,11 +90,9 @@ def execute_user_script(self, file_name):
     ##############################################
 
     def exit(self):
-
         sys.exit(0)
 
     ##############################################
 
     def show_message(self, message=None, **kwargs):
-
         self._logger.info(message)
diff --git a/CodeReview/GUI/ui/__init__.py b/src/CodeReview/Application/__init__.py
similarity index 100%
rename from CodeReview/GUI/ui/__init__.py
rename to src/CodeReview/Application/__init__.py
diff --git a/src/CodeReview/Common/ArgparseAction.py b/src/CodeReview/Common/ArgparseAction.py
new file mode 100644
index 0000000..24e5097
--- /dev/null
+++ b/src/CodeReview/Common/ArgparseAction.py
@@ -0,0 +1,53 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+"""Module to implement argparse actions.
+
+"""
+
+####################################################################################################
+
+__all__ = [
+    'PathAction',
+]
+
+####################################################################################################
+
+import argparse
+from pathlib import Path
+
+####################################################################################################
+
+class PathAction(argparse.Action):
+
+    """Class to implement argparse action for path."""
+
+    ##############################################
+
+    def __call__(self, parser, namespace, values, option_string=None):
+
+        if values is not None:
+            if isinstance(values, list):
+                path = [Path(x) for x in values]
+            else:
+                path = Path(values)
+        else:
+            path = None
+        setattr(namespace, self.dest, path)
diff --git a/CodeReview/Tools/AttributeDictionaryInterface.py b/src/CodeReview/Common/AttributeDictionaryInterface.py
similarity index 100%
rename from CodeReview/Tools/AttributeDictionaryInterface.py
rename to src/CodeReview/Common/AttributeDictionaryInterface.py
diff --git a/CodeReview/Tools/BackTrace.py b/src/CodeReview/Common/BackTrace.py
similarity index 100%
rename from CodeReview/Tools/BackTrace.py
rename to src/CodeReview/Common/BackTrace.py
diff --git a/CodeReview/Tools/EnumFactory.py b/src/CodeReview/Common/EnumFactory.py
similarity index 100%
rename from CodeReview/Tools/EnumFactory.py
rename to src/CodeReview/Common/EnumFactory.py
diff --git a/CodeReview/Tools/IteratorTools.py b/src/CodeReview/Common/IteratorTools.py
similarity index 100%
rename from CodeReview/Tools/IteratorTools.py
rename to src/CodeReview/Common/IteratorTools.py
diff --git a/CodeReview/Logging/ExceptionHook.py b/src/CodeReview/Common/Logging/ExceptionHook.py
similarity index 97%
rename from CodeReview/Logging/ExceptionHook.py
rename to src/CodeReview/Common/Logging/ExceptionHook.py
index 6a58b4c..b005ede 100644
--- a/CodeReview/Logging/ExceptionHook.py
+++ b/src/CodeReview/Common/Logging/ExceptionHook.py
@@ -25,8 +25,8 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.Platform import Platform
-from CodeReview.Tools.Singleton import singleton
+from CodeReview.Common.Platform import Platform
+from CodeReview.Common.Singleton import singleton
 
 ####################################################################################################
 
diff --git a/CodeReview/Logging/Logging.py b/src/CodeReview/Common/Logging/Logging.py
similarity index 52%
rename from CodeReview/Logging/Logging.py
rename to src/CodeReview/Common/Logging/Logging.py
index 9d26302..5cbe272 100644
--- a/CodeReview/Logging/Logging.py
+++ b/src/CodeReview/Common/Logging/Logging.py
@@ -16,17 +16,30 @@
 #
 ####################################################################################################
 
+"""This subpackage implements logging facilities.
+
+"""
+
 ####################################################################################################
 
-import yaml
+__all__ = ['setup_logging']
+
+####################################################################################################
+
+from pathlib import Path
+from typing import Optional
 import logging
 import logging.config
+import os
+import sys
+
+import yaml
 
 ####################################################################################################
 
-from CodeReview.Logging.ExceptionHook import DispatcherExceptionHook, StderrExceptionHook
-from CodeReview.Tools.Singleton import singleton
-import CodeReview.Config.ConfigInstall as ConfigInstall
+from .ExceptionHook import DispatcherExceptionHook, StderrExceptionHook
+from CodeReview.Common.Singleton import singleton
+from CodeReview.Config import ConfigInstall
 
 ####################################################################################################
 
@@ -36,27 +49,55 @@ class ExceptionHookInitialiser:
     ##############################################
 
     def __init__(self, context, stderr=True):
-
         self._context = context
         self._dispatcher_exception_hook = DispatcherExceptionHook()
-
         if stderr:
             stderr_exception_hook = StderrExceptionHook()
             self._dispatcher_exception_hook.register_observer(stderr_exception_hook)
 
 ####################################################################################################
 
-def setup_logging(application_name, config_file=ConfigInstall.Logging.default_config_file):
+LEVEL_ENV = 'CodeReviewLogLevel'
+
+def setup_logging(
+        application_name: str,
+        config_file: str | Path = ConfigInstall.Logging.default_config_file,
+        logging_level: Optional[int] = None,
+) -> logging.Logger:
 
     logging_config_file_name = ConfigInstall.Logging.find(config_file)
-    logging_config = yaml.load(open(logging_config_file_name, 'r'))
+    with open(logging_config_file_name, 'r', encoding='utf8') as fh:
+        logging_config = yaml.load(fh, Loader=yaml.SafeLoader)
 
     # Fixme: \033 is not interpreted in YAML
-    formatter_config = logging_config['formatters']['ansi']['format']
-    logging_config['formatters']['ansi']['format'] = formatter_config.replace('<ESC>', '\033')
+    if ConfigInstall.OS.on_linux:
+        formatter_config = logging_config['formatters']['ansi']['format']
+        logging_config['formatters']['ansi']['format'] = formatter_config.replace('<ESC>', '\033')
+
+    # Use "simple" formatter for Windows and OSX
+    # and "ansi" for Linux
+    if ConfigInstall.OS.on_windows or ConfigInstall.OS.on_osx:
+        formatter = 'simple'
+    else:
+        formatter = 'ansi'
+    logging_config['handlers']['console']['formatter'] = formatter
+
+    # Load YAML settings
     logging.config.dictConfig(logging_config)
 
+    # Customise logging level
     logger = logging.getLogger(application_name)
-    logger.info('Start %s' % (application_name))
+    if logging_level is None and LEVEL_ENV in os.environ:
+        level_name = os.environ[LEVEL_ENV]
+        try:
+            logging_level = getattr(logging, level_name.upper())
+        except AttributeError:
+            sys.exit(f'{LEVEL_ENV} environment variable is set to an invalid logging level "{level_name}"')
+    if logging_level:
+        # level can be int or string
+        logger.setLevel(logging_level)
+    # else use logging.yml
+
+    logger.info(f'Start {application_name}')
 
     return logger
diff --git a/CodeReview/Application/__init__.py b/src/CodeReview/Common/Logging/__init__.py
similarity index 100%
rename from CodeReview/Application/__init__.py
rename to src/CodeReview/Common/Logging/__init__.py
diff --git a/CodeReview/Math/Functions.py b/src/CodeReview/Common/Math/Functions.py
similarity index 100%
rename from CodeReview/Math/Functions.py
rename to src/CodeReview/Common/Math/Functions.py
diff --git a/CodeReview/Math/Interval.py b/src/CodeReview/Common/Math/Interval.py
similarity index 99%
rename from CodeReview/Math/Interval.py
rename to src/CodeReview/Common/Math/Interval.py
index c529cd0..31d9897 100644
--- a/CodeReview/Math/Interval.py
+++ b/src/CodeReview/Common/Math/Interval.py
@@ -42,7 +42,7 @@
 
 ####################################################################################################
 
-from CodeReview.Math.Functions import middle
+from CodeReview.Common.Math.Functions import middle
 
 ####################################################################################################
 
diff --git a/CodeReview/Config/__init__.py b/src/CodeReview/Common/Math/__init__.py
similarity index 100%
rename from CodeReview/Config/__init__.py
rename to src/CodeReview/Common/Math/__init__.py
diff --git a/CodeReview/Tools/Path.py b/src/CodeReview/Common/Path.py
similarity index 100%
rename from CodeReview/Tools/Path.py
rename to src/CodeReview/Common/Path.py
diff --git a/CodeReview/Tools/Platform.py b/src/CodeReview/Common/Platform.py
similarity index 96%
rename from CodeReview/Tools/Platform.py
rename to src/CodeReview/Common/Platform.py
index 89bcfb6..256cbe2 100644
--- a/CodeReview/Tools/Platform.py
+++ b/src/CodeReview/Common/Platform.py
@@ -1,4 +1,4 @@
-####################################################################################################
+###################################################################################################
 #
 # CodeReview - A Code Review GUI
 # Copyright (C) 2015 Fabrice Salvaire
@@ -26,8 +26,8 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.EnumFactory import EnumFactory
-from CodeReview.Math.Functions import rint
+from CodeReview.Common.EnumFactory import EnumFactory
+from CodeReview.Common.Math.Functions import rint
 
 ####################################################################################################
 
@@ -47,7 +47,10 @@ def __init__(self):
 
         self.os = self._get_os()
         self.node = platform.node()
-        self.distribution = ' '.join(platform.dist())
+        try:
+            self.distribution = ' '.join(platform.linux_distribution())
+        except:
+            self.distribution = ''
         self.machine = platform.machine()
         self.architecture = platform.architecture()[0]
 
diff --git a/src/CodeReview/Common/Platform2.py b/src/CodeReview/Common/Platform2.py
new file mode 100644
index 0000000..ab23050
--- /dev/null
+++ b/src/CodeReview/Common/Platform2.py
@@ -0,0 +1,285 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+"""Module to query the platform for features.
+
+"""
+
+# Look alternative Python package
+
+####################################################################################################
+
+from enum import Enum, auto
+import os
+import platform
+import sys
+
+####################################################################################################
+
+class PlatformType(Enum):
+
+    Linux = auto()
+    Windows = auto()
+    OSX = auto()
+
+####################################################################################################
+
+class Platform:
+
+    """Class to store platform properties"""
+
+    ##############################################
+
+    def __init__(self):
+
+        self.python_version = platform.python_version()
+
+        self.os = self._get_os()
+        self.node = platform.node()
+        # deprecated in 3.8 see distro package
+        # self.distribution = ' '.join(platform.dist())
+        self.machine = platform.machine()
+        self.architecture = platform.architecture()[0]
+
+        # CPU
+        self.cpu = self._get_cpu()
+        self.number_of_cores = self._get_number_of_cores()
+        self.cpu_khz = self._get_cpu_khz()
+        self.cpu_mhz = int(self._get_cpu_khz()/float(1000)) # rint
+
+        # RAM
+        self.memory_size_kb = self._get_memory_size_kb()
+        self.memory_size_mb = int(self.memory_size_kb/float(1024)) # rint
+
+    ##############################################
+
+    def _get_os(self):
+
+        if os.name in ('nt',):
+            return PlatformType.Windows
+        elif sys.platform in ('linux',):
+            return PlatformType.Linux
+        # Fixme:
+        # elif sys.platform in 'osx':
+        #     return PlatformType.OSX
+        else:
+            raise RuntimeError('unknown platform: {} / {}'.format(os.name, sys.platform))
+
+    ##############################################
+
+    def _get_cpu(self):
+
+        if self.os == PlatformType.Linux:
+            with open('/proc/cpuinfo', 'rt') as cpuinfo:
+                for line in cpuinfo:
+                    if 'model name' in line:
+                        s = line.split(':')[1]
+                        return s.strip().rstrip()
+
+        elif self.os == PlatformType.Windows:
+            raise NotImplementedError
+
+    ##############################################
+
+    def _get_number_of_cores(self):
+
+        if self.os == PlatformType.Linux:
+            number_of_cores = 0
+            with open('/proc/cpuinfo', 'rt') as cpuinfo:
+                for line in cpuinfo:
+                    if 'processor' in line:
+                        number_of_cores += 1
+            return number_of_cores
+
+        elif self.os == PlatformType.Windows:
+            return int(os.getenv('NUMBER_OF_PROCESSORS'))
+
+    ##############################################
+
+    def _get_cpu_khz(self):
+
+        if self.os == PlatformType.Linux:
+            with open('/proc/cpuinfo', 'rt') as cpuinfo:
+                for line in cpuinfo:
+                    if 'cpu MHz' in line:
+                        s = line.split(':')[1]
+                        return int(1000 * float(s))
+
+        if self.os == PlatformType.Windows:
+            raise NotImplementedError
+
+    ##############################################
+
+    def _get_memory_size_kb(self):
+
+        if self.os == PlatformType.Linux:
+            with open('/proc/meminfo', 'rt') as cpuinfo:
+                for line in cpuinfo:
+                    if 'MemTotal' in line:
+                        s = line.split(':')[1][:-3]
+                        return int(s)
+
+        if self.os == PlatformType.Windows:
+            raise NotImplementedError
+
+    ##############################################
+
+    def __str__(self):
+
+        str_template = '''
+Platform {0.node}
+  Hardware:
+    Machine: {0.machine}
+    Architecture: {0.architecture}
+    CPU: {0.cpu}
+      Number of Cores: {0.number_of_cores}
+      CPU Frequence: {0.cpu_mhz} MHz
+    Memory: {0.memory_size_mb} MB
+
+  Python: {0.python_version}
+'''
+
+        return str_template.format(self)
+
+####################################################################################################
+
+class QtPlatform(Platform):
+
+    """Class to store Qt platform properties"""
+
+    ##############################################
+
+    def __init__(self):
+
+        super().__init__()
+
+        # Fixme: QT_VERSION_STR ...
+        from PyQt5 import QtCore, QtWidgets
+        # from QtShim import QtCore, QtWidgets
+
+        self.qt_version = QtCore.QT_VERSION_STR
+        self.pyqt_version = QtCore.PYQT_VERSION_STR
+
+        # Screen
+
+        # try:
+        #     application = QtWidgets.QApplication.instance()
+        #     self.desktop = application.desktop()
+        #     self.number_of_screens = self.desktop.screenCount()
+        # except:
+        #     self.desktop = None
+        #     self.number_of_screens = 0
+        # for i in range(self.number_of_screens):
+        #     self.screens.append(Screen(self, i))
+        try:
+            application = QtWidgets.QApplication.instance()
+            self.screens = [Screen(screen) for screen in application.screens()]
+        except:
+            self.screens = []
+
+        # OpenGL
+        self.gl_renderer = None
+        self.gl_version = None
+        self.gl_vendor = None
+        self.gl_extensions = None
+
+    ##############################################
+
+    @property
+    def number_of_screens(self):
+        return len(self.screens)
+
+    ##############################################
+
+    def query_opengl(self):
+
+        import OpenGL.GL as GL
+
+        self.gl_renderer = GL.glGetString(GL.GL_RENDERER)
+        self.gl_version = GL.glGetString(GL.GL_VERSION)
+        self.gl_vendor = GL.glGetString(GL.GL_VENDOR)
+        self.gl_extensions = GL.glGetString(GL.GL_EXTENSIONS)
+
+    ##############################################
+
+    def __str__(self):
+
+#         str_template = '''
+#    OpenGL
+#      Render: {0.gl_renderer}
+#      Version: {0.gl_version}
+#      Vendor: {0.gl_vendor}
+#    Number of Screens: {0.number_of_screens}
+# '''
+#        message += str_template.format(self)
+
+        message = super().__str__()
+
+        for screen in self.screens:
+            message += str(screen)
+
+        str_template = '''
+  Software Versions:
+    Qt: {0.qt_version}
+    PyQt: {0.pyqt_version}
+'''
+        message += str_template.format(self)
+
+        return message
+
+####################################################################################################
+
+class Screen:
+
+    """Class to store screen properties"""
+
+    ##############################################
+
+    # def __init__(self, platform_obj, screen_id):
+    def __init__(self, qt_screen):
+
+        # self.screen_id = screen_id
+
+        # qt_screen_geometry = platform_obj.desktop.screenGeometry(screen_id)
+        # self.screen_width, self.screen_height = qt_screen_geometry.width(), qt_screen_geometry.height()
+
+        # widget = platform_obj.desktop.screen(screen_id)
+        # self.dpi = widget.physicalDpiX(), widget.physicalDpiY()
+
+        ## qt_available_geometry = self.desktop.availableGeometry(screen_id)
+
+        self.name = qt_screen.name()
+        size = qt_screen.size()
+        self.screen_width, self.screen_height = size.width(), size.height()
+        self.dpi = qt_screen.physicalDotsPerInch()
+        self.dpi_x = qt_screen.physicalDotsPerInchX()
+        self.dpi_y = qt_screen.physicalDotsPerInchY()
+
+    ##############################################
+
+    def __str__(self):
+
+        str_template = """
+  Screen {0.name}
+    geometry   {0.screen_width}x{0.screen_height} px
+    resolution {0.dpi:.2f} dpi
+"""
+
+        return str_template.format(self)
diff --git a/CodeReview/Tools/ProgramOptions.py b/src/CodeReview/Common/ProgramOptions.py
similarity index 97%
rename from CodeReview/Tools/ProgramOptions.py
rename to src/CodeReview/Common/ProgramOptions.py
index 0860aa0..b4e5dbf 100644
--- a/CodeReview/Tools/ProgramOptions.py
+++ b/src/CodeReview/Common/ProgramOptions.py
@@ -22,7 +22,7 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.Path import to_absolute_path
+from CodeReview.Common.Path import to_absolute_path
 
 ####################################################################################################
 
diff --git a/CodeReview/Tools/RevisionVersion.py b/src/CodeReview/Common/RevisionVersion.py
similarity index 98%
rename from CodeReview/Tools/RevisionVersion.py
rename to src/CodeReview/Common/RevisionVersion.py
index 069ce1b..1d97023 100644
--- a/CodeReview/Tools/RevisionVersion.py
+++ b/src/CodeReview/Common/RevisionVersion.py
@@ -36,7 +36,7 @@ class RevisionVersion:
     def __init__(self, version):
 
         if isinstance(version, str):
-            match = re.match('v([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?', version)
+            match = re.match(r'v([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?', version)
             if match is not None:
                 groups = match.groups()
                 self.major, self.minor, self.revision = [int(x) for x in groups[:3]]
diff --git a/CodeReview/Tools/Singleton.py b/src/CodeReview/Common/Singleton.py
similarity index 100%
rename from CodeReview/Tools/Singleton.py
rename to src/CodeReview/Common/Singleton.py
diff --git a/CodeReview/Tools/Slice.py b/src/CodeReview/Common/Slice.py
similarity index 100%
rename from CodeReview/Tools/Slice.py
rename to src/CodeReview/Common/Slice.py
diff --git a/CodeReview/Tools/StringTools.py b/src/CodeReview/Common/StringTools.py
similarity index 100%
rename from CodeReview/Tools/StringTools.py
rename to src/CodeReview/Common/StringTools.py
diff --git a/CodeReview/Repository/__init__.py b/src/CodeReview/Common/__init__.py
similarity index 100%
rename from CodeReview/Repository/__init__.py
rename to src/CodeReview/Common/__init__.py
diff --git a/CodeReview/Config/Config.py b/src/CodeReview/Config/Config.py
similarity index 100%
rename from CodeReview/Config/Config.py
rename to src/CodeReview/Config/Config.py
diff --git a/src/CodeReview/Config/ConfigInstall.py b/src/CodeReview/Config/ConfigInstall.py
new file mode 100644
index 0000000..fc2c25d
--- /dev/null
+++ b/src/CodeReview/Config/ConfigInstall.py
@@ -0,0 +1,87 @@
+####################################################################################################
+
+from pathlib import Path as plPath
+import sys
+
+####################################################################################################
+
+import CodeReview.Common.Path as PathTools   # due to Path class
+
+####################################################################################################
+
+class OsFactory:
+
+    ##############################################
+
+    def __init__(self) -> None:
+        if sys.platform.startswith('linux'):
+            self._name = 'linux'
+        elif sys.platform.startswith('win'):
+            self._name = 'windows'
+        elif sys.platform.startswith('darwin'):
+            self._name = 'osx'
+
+    ##############################################
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def on_linux(self) -> bool:
+        return self._name == 'linux'
+
+    @property
+    def on_windows(self) -> bool:
+        return self._name == 'windows'
+
+    @property
+    def on_osx(self) -> bool:
+        return self._name == 'osx'
+
+OS = OsFactory()
+
+####################################################################################################
+
+_this_file = plPath(__file__).absolute()
+
+class Path:
+
+    CodeReview_module_directory = _this_file.parents[1]
+    config_directory = _this_file.parent
+
+    ##############################################
+
+    @staticmethod
+    def share_directory() -> plPath:
+        return Path.CodeReview_module_directory.joinpath('share')
+
+####################################################################################################
+
+class Logging:
+
+    default_config_file = 'logging.yml'
+    directories = (Path.config_directory,)
+
+    ##############################################
+
+    @staticmethod
+    def find(config_file: str) -> plPath:
+        return PathTools.find(config_file, Logging.directories)
+
+####################################################################################################
+
+class Icon:
+
+    icon_directory = Path.share_directory().joinpath('icons')
+
+    ##############################################
+
+    @staticmethod
+    def find(file_name: str, icon_size: int) -> plPath:
+        if icon_size == 'svg':
+            size_directory = icon_size
+        else:
+            size_directory = f'{icon_size}x{icon_size}'
+        icon_directory = Icon.icon_directory.joinpath(size_directory)
+        return PathTools.find(file_name, (icon_directory,))
diff --git a/CodeReview/Config/Messages.py b/src/CodeReview/Config/Messages.py
similarity index 100%
rename from CodeReview/Config/Messages.py
rename to src/CodeReview/Config/Messages.py
diff --git a/src/CodeReview/Config/__init__.py b/src/CodeReview/Config/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/CodeReview/Config/logging.yml b/src/CodeReview/Config/logging.yml
similarity index 75%
rename from CodeReview/Config/logging.yml
rename to src/CodeReview/Config/logging.yml
index 4dac77e..867d8a1 100644
--- a/CodeReview/Config/logging.yml
+++ b/src/CodeReview/Config/logging.yml
@@ -21,17 +21,19 @@ handlers:
 
   console:
     class: logging.StreamHandler
-    level: DEBUG
+    # level: DEBUG
+    # level: INFO
+    # level: WARNING
     formatter: ansi
     stream: ext://sys.stdout
 
 ####################################################################################################
 
 root:
-  level: DEBUG
-  #level: INFO
-  #level: WARNING
-  #handlers: [console]
+  # level: DEBUG
+  # level: INFO
+  level: WARNING
+  # handlers: [console]
 
 ####################################################################################################
 
@@ -43,14 +45,16 @@ loggers:
 #
 
   pyqgit:
-    level: DEBUG
-    #level: INFO
+    # level: DEBUG
+    # level: INFO
+    level: WARNING
     handlers: [console]
     propagate: no
 
   diff-viewer:
-    level: DEBUG
-    #level: INFO
+    # level: DEBUG
+    # level: INFO
+    level: WARNING
     handlers: [console]
     propagate: no
 
@@ -60,13 +64,7 @@ loggers:
 #
 
   CodeReview:
-    level: DEBUG
-    #level: INFO
-    #level: WARNING
+    # level: DEBUG
+    # level: INFO
+    # level: WARNING
     handlers: [console]
-
-####################################################################################################
-#
-# End
-#
-####################################################################################################
diff --git a/CodeReview/Diff/RawTextDocument.py b/src/CodeReview/Diff/RawTextDocument.py
similarity index 99%
rename from CodeReview/Diff/RawTextDocument.py
rename to src/CodeReview/Diff/RawTextDocument.py
index 2b05ab1..8a4a1bb 100644
--- a/CodeReview/Diff/RawTextDocument.py
+++ b/src/CodeReview/Diff/RawTextDocument.py
@@ -56,8 +56,8 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.Slice import FlatSlice, LineSlice
-from CodeReview.Tools.IteratorTools import pairwise
+from CodeReview.Common.Slice import FlatSlice, LineSlice
+from CodeReview.Common.IteratorTools import pairwise
 
 ####################################################################################################
 
diff --git a/CodeReview/Diff/RawTextDocumentDiff.py b/src/CodeReview/Diff/RawTextDocumentDiff.py
similarity index 99%
rename from CodeReview/Diff/RawTextDocumentDiff.py
rename to src/CodeReview/Diff/RawTextDocumentDiff.py
index b2120f8..88439b7 100644
--- a/CodeReview/Diff/RawTextDocumentDiff.py
+++ b/src/CodeReview/Diff/RawTextDocumentDiff.py
@@ -63,8 +63,8 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.EnumFactory import EnumFactory
-from CodeReview.Tools.Slice import FlatSlice, LineSlice
+from CodeReview.Common.EnumFactory import EnumFactory
+from CodeReview.Common.Slice import FlatSlice, LineSlice
 
 ####################################################################################################
 
diff --git a/CodeReview/Diff/SyntaxHighlighter.py b/src/CodeReview/Diff/SyntaxHighlighter.py
similarity index 98%
rename from CodeReview/Diff/SyntaxHighlighter.py
rename to src/CodeReview/Diff/SyntaxHighlighter.py
index 062cdfd..ba8a6bd 100644
--- a/CodeReview/Diff/SyntaxHighlighter.py
+++ b/src/CodeReview/Diff/SyntaxHighlighter.py
@@ -33,7 +33,7 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.Slice import FlatSlice
+from CodeReview.Common.Slice import FlatSlice
 from CodeReview.Diff.TextDocumentModel import TextDocumentModel, TextBlock, TextFragment
 
 ####################################################################################################
diff --git a/CodeReview/Diff/TextDocumentDiffModel.py b/src/CodeReview/Diff/TextDocumentDiffModel.py
similarity index 99%
rename from CodeReview/Diff/TextDocumentDiffModel.py
rename to src/CodeReview/Diff/TextDocumentDiffModel.py
index 79ca2d5..4e4d6d0 100644
--- a/CodeReview/Diff/TextDocumentDiffModel.py
+++ b/src/CodeReview/Diff/TextDocumentDiffModel.py
@@ -30,7 +30,7 @@
 
 from .RawTextDocumentDiff import chunk_type
 from .TextDocumentModel import TextDocumentModel, TextBlock, TextFragment
-from CodeReview.Tools.Slice import LineSlice
+from CodeReview.Common.Slice import LineSlice
 
 ####################################################################################################
 
diff --git a/CodeReview/Diff/TextDocumentModel.py b/src/CodeReview/Diff/TextDocumentModel.py
similarity index 100%
rename from CodeReview/Diff/TextDocumentModel.py
rename to src/CodeReview/Diff/TextDocumentModel.py
diff --git a/src/CodeReview/Diff/__init__.py b/src/CodeReview/Diff/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/CodeReview/GUI/Base/GuiApplicationBase.py b/src/CodeReview/GUI/Base/GuiApplicationBase.py
similarity index 100%
rename from CodeReview/GUI/Base/GuiApplicationBase.py
rename to src/CodeReview/GUI/Base/GuiApplicationBase.py
diff --git a/CodeReview/GUI/Base/MainWindowBase.py b/src/CodeReview/GUI/Base/MainWindowBase.py
similarity index 100%
rename from CodeReview/GUI/Base/MainWindowBase.py
rename to src/CodeReview/GUI/Base/MainWindowBase.py
diff --git a/CodeReview/Diff/__init__.py b/src/CodeReview/GUI/Base/__init__.py
similarity index 100%
rename from CodeReview/Diff/__init__.py
rename to src/CodeReview/GUI/Base/__init__.py
diff --git a/CodeReview/GUI/DiffViewer/DiffViewerApplication.py b/src/CodeReview/GUI/DiffViewer/DiffViewerApplication.py
similarity index 99%
rename from CodeReview/GUI/DiffViewer/DiffViewerApplication.py
rename to src/CodeReview/GUI/DiffViewer/DiffViewerApplication.py
index 7ae041e..9b62dd3 100644
--- a/CodeReview/GUI/DiffViewer/DiffViewerApplication.py
+++ b/src/CodeReview/GUI/DiffViewer/DiffViewerApplication.py
@@ -52,13 +52,11 @@ def __init__(self, args):
     ##############################################
 
     def _init_actions(self):
-
         super(DiffViewerApplication, self)._init_actions()
 
     ##############################################
 
     def post_init(self):
-
         super(DiffViewerApplication, self).post_init()
         self._main_window.open_files(self._args.file1, self._args.file2, self._args.show)
         self._init_file_system_watcher()
@@ -81,9 +79,7 @@ def show_message(self, message=None, timeout=0, warn=False):
     ##############################################
 
     def _init_file_system_watcher(self):
-
         # Fixme: catch all events
-
         self._file_system_watcher = QtCore.QFileSystemWatcher()
         self._file_system_watcher.directoryChanged.connect(self.directory_changed)
         self._file_system_watcher.fileChanged.connect(self.file_changed)
diff --git a/CodeReview/GUI/DiffViewer/DiffViewerMainWindow.py b/src/CodeReview/GUI/DiffViewer/DiffViewerMainWindow.py
similarity index 95%
rename from CodeReview/GUI/DiffViewer/DiffViewerMainWindow.py
rename to src/CodeReview/GUI/DiffViewer/DiffViewerMainWindow.py
index 96f8990..0e91b49 100644
--- a/CodeReview/GUI/DiffViewer/DiffViewerMainWindow.py
+++ b/src/CodeReview/GUI/DiffViewer/DiffViewerMainWindow.py
@@ -168,13 +168,13 @@ def _create_actions(self):
         # Fixme: only git
         if self._repository:
             self._stage_action = \
-                                 QtWidgets.QAction('Stage',
-                                                   self,
-                                                   toolTip='Stage file',
-                                                   shortcut='Ctrl+S',
-                                                   checkable=True,
-                                                   triggered=self._stage,
-                                 )
+                QtWidgets.QAction('Stage',
+                                  self,
+                                  toolTip='Stage file',
+                                  shortcut='Ctrl+S',
+                                  checkable=True,
+                                  triggered=self._stage,
+                )
         else:
             self._stage_action = None
 
@@ -245,7 +245,6 @@ def _create_toolbar(self):
     ##############################################
 
     def init_menu(self):
-
         super().init_menu()
 
     ##############################################
@@ -303,20 +302,20 @@ def open_files(self, file1, file2, show=False):
 
         paths = (file1, file2)
         texts = (None, None)
-        metadatas = [dict(path=file1, document_type='file', last_modification_date=None),
-                     dict(path=file2, document_type='file', last_modification_date=None)]
+        metadatas = [
+            dict(path=file1, document_type='file', last_modification_date=None),
+            dict(path=file2, document_type='file', last_modification_date=None),
+        ]
         self.diff_documents(paths, texts, metadatas, show=show)
 
     ##############################################
 
     def _absolute_path(self, path):
-
         return os.path.join(self._workdir, path)
 
     ##############################################
 
     def _read_file(self, path):
-
         with open(self._absolute_path(path)) as f:
             text = f.read()
         return text
@@ -324,7 +323,6 @@ def _read_file(self, path):
     ##############################################
 
     def _is_directory(self, path):
-
         if path is None:
             return False
         else:
@@ -333,10 +331,8 @@ def _is_directory(self, path):
     ##############################################
 
     def _get_lexer(self, path, text):
-
         if path is None:
             return None
-
         return self._lexer_cache.guess(path, text)
 
     ##############################################
@@ -394,8 +390,10 @@ def diff_text_documents(self, show=False):
 
         self._highlighted_documents = []
         if not show:
-            file_diff = TwoWayFileDiffFactory().process(* raw_text_documents,
-                                                        number_of_lines_of_context=number_of_lines_of_context)
+            file_diff = TwoWayFileDiffFactory().process(
+                * raw_text_documents,
+                number_of_lines_of_context=number_of_lines_of_context,
+            )
             document_models = TextDocumentDiffModelFactory().process(file_diff)
             for raw_text_document, document_model, lexer in zip(raw_text_documents, document_models, lexers):
                 if lexer is not None and highlight:
@@ -411,7 +409,7 @@ def diff_text_documents(self, show=False):
             # cursor.begin_block(side, text_block.frame_type)
             # File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/DiffWidget.py", line 99, in begin_block
             # if ((side == LEFT and frame_type == chunk_type.insert) or
-            # File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/Tools/EnumFactory.py", line 107, in __eq__
+            # File "/home/gv/fabrice/unison-osiris/git-python/CodeReview/Common/EnumFactory.py", line 107, in __eq__
             # return self._value == int(other)
             # TypeError: int() argument must be a string or a number, not 'NoneType'
             for raw_text_document, lexer in zip(raw_text_documents, self._lexers):
@@ -436,7 +434,6 @@ def _set_document_models(self):
     ##############################################
 
     def _on_font_size_change(self, index=None, refresh=True):
-
         self._diff_view.set_font(self._font_size_combobox.currentData())
         if refresh:
             self._refresh() # Fixme: block position are not updated
@@ -444,9 +441,7 @@ def _on_font_size_change(self, index=None, refresh=True):
     ##############################################
 
     def _on_file_system_changed(self, path):
-
         # only used for main window
-
         self._logger.info(path)
         self._refresh()
 
diff --git a/CodeReview/GUI/DiffViewer/DiffWidget.py b/src/CodeReview/GUI/DiffViewer/DiffWidget.py
similarity index 95%
rename from CodeReview/GUI/DiffViewer/DiffWidget.py
rename to src/CodeReview/GUI/DiffViewer/DiffWidget.py
index 3ecebc6..e6328af 100644
--- a/CodeReview/GUI/DiffViewer/DiffWidget.py
+++ b/src/CodeReview/GUI/DiffViewer/DiffWidget.py
@@ -27,9 +27,9 @@
 ####################################################################################################
 
 from CodeReview.Diff.RawTextDocumentDiff import chunk_type
-from CodeReview.Math.Functions import number_of_digits
-from CodeReview.Tools.IteratorTools import pairwise, iter_with_last_flag
-from CodeReview.Tools.StringTools import remove_trailing_newline
+from CodeReview.Common.Math.Functions import number_of_digits, rint
+from CodeReview.Common.IteratorTools import pairwise, iter_with_last_flag
+from CodeReview.Common.StringTools import remove_trailing_newline
 import CodeReview.GUI.DiffViewer.DiffWidgetConfig as DiffWidgetConfig
 from .SyntaxHighlighterStyle import SyntaxHighlighterStyle
 
@@ -173,8 +173,9 @@ def paintEvent(self, event):
             if text_block.frame_type is None or text_block.frame_type == chunk_type.equal:
                 continue
             # Shift text block in the viewport
-            y_top = text_block.y_top - y
-            y_bottom = text_block.y_bottom - y
+            # ensure type is int for painter.func
+            y_top = rint(text_block.y_top - y)
+            y_bottom = rint(text_block.y_bottom - y)
             if y_bottom < y_min:
                 continue
             if y_top > y_max:
@@ -245,10 +246,11 @@ def paintEvent(self, event):
                 or text_block_left.frame_type in (chunk_type.equal, chunk_type.header)):
                 continue
 
-            y_top_left = text_block_left.y_top - y_left -1
-            y_bottom_left = text_block_left.y_bottom - y_left +1
-            y_top_right = text_block_right.y_top - y_right -1
-            y_bottom_right = text_block_right.y_bottom - y_right +1
+            # ensure type is int for painter.func
+            y_top_left = rint(text_block_left.y_top - y_left -1)
+            y_bottom_left = rint(text_block_left.y_bottom - y_left +1)
+            y_top_right = rint(text_block_right.y_top - y_right -1)
+            y_bottom_right = rint(text_block_right.y_bottom - y_right +1)
 
             if y_top_left < 0 and y_bottom_right < 0:
                 continue
@@ -349,7 +351,7 @@ def update_scroll_bar(self, scroll_bar, value):
 
         maximum1 = scroll_bar1.maximum()
         if maximum1:
-            value = scroll_bar2.minimum() + scroll_bar2.maximum() * (value - scroll_bar1.minimum()) / maximum1
+            value = rint(scroll_bar2.minimum() + scroll_bar2.maximum() * (value - scroll_bar1.minimum()) / maximum1)
             # cannot use blockSignals
             self._ignore_scroll_bar_update_signal = True
             scroll_bar2.setValue(value)
diff --git a/CodeReview/GUI/DiffViewer/DiffWidgetConfig.py b/src/CodeReview/GUI/DiffViewer/DiffWidgetConfig.py
similarity index 100%
rename from CodeReview/GUI/DiffViewer/DiffWidgetConfig.py
rename to src/CodeReview/GUI/DiffViewer/DiffWidgetConfig.py
diff --git a/CodeReview/GUI/DiffViewer/LexerCache.py b/src/CodeReview/GUI/DiffViewer/LexerCache.py
similarity index 100%
rename from CodeReview/GUI/DiffViewer/LexerCache.py
rename to src/CodeReview/GUI/DiffViewer/LexerCache.py
diff --git a/CodeReview/GUI/DiffViewer/SyntaxHighlighterStyle.py b/src/CodeReview/GUI/DiffViewer/SyntaxHighlighterStyle.py
similarity index 100%
rename from CodeReview/GUI/DiffViewer/SyntaxHighlighterStyle.py
rename to src/CodeReview/GUI/DiffViewer/SyntaxHighlighterStyle.py
diff --git a/CodeReview/GUI/Base/__init__.py b/src/CodeReview/GUI/DiffViewer/__init__.py
similarity index 100%
rename from CodeReview/GUI/Base/__init__.py
rename to src/CodeReview/GUI/DiffViewer/__init__.py
diff --git a/CodeReview/GUI/Forms/CriticalErrorForm.py b/src/CodeReview/GUI/Forms/CriticalErrorForm.py
similarity index 96%
rename from CodeReview/GUI/Forms/CriticalErrorForm.py
rename to src/CodeReview/GUI/Forms/CriticalErrorForm.py
index ce74c7d..68054b6 100644
--- a/CodeReview/GUI/Forms/CriticalErrorForm.py
+++ b/src/CodeReview/GUI/Forms/CriticalErrorForm.py
@@ -26,8 +26,8 @@
 
 ####################################################################################################
 
-from CodeReview.Logging.ExceptionHook import format_exception
-import CodeReview.Tools.BackTrace as BackTrace
+from CodeReview.Common.Logging.ExceptionHook import format_exception
+import CodeReview.Common.BackTrace as BackTrace
 
 ####################################################################################################
 
diff --git a/CodeReview/GUI/DiffViewer/__init__.py b/src/CodeReview/GUI/Forms/__init__.py
similarity index 100%
rename from CodeReview/GUI/DiffViewer/__init__.py
rename to src/CodeReview/GUI/Forms/__init__.py
diff --git a/CodeReview/GUI/LogBrowser/CommitTableModel.py b/src/CodeReview/GUI/LogBrowser/CommitTableModel.py
similarity index 94%
rename from CodeReview/GUI/LogBrowser/CommitTableModel.py
rename to src/CodeReview/GUI/LogBrowser/CommitTableModel.py
index 84a4ee8..40d0430 100644
--- a/CodeReview/GUI/LogBrowser/CommitTableModel.py
+++ b/src/CodeReview/GUI/LogBrowser/CommitTableModel.py
@@ -27,7 +27,7 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.EnumFactory import EnumFactory
+from CodeReview.Common.EnumFactory import EnumFactory
 
 ####################################################################################################
 
@@ -46,14 +46,14 @@ class CommitTableModel(QtCore.QAbstractTableModel):
         'similarity',
         ))
 
-    __titles__ = (
+    _TITLES = (
         'Modification',
         'Old Path',
         'New Path',
         'Similarity',
     )
 
-    __status_to_letter__ = {
+    _STATUS_TO_LETTER = {
         git.GIT_DELTA_DELETED: 'D',
         git.GIT_DELTA_MODIFIED: 'M',
         git.GIT_DELTA_ADDED: 'A',
@@ -84,7 +84,7 @@ def update(self, diff):
             else:
                 new_file_path = ''
                 similarity = ''
-            status = self.__status_to_letter__[delta.status]
+            status = self._STATUS_TO_LETTER[delta.status]
             row = (status, delta.old_file.path, new_file_path, similarity, patch)
             self._rows.append(row)
 
@@ -95,14 +95,12 @@ def update(self, diff):
     ##############################################
 
     def __iter__(self):
-
         for row in self._rows:
             yield row[-1]
 
     ##############################################
 
     def __getitem__(self, i):
-
         return self._rows[i][-1]
 
     ##############################################
@@ -143,26 +141,23 @@ def headerData(self, section, orientation, role=Qt.DisplayRole):
 
         if role == Qt.DisplayRole:
             if orientation == Qt.Horizontal:
-                return QtCore.QVariant(self.__titles__[section])
+                return QtCore.QVariant(self._TITLES[section])
 
         return QtCore.QVariant()
 
     ##############################################
 
     def columnCount(self, index=QtCore.QModelIndex()):
-
-        return len(self.__titles__)
+        return len(self._TITLES)
 
     ##############################################
 
     def rowCount(self, index=QtCore.QModelIndex()):
-
         return self._number_of_rows
 
     ##############################################
 
     def sort(self, column, order):
-
        reverse = order == Qt.DescendingOrder
        self._rows.sort(key=lambda x:x[column], reverse=reverse)
        self.modelReset.emit()
diff --git a/CodeReview/GUI/LogBrowser/LogBrowserApplication.py b/src/CodeReview/GUI/LogBrowser/LogBrowserApplication.py
similarity index 79%
rename from CodeReview/GUI/LogBrowser/LogBrowserApplication.py
rename to src/CodeReview/GUI/LogBrowser/LogBrowserApplication.py
index a5e8f1f..01abcbe 100644
--- a/CodeReview/GUI/LogBrowser/LogBrowserApplication.py
+++ b/src/CodeReview/GUI/LogBrowser/LogBrowserApplication.py
@@ -16,20 +16,26 @@
 #
 ####################################################################################################
 
+# Fixme: move to a QML application
+#   QmlRepository < QmlLog < QmlCommit < QmlPatch
+
 ###################################################################################################
 
+from pathlib import Path
 import logging
+import math
 import os
 
 from PyQt5 import QtCore, QtWidgets
 
 ####################################################################################################
 
+from .CommitTableModel import CommitTableModel
+from .LogTableModel import LogTableModel, LogTableFilterProxyModel
 from CodeReview.Application.ApplicationBase import ApplicationBase
 from CodeReview.GUI.Base.GuiApplicationBase import GuiApplicationBase
 from CodeReview.Repository.Git import RepositoryNotFound, GitRepository
-from .CommitTableModel import CommitTableModel
-from .LogTableModel import LogTableModel
+from CodeReview.Review import Review
 
 ####################################################################################################
 
@@ -56,7 +62,6 @@ def __init__(self, args):
     ##############################################
 
     def _init_actions(self):
-
         super(LogBrowserApplication, self)._init_actions()
 
     ##############################################
@@ -68,6 +73,10 @@ def post_init(self):
         self._init_file_system_watcher()
         self._main_window.show_working_tree_diff()
 
+        self._main_window._diff_a.setText(self._args.diff_a)
+        self._main_window._diff_b.setText(self._args.diff_b)
+        self._main_window._on_diff_ab()
+
     ##############################################
 
     def show_message(self, message=None, timeout=0, warn=False):
@@ -87,6 +96,8 @@ def show_message(self, message=None, timeout=0, warn=False):
 
     def _init_repository(self):
 
+        # Fixme: code place
+
         self._logger.info('Init Repository')
 
         if self._args.path is None:
@@ -100,22 +111,34 @@ def _init_repository(self):
             self._repository = None
             return
 
+        review_path = self._repository.workdir.joinpath('review.json')
+        self._review = Review(review_path)
+
+        branch_name = self._repository.branch_name
+        branch_name = branch_name.replace('refs/heads/', ' refs/heads/   ')
+        self._main_window._branch_name.setText('Branch:   {}'.format(branch_name))
+
         self._log_table_model = LogTableModel(self._repository)
+        self._log_table_filter = LogTableFilterProxyModel()
+        self._log_table_filter.setSourceModel(self._log_table_model)
+        # self._log_table_filter.???.connect(self._main_window._on_log_table_filter_changed)
+        self._main_window._on_log_table_filter_changed()
         log_table = self._main_window._log_table
-        log_table.setModel(self._log_table_model)
+        # log_table.setModel(self._log_table_model)
+        log_table.setModel(self._log_table_filter)
         # Set the column widths
-        column_enum = self._log_table_model.column_enum
+        column_enum = self._log_table_model.COLUMN_ENUM
         width = 0
         for column in (
             column_enum.revision,
             # column_enum.message,
             column_enum.date,
-            column_enum.comitter,
+            column_enum.committer,
         ):
             log_table.resizeColumnToContents(int(column))
             width += log_table.columnWidth(int(column))
         width = log_table.width() - width
-        width *= .9 # Fixme: subtract spaces ...
+        width = int(math.ceil(width * .9)) # Fixme: subtract spaces ...
         log_table.setColumnWidth(int(column_enum.message), width)
 
         self._commit_table_model = CommitTableModel()
@@ -135,6 +158,18 @@ def reload_repository(self):
     def repository(self):
         return self._repository
 
+    @property
+    def log_table_model(self):
+        return self._log_table_model
+
+    @property
+    def log_table_filter(self):
+        return self._log_table_filter
+
+    @property
+    def review(self):
+        return self._review
+
     ##############################################
 
     def _init_file_system_watcher(self):
@@ -175,33 +210,30 @@ def _setup_file_system_watcher(self):
     def watch_directories(self):
 
         paths = []
-        git_path = self._repository.join_repository_path('.git')
+        git_path = str(self._repository.join_repository_path('.git'))
         for root, _, _ in os.walk(self._repository.workdir):
             if not root.startswith(git_path):
                 paths.append(root)
-        self._logger.info('watch {}'.format(paths))
+        # self._logger.info('watch {}'.format(paths))
         self._file_system_watcher.addPaths(paths)
 
     ##############################################
 
     def watch(self, path):
-
-        absolut_path = self._repository.join_repository_path(path)
+        absolut_path = str(self._repository.join_repository_path(path))
         self._logger.info(absolut_path)
         self._file_system_watcher.addPath(absolut_path)
 
     ##############################################
 
     def unwatch(self, path):
-
-        absolut_path = self._repository.join_repository_path(path)
+        absolut_path = str(self._repository.join_repository_path(path))
         self._logger.info(absolut_path)
         self._file_system_watcher.removePath(absolut_path)
 
     ##############################################
 
     def _unwatch_paths(self, paths):
-
         # Fixme: code ???
         if paths:
             self._file_system_watcher.removePaths(paths)
@@ -209,11 +241,9 @@ def _unwatch_paths(self, paths):
     ##############################################
 
     def unwatch_directories(self):
-
         self._unwatch_paths(self._file_system_watcher.directories())
 
     ##############################################
 
     def unwatch_files(self):
-
         self._unwatch_paths(self._file_system_watcher.files())
diff --git a/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py b/src/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py
similarity index 56%
rename from CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py
rename to src/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py
index aafeb39..1ead56f 100644
--- a/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py
+++ b/src/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py
@@ -19,18 +19,20 @@
 ####################################################################################################
 
 import logging
-import os
 
 from PyQt5 import QtWidgets
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, QRegExp
+from PyQt5.QtWidgets import QSizePolicy
 
 import pygit2 as git
 
 ####################################################################################################
 
+from .LogTableModel import LogTableModel
 from CodeReview.GUI.Base.MainWindowBase import MainWindowBase
 from CodeReview.GUI.Widgets.IconLoader import IconLoader
 from CodeReview.GUI.Widgets.MessageBox import MessageBox
+from CodeReview.Review import ReviewNote
 
 ####################################################################################################
 
@@ -42,20 +44,24 @@ class LogBrowserMainWindow(MainWindowBase):
 
     _logger = _module_logger.getChild('LogBrowserMainWindow')
 
+    SHA_SHORTCUT_LENGTH = 8
+
     ##############################################
 
     def __init__(self, parent=None):
 
         super(LogBrowserMainWindow, self).__init__(title='CodeReview Log Browser', parent=parent)
 
-        icon_loader = IconLoader()
-        self.setWindowIcon(icon_loader['code-review@svg'])
+        self._icon_loader = IconLoader()
+        self.setWindowIcon(self._icon_loader['code-review@svg'])
 
         self._current_revision = None
         self._diff = None
         self._current_patch_index = None
         self._diff_window = None
 
+        self._review_note = None
+
         self._init_ui()
         self._create_actions()
         self._create_toolbar()
@@ -69,20 +75,120 @@ def _init_ui(self):
 
         # Table models are set in application
 
-        self._central_widget = QtWidgets.QWidget(self)
-        self.setCentralWidget(self._central_widget)
+        central_widget = QtWidgets.QWidget(self)
+        self.setCentralWidget(central_widget)
+
+        top_vertical_layout = QtWidgets.QVBoxLayout(central_widget)
 
-        self._vertical_layout = QtWidgets.QVBoxLayout(self._central_widget)
         self._message_box = MessageBox(self)
+        top_vertical_layout.addWidget(self._message_box)
+
+        horizontal_layout = QtWidgets.QHBoxLayout()
+        top_vertical_layout.addLayout(horizontal_layout)
+
+        vertical_layout = QtWidgets.QVBoxLayout()
+        horizontal_layout.addLayout(vertical_layout)
+
+        horizontal_layout2 = QtWidgets.QHBoxLayout()
+        vertical_layout.addLayout(horizontal_layout2)
+        button = QtWidgets.QPushButton('Diff')
+        button.clicked.connect(self._on_diff_ab)
+        horizontal_layout2.addWidget(button)
+        button = QtWidgets.QPushButton()
+        button.setIcon(self._icon_loader['edit-delete@svg'])
+        horizontal_layout2.addWidget(button)
+        self._diff_a = QtWidgets.QLineEdit(self)
+        button.clicked.connect(lambda: self._diff_a.clear())
+        horizontal_layout2.addWidget(self._diff_a)
+        button = QtWidgets.QPushButton()
+        button.setIcon(self._icon_loader['media-playlist-repeat@svg'])
+        button.clicked.connect(self._on_diff_exchange)
+        horizontal_layout2.addWidget(button)
+        self._diff_b = QtWidgets.QLineEdit(self)
+        horizontal_layout2.addWidget(self._diff_b)
+        button = QtWidgets.QPushButton()
+        button.setIcon(self._icon_loader['edit-delete@svg'])
+        button.clicked.connect(lambda: self._diff_b.clear())
+        horizontal_layout2.addWidget(button)
+        # for widget in (self._diff_a, self._diff_b):
+        #     widget.editingFinished.connect(self._on_diff_ab)
+
+        self._branch_name = QtWidgets.QLineEdit(self)
+        self._branch_name.setReadOnly(True)
+        vertical_layout.addWidget(self._branch_name)
+
+        self._row_count = QtWidgets.QLabel('')
+        vertical_layout.addWidget(self._row_count)
+
+        row = 0
+        grid_layout = QtWidgets.QGridLayout()
+        horizontal_layout.addLayout(grid_layout)
+        label = QtWidgets.QLabel('Committer Filter')
+        committer_filter = QtWidgets.QLineEdit()
+        committer_filter.textChanged.connect(self._on_committer_filter_changed)
+        for i, widget in enumerate((label, committer_filter)):
+            grid_layout.addWidget(widget, row, i)
+        row += 1
+
+        horizontal_layout = QtWidgets.QHBoxLayout()
+        top_vertical_layout.addLayout(horizontal_layout)
+        label = QtWidgets.QLabel('Message Filter')
+        message_filter = QtWidgets.QLineEdit()
+        message_filter.textChanged.connect(self._on_message_filter_changed)
+        for i, widget in enumerate((label, message_filter)):
+            grid_layout.addWidget(widget, row, i)
+        row += 1
+
+        horizontal_layout = QtWidgets.QHBoxLayout()
+        top_vertical_layout.addLayout(horizontal_layout)
+        label = QtWidgets.QLabel('SHA Filter')
+        sha_filter = QtWidgets.QLineEdit()
+        sha_filter.textChanged.connect(self._on_sha_filter_changed)
+        for i, widget in enumerate((label, sha_filter)):
+            grid_layout.addWidget(widget, row, i)
+        row += 1
+
         splitter = QtWidgets.QSplitter()
+        top_vertical_layout.addWidget(splitter)
         splitter.setOrientation(Qt.Vertical)
+
         self._log_table = QtWidgets.QTableView()
-        self._commit_table = QtWidgets.QTableView()
+        splitter.addWidget(self._log_table)
 
-        for widget in (self._message_box, splitter):
-            self._vertical_layout.addWidget(widget)
-        for widget in (self._log_table, self._commit_table):
-            splitter.addWidget(widget)
+        bottom_widget = QtWidgets.QWidget()
+        splitter.addWidget(bottom_widget)
+        bottom_horizontal_layout = QtWidgets.QHBoxLayout()
+        bottom_widget.setLayout(bottom_horizontal_layout)
+
+        vertical_layout = QtWidgets.QVBoxLayout()
+        bottom_horizontal_layout.addLayout(vertical_layout)
+        self._commit_table = QtWidgets.QTableView()
+        vertical_layout.addWidget(self._commit_table)
+
+        vertical_layout = QtWidgets.QVBoxLayout()
+        bottom_horizontal_layout.addLayout(vertical_layout)
+        self._commit_sha = QtWidgets.QLineEdit()
+        self._commit_sha.setReadOnly(True)
+        vertical_layout.addWidget(self._commit_sha)
+        self._parent_labels = []
+        for i in range(2):
+            horizontal_layout = QtWidgets.QHBoxLayout()
+            vertical_layout.addLayout(horizontal_layout)
+            button = QtWidgets.QPushButton('Go')
+            button.clicked.connect(lambda state, index=i: self._on_go_clicked(index))
+            horizontal_layout.addWidget(button)
+            parent = QtWidgets.QLineEdit()
+            parent.setReadOnly(True)
+            horizontal_layout.addWidget(parent)
+            self._parent_labels.append(parent)
+        self._review_comment = QtWidgets.QTextEdit()
+        vertical_layout.addWidget(self._review_comment)
+        horizontal_layout = QtWidgets.QHBoxLayout()
+        vertical_layout.addLayout(horizontal_layout)
+        save_button = QtWidgets.QPushButton('Save')
+        save_button.clicked.connect(self._on_save_review)
+        horizontal_layout.addItem(QtWidgets.QSpacerItem(0, 10, QSizePolicy.Expanding))
+        horizontal_layout.addWidget(save_button)
 
         table = self._log_table
         table.setSelectionMode(QtWidgets.QTableView.SingleSelection)
@@ -106,7 +212,6 @@ def _init_ui(self):
     ##############################################
 
     def finish_table_connections(self):
-
         self._log_table.selectionModel().currentRowChanged.connect(self._update_commit_table)
         #!# Fixme: reopen diff viewer window when repository change
         #!# self._commit_table.selectionModel().currentRowChanged.connect(self._on_clicked_table)
@@ -115,8 +220,6 @@ def finish_table_connections(self):
 
     def _create_actions(self):
 
-        icon_loader = IconLoader()
-
         self._stagged_mode_action = \
             QtWidgets.QAction('Stagged',
                               self,
@@ -151,7 +254,7 @@ def _create_actions(self):
         self._all_change_mode_action.setChecked(True)
 
         self._reload_action = \
-            QtWidgets.QAction(icon_loader['view-refresh@svg'],
+            QtWidgets.QAction(self._icon_loader['view-refresh@svg'],
                               'Refresh',
                               self,
                               toolTip='Refresh',
@@ -162,7 +265,6 @@ def _create_actions(self):
     ##############################################
 
     def _create_toolbar(self):
-
         self._tool_bar = self.addToolBar('Diff on Working Tree')
         for item in self._action_group.actions():
             self._tool_bar.addAction(item)
@@ -172,7 +274,6 @@ def _create_toolbar(self):
     ##############################################
 
     def init_menu(self):
-
         super(LogBrowserMainWindow, self).init_menu()
 
     ##############################################
@@ -208,9 +309,11 @@ def _on_directory_changed(self, path):
 
         if self._diff_window is not None:
             if self.number_of_patches:
-                self._current_patch_index = 0
-                self._diff_window.update_patch_index()
-                self.reload_current_patch()
+                # Fixme: issue with _flycheck
+                # self._current_patch_index = 0
+                # self._diff_window.update_patch_index()
+                # self.reload_current_patch()
+                pass
             else:
                 self._diff_window.close()
 
@@ -258,29 +361,59 @@ def show_working_tree_diff(self):
     ##############################################
 
     def _update_working_tree_diff(self):
-
         # Check log table is on working tree
         if self._log_table.currentIndex().row() == 0:
             self._update_commit_table()
 
     ##############################################
 
+    def _reset_parent(self):
+        self._current_commit = None
+        for parent in self._parent_labels:
+            parent.clear()
+
+    ##############################################
+
     def _update_commit_table(self, index=None):
 
+        self._commit_sha.clear()
+        self._reset_parent()
+
+        if self._review_note is not None:
+            self._on_save_review()
+            self._review_note = None
+        self._review_comment.clear()
+
         if index is not None:
+            index = self._application.log_table_filter.mapToSource(index)
             index = index.row()
         else:
             index = 0
 
+        # Diff a=old b=new commit
+
         if index:
             self._current_revision = index
-            log_table_model = self._log_table.model()
-            commit1 = log_table_model[index]
-            try:
-                commit2 = log_table_model[index +1]
-                kwargs = dict(a=commit2, b=commit1) # Fixme:
-            except IndexError:
-                kwargs = dict(a=commit1)
+            # log_table_model = self._log_table.model()
+            log_table_model = self._application.log_table_model
+            self._current_commit = log_table_model[index]
+
+            sha = str(self._current_commit.id)
+            self._commit_sha.setText('Commit: {}   /   {}'.format(sha[:self.SHA_SHORTCUT_LENGTH], sha))
+            if len(self._current_commit.parents) > len(self._parent_labels):
+                self.show_message('Fixme: More than 2 parents')
+            for commit, parent_label in zip(self._current_commit.parents, self._parent_labels):
+                parent_label.setText('Parent: {}   ({})'.format(str(commit.id)[:self.SHA_SHORTCUT_LENGTH], commit.message))
+                parent_label.setCursorPosition(0)
+
+            self._review_note = self._application.review[sha]
+            if self._review_note is not None:
+                self._review_comment.setText(self._review_note.text)
+            else:
+                self._review_note = ReviewNote(sha)
+            commit_a = self._current_commit.parents[0] # take first parent
+            kwargs = dict(a=commit_a, b=self._current_commit)
+
         else: # working directory
             self._current_revision = None
             if self._stagged_mode_action.isChecked():
@@ -303,7 +436,6 @@ def _update_commit_table(self, index=None):
     ##############################################
 
     def _on_clicked_table(self, index):
-
         # called when a commit row is clicked
         self._logger.info('')
         self._current_patch_index = index.row()
@@ -337,7 +469,6 @@ def _create_diff_viewer_window(self):
     ##############################################
 
     def _on_diff_window_closed(self):
-
         self._application.unwatch_files() # Fixme: only current patch !
         self._diff_window = None
         self._logger.info("Diff Viewer closed")
@@ -346,7 +477,7 @@ def _on_diff_window_closed(self):
 
     def _show_patch(self, patch):
 
-        self._logger.info("")
+        self._logger.info('')
 
         self._application.unwatch_files()
 
@@ -368,23 +499,26 @@ def _show_patch(self, patch):
             elif delta.status == git.GIT_DELTA_DELETED:
                 paths = (old_path, None)
             repository = self._application.repository
-            texts = [repository.file_content(blob_id)
-                     for blob_id in (delta.old_file.id, delta.new_file.id)]
-            metadatas = [dict(path=old_path, document_type='file', last_modification_date=None),
-                         dict(path=new_path, document_type='file', last_modification_date=None)]
+            texts = [
+                repository.file_content(blob_id)
+                for blob_id in (delta.old_file.id, delta.new_file.id)
+            ]
+            metadatas = [
+                dict(path=old_path, document_type='file', last_modification_date=None),
+                dict(path=new_path, document_type='file', last_modification_date=None),
+            ]
             self._diff_window.diff_documents(paths, texts, metadatas, workdir=repository.workdir)
             self._application.watch(new_path)
         else:
             self._logger.info('revision {} Binary '.format(self._current_revision) + new_path)
-        # Fixme: show image pdf ...
 
+        # Fixme: show image pdf ...
         # Monitor file change
 
     ##############################################
 
     @property
     def _last_path_index(self):
-
         return len(self._diff) -1
 
     ##############################################
@@ -419,7 +553,90 @@ def next_patch(self):
     ##############################################
 
     def reload_current_patch(self):
-
         if self._current_patch_index is not None:
             patch = self._diff[self._current_patch_index]
             self._show_patch(patch)
+
+    ##############################################
+
+    def _on_committer_filter_changed(self, text):
+        log_table_filter = self._application.log_table_filter
+        log_table_filter.setFilterRegExp(QRegExp(text, Qt.CaseInsensitive, QRegExp.FixedString))
+        log_table_filter.setFilterKeyColumn(LogTableModel.COLUMN_ENUM.committer)
+        self._on_log_table_filter_changed() # seems to just work, no need to connect signal
+
+    ##############################################
+
+    def _on_message_filter_changed(self, text):
+        log_table_filter = self._application.log_table_filter
+        log_table_filter.setFilterRegExp(QRegExp(text, Qt.CaseInsensitive, QRegExp.FixedString))
+        log_table_filter.setFilterKeyColumn(LogTableModel.COLUMN_ENUM.message)
+        self._on_log_table_filter_changed()
+
+    ##############################################
+
+    def _on_sha_filter_changed(self, text):
+        log_table_filter = self._application.log_table_filter
+        if text:
+            # Fixme: ???
+            # regexp = '^' + text
+            regexp = text
+        else:
+            regexp = ''
+        log_table_filter.setFilterRegExp(QRegExp(regexp, Qt.CaseInsensitive, QRegExp.FixedString))
+        log_table_filter.setFilterKeyColumn(LogTableModel.COLUMN_ENUM.sha)
+        self._on_log_table_filter_changed()
+
+    ##############################################
+
+    def _on_log_table_filter_changed(self):
+        log_table_filter = self._application.log_table_filter
+        self._row_count.setText('{} commits'.format(log_table_filter.rowCount()))
+
+    ##############################################
+
+    def _on_save_review(self):
+        self._review_note.text = self._review_comment.toPlainText()
+        self._application.review.add(self._review_note)
+        self._application.review.save()
+
+    ##############################################
+
+    def _on_go_clicked(self, parent_index):
+        if self._current_commit is not None:
+            try:
+                parent_commit_sha = str(self._current_commit.parent_ids[parent_index])
+                index = self._application.log_table_model.find_commit(parent_commit_sha)
+                if index is not None:
+                    self._logger.info('Found parent commit {} {}'.format(parent_index, parent_commit_sha))
+                    self._log_table.selectRow(index.row())
+            except IndexError:
+                pass
+
+    ##############################################
+
+    def _on_diff_exchange(self):
+        diff_a = self._diff_a.text()
+        diff_b = self._diff_b.text()
+        self._diff_a.setText(diff_b)
+        self._diff_b.setText(diff_a)
+        self._on_diff_ab()
+
+    ##############################################
+
+    def _on_diff_ab(self):
+
+        diff_a = self._diff_a.text()
+        diff_b = self._diff_b.text()
+
+        if diff_a and diff_b:
+            try:
+                kwargs = dict(a=diff_a, b=diff_b)
+                self._diff = self._application.repository.diff(**kwargs)
+
+                commit_table_model = self._commit_table.model()
+                commit_table_model.update(self._diff)
+                self._commit_table.resizeColumnsToContents()
+            except ValueError as e:
+                self._logger.warning(e)
+                self.show_message(str(e))
diff --git a/CodeReview/GUI/LogBrowser/LogTableModel.py b/src/CodeReview/GUI/LogBrowser/LogTableModel.py
similarity index 61%
rename from CodeReview/GUI/LogBrowser/LogTableModel.py
rename to src/CodeReview/GUI/LogBrowser/LogTableModel.py
index 20cbec3..1b98469 100644
--- a/CodeReview/GUI/LogBrowser/LogTableModel.py
+++ b/src/CodeReview/GUI/LogBrowser/LogTableModel.py
@@ -16,6 +16,8 @@
 #
 ####################################################################################################
 
+__all__ = ['LogTableFilterProxyModel', 'LogTableModel']
+
 ####################################################################################################
 
 import datetime
@@ -28,61 +30,116 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.EnumFactory import EnumFactory
+from CodeReview.Common.EnumFactory import EnumFactory
+
+####################################################################################################
+
+class LogTableFilterProxyModel(QtCore.QSortFilterProxyModel):
+
+    ##############################################
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+    ##############################################
+
+    def __getitem__(self, row):
+        # Fixme: don't work ???
+        model = self.sourceModel()
+        index = model.createIndex(row, 0)
+        index = self.mapToSource(index)
+        row = index.row()
+        return model[row]
+
+    ##############################################
+
+    # def filterAcceptsRow(source_row, source_parent):
 
 ####################################################################################################
 
 class LogTableModel(QtCore.QAbstractTableModel):
 
-    column_enum = EnumFactory('LogColumnEnum', (
+    COLUMN_ENUM = EnumFactory('LogColumnEnum', (
         'revision',
         'message',
         'sha',
         'date',
-        'comitter',
+        'committer',
         ))
 
-    __titles__ = (
+    _TITLES = (
         'Revision',
         'Message',
         'Id SH1',
         'Date',
-        'Comitter',
+        'Committer',
     )
 
     ##############################################
 
     def __init__(self, repository):
 
-        super(LogTableModel, self).__init__()
+        super().__init__()
 
-        commits = repository.commits()
-        self._number_of_rows = len(commits)
+        self._tags = repository.tags
+        commits = repository.commits_for_head
         self._rows = [('', 'Working directory changes', '', '', None)]
-        self._rows.extend([self._commit_data(i, commit)
-                           for i, commit in enumerate(commits)])
+        commits = list(commits)
+        self._number_of_rows = len(commits)
+        for i, commit in enumerate(commits):
+            row = self._commit_data(i, commit)
+            self._rows.append(row)
+
+    ##############################################
+
+    def _match_tag(self, commit):
+
+        for ref in self._tags:
+            ref_commit = ref.peel()
+            if commit.id == ref_commit.id:
+                return ref
+        return None
 
     ##############################################
 
     def _commit_data(self, i, commit):
 
+        ref = self._match_tag(commit)
+        if ref is not None:
+            tag_name = ref.name
+            tag_name = tag_name.replace('refs/tags/', '')
+            tag_name = '[{}] '.format(tag_name)
+        else:
+            tag_name = ''
+
+        author = commit.author
+        committer = commit.committer
+
         return (
             self._number_of_rows - i -1,
-            commit.message,
-            commit.hex,
+            tag_name + commit.message.strip(),
+            str(commit.id),
             fromtimestamp(commit.commit_time).strftime('%Y-%m-%d %H:%M:%S'),
-            commit.committer.name, # author
+            '{} <{}>'.format(committer.name, committer.email),
+
             commit,
         )
 
     ##############################################
 
     def __getitem__(self, i):
-
         return self._rows[i][-1]
 
     ##############################################
 
+    def find_commit(self, sha):
+        for i, row in enumerate(self._rows):
+            if row[2] == sha:
+                return self.createIndex(i, 0)
+        return None
+
+    ##############################################
+
     def data(self, index, role=Qt.DisplayRole):
 
         if not index.isValid(): # or not(0 <= index.row() < self._number_of_rows):
@@ -107,7 +164,7 @@ def headerData(self, section, orientation, role=Qt.DisplayRole):
 
         if role == Qt.DisplayRole:
             if orientation == Qt.Horizontal:
-                return QtCore.QVariant(self.__titles__[section])
+                return QtCore.QVariant(self._TITLES[section])
             else:
                 return QtCore.QVariant(self._number_of_rows - section)
 
@@ -116,11 +173,9 @@ def headerData(self, section, orientation, role=Qt.DisplayRole):
     ##############################################
 
     def columnCount(self, index=QtCore.QModelIndex()):
-
-        return len(self.__titles__)
+        return len(self._TITLES)
 
     ##############################################
 
     def rowCount(self, index=QtCore.QModelIndex()):
-
         return self._number_of_rows
diff --git a/src/CodeReview/GUI/LogBrowser/__init__.py b/src/CodeReview/GUI/LogBrowser/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/CodeReview/GUI/Widgets/IconLoader.py b/src/CodeReview/GUI/Widgets/IconLoader.py
similarity index 95%
rename from CodeReview/GUI/Widgets/IconLoader.py
rename to src/CodeReview/GUI/Widgets/IconLoader.py
index bf0ffb3..328ec26 100644
--- a/CodeReview/GUI/Widgets/IconLoader.py
+++ b/src/CodeReview/GUI/Widgets/IconLoader.py
@@ -25,8 +25,8 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.Singleton import SingletonMetaClass
-import CodeReview.Config.ConfigInstall as ConfigInstall
+from CodeReview.Common.Singleton import SingletonMetaClass
+from CodeReview.Config import ConfigInstall
 
 ####################################################################################################
 
@@ -37,53 +37,44 @@ class IconLoader(object, metaclass=SingletonMetaClass):
     ##############################################
 
     def __init__(self):
-
         self._cache = {}
 
     ##############################################
 
     def _mangle_icon_name(self, icon_name, icon_size):
-
         return icon_name + '@' + str(icon_size)
 
     ##############################################
 
     def _demangle_icon_name(self, icon_name):
-
         if '@' in icon_name:
             icon_name, icon_size = icon_name.split('@')
             if icon_size != 'svg':
                 icon_size = int(icon_size)
         else:
             icon_size = self.icon_size
-
         return icon_name, icon_size
 
     ##############################################
 
     def __getitem__(self, icon_name):
-
         icon_name, icon_size = self._demangle_icon_name(icon_name)
         return self.get_icon(icon_name, icon_size)
 
     ##############################################
 
     def get_icon(self, icon_name, icon_size=icon_size):
-
         mangled_icon_name = self._mangle_icon_name(icon_name, icon_size)
         if mangled_icon_name not in self._cache:
             icon_path = self._find(icon_name, icon_size)
             self._cache[mangled_icon_name] = QtGui.QIcon(icon_path)
-
         return self._cache[mangled_icon_name]
 
     ##############################################
 
     def _find(self, file_name, icon_size):
-
         if icon_size == 'svg':
             extension = '.svg'
         else:
             extension = '.png'
-
         return ConfigInstall.Icon.find(file_name + extension, icon_size)
diff --git a/CodeReview/GUI/Widgets/MessageBox.py b/src/CodeReview/GUI/Widgets/MessageBox.py
similarity index 100%
rename from CodeReview/GUI/Widgets/MessageBox.py
rename to src/CodeReview/GUI/Widgets/MessageBox.py
diff --git a/CodeReview/GUI/Forms/__init__.py b/src/CodeReview/GUI/Widgets/__init__.py
similarity index 100%
rename from CodeReview/GUI/Forms/__init__.py
rename to src/CodeReview/GUI/Widgets/__init__.py
diff --git a/src/CodeReview/GUI/__init__.py b/src/CodeReview/GUI/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/CodeReview/GUI/ui/Makefile.pyqt b/src/CodeReview/GUI/ui/Makefile.pyqt
similarity index 100%
rename from CodeReview/GUI/ui/Makefile.pyqt
rename to src/CodeReview/GUI/ui/Makefile.pyqt
diff --git a/src/CodeReview/GUI/ui/__init__.py b/src/CodeReview/GUI/ui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/CodeReview/GUI/ui/critical_error_form.ui b/src/CodeReview/GUI/ui/critical_error_form.ui
similarity index 100%
rename from CodeReview/GUI/ui/critical_error_form.ui
rename to src/CodeReview/GUI/ui/critical_error_form.ui
diff --git a/CodeReview/GUI/ui/critical_error_form_ui.py b/src/CodeReview/GUI/ui/critical_error_form_ui.py
similarity index 100%
rename from CodeReview/GUI/ui/critical_error_form_ui.py
rename to src/CodeReview/GUI/ui/critical_error_form_ui.py
diff --git a/src/CodeReview/GitHub/Account.py b/src/CodeReview/GitHub/Account.py
new file mode 100644
index 0000000..f45cb40
--- /dev/null
+++ b/src/CodeReview/GitHub/Account.py
@@ -0,0 +1,97 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2020 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from pathlib import Path
+import getpass
+import logging
+
+from github import Github # http://pygithub.readthedocs.io/en/latest/
+import github3 # https://github.com/sigmavirus24/github3.py
+
+####################################################################################################
+
+_module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
+class Account:
+
+    _logger = _module_logger.getChild('Account')
+
+    ##############################################
+
+    def __init__(self):
+        self._github = None
+
+    ##############################################
+
+    @property
+    def credentials_path(self):
+        return Path.home().joinpath('.github-token') # Fixme: Windows / OSX ???
+
+    ##############################################
+
+    @classmethod
+    def two_factor_callback():
+        otp = ''
+        while not otp:
+            # The user could accidentally press Enter before being ready,
+            # let's protect them from doing that.
+            otp = getpass.getpass(prompt='OTP: ', stream=None)
+        return otp
+
+    ##############################################
+
+    def make_token_file(self, user, password, note_url='', two_factor_callback=None):
+
+        note = 'github-api'
+        scopes = ['user', 'repo']
+
+        authorisation = github3.authorize(
+            user, password,
+            scopes,
+            note, note_url,
+            two_factor_callback=two_factor_callback,
+        )
+
+        with open(self.credentials_path, 'w') as fd:
+            # fd.write(authorisation.token + '\n')
+            # fd.write(str(authorisation.id))
+            fd.write(authorisation.token)
+
+    ##############################################
+
+    def login(self):
+
+        if self._github is None:
+            with open(self.credentials_path, 'r') as fd:
+                token = fd.readline().strip()
+                # token_id = fd.readline().strip()
+
+            self._github = Github(login_or_token=token)
+            # gh = github3.login(token=token)
+
+    ##############################################
+
+    @property
+    def github(self):
+        return self._github
diff --git a/src/CodeReview/GitHub/__init__.py b/src/CodeReview/GitHub/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/CodeReview/PatienceDiff/__init__.py b/src/CodeReview/PatienceDiff/__init__.py
similarity index 100%
rename from CodeReview/PatienceDiff/__init__.py
rename to src/CodeReview/PatienceDiff/__init__.py
diff --git a/CodeReview/PatienceDiff/_patiencediff_c.c b/src/CodeReview/PatienceDiff/_patiencediff_c.c
similarity index 100%
rename from CodeReview/PatienceDiff/_patiencediff_c.c
rename to src/CodeReview/PatienceDiff/_patiencediff_c.c
diff --git a/CodeReview/PatienceDiff/_patiencediff_py.py b/src/CodeReview/PatienceDiff/_patiencediff_py.py
similarity index 100%
rename from CodeReview/PatienceDiff/_patiencediff_py.py
rename to src/CodeReview/PatienceDiff/_patiencediff_py.py
diff --git a/CodeReview/PatienceDiff/python-compat.h b/src/CodeReview/PatienceDiff/python-compat.h
similarity index 100%
rename from CodeReview/PatienceDiff/python-compat.h
rename to src/CodeReview/PatienceDiff/python-compat.h
diff --git a/src/CodeReview/QmlApplication/ApplicationMetadata.py b/src/CodeReview/QmlApplication/ApplicationMetadata.py
new file mode 100644
index 0000000..076369a
--- /dev/null
+++ b/src/CodeReview/QmlApplication/ApplicationMetadata.py
@@ -0,0 +1,69 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+__all__ = [
+    'ApplicationMetadata',
+]
+
+####################################################################################################
+
+from CodeReview import __version__
+
+####################################################################################################
+
+_about_message_template = '''
+<h1>CodeReview</h1>
+
+<p>Version: {0.version}</p>
+
+<p>Home Page: <a href="{0.url}">{0.url}</a></p>
+
+<p>Copyright (C) {0.year} Fabrice Salvaire</p>
+
+<h2>Therms</h2>
+
+<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p>
+
+<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>. </p>
+'''
+
+####################################################################################################
+
+class ApplicationMetadata:
+
+    organisation_name = 'CodeReview'
+    organisation_domain = 'code-review.org' # Fixme: fake
+
+    name = 'CodeReview'
+    display_name = 'CodeReview — A Code Review GUI'
+
+    version = str(__version__)
+
+    year = 2020
+
+    url = 'https://github.com/FabriceSalvaire/CodeReview'
+
+    ##############################################
+
+    @classmethod
+    def about_message(cls):
+        return _about_message_template.format(cls)
diff --git a/src/CodeReview/QmlApplication/ApplicationSettings.py b/src/CodeReview/QmlApplication/ApplicationSettings.py
new file mode 100644
index 0000000..c0b82fe
--- /dev/null
+++ b/src/CodeReview/QmlApplication/ApplicationSettings.py
@@ -0,0 +1,173 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+"""Module to implement a application settings.
+
+"""
+
+####################################################################################################
+
+__all__ = [
+    'ApplicationSettings',
+    'Shortcut',
+]
+
+####################################################################################################
+
+import logging
+
+# Fixme:
+from PyQt5.QtCore import QSettings
+from PyQt5.QtQml import QQmlListProperty
+from QtShim.QtCore import (
+    Property, Signal, Slot, QObject,
+    # QUrl,
+)
+
+from . import DefaultSettings
+from .DefaultSettings import Shortcuts
+
+####################################################################################################
+
+_module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
+class Shortcut(QObject):
+
+    _logger = _module_logger.getChild('Shortcut')
+
+    ##############################################
+
+    def __init__(self, settings, name, display_name, sequence):
+
+        super().__init__()
+
+        self._settings = settings
+        self._name = name
+        self._display_name = display_name
+        self._default_sequence = sequence
+        self._sequence = sequence
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def name(self):
+        return self._name
+
+    @Property(str, constant=True)
+    def display_name(self):
+        return self._display_name
+
+    @Property(str, constant=True)
+    def default_sequence(self):
+        return self._default_sequence
+
+    ##############################################
+
+    sequence_changed = Signal()
+
+    @Property(str, notify=sequence_changed)
+    def sequence(self):
+        self._logger.info('get sequence {} = {}'.format(self._name, self._sequence))
+        return self._sequence
+
+    @sequence.setter
+    def sequence(self, value):
+        if self._sequence != value:
+            self._logger.info('Shortcut {} = {}'.format(self._name, value))
+            self._sequence = value
+            self._settings.set_shortcut(self)
+            self.sequence_changed.emit()
+
+####################################################################################################
+
+class ApplicationSettings(QSettings):
+
+    """Class to implement application settings."""
+
+    _logger = _module_logger.getChild('ApplicationSettings')
+
+    ##############################################
+
+    def __init__(self):
+
+        super().__init__()
+        self._logger.info('Loading settings from {}'.format(self.fileName()))
+
+        self._shortcut_map = {
+            name: Shortcut(self, name, self._shortcut_display_name(name), self._get_shortcut(name))
+            for name in self._shortcut_names
+        }
+        self._shortcuts = list(self._shortcut_map.values())
+
+    ##############################################
+
+    @property
+    def _shortcut_names(self):
+        return [name for name in dir(Shortcuts) if not name.startswith('_')]
+
+    def _shortcut_display_name(self, name):
+        return getattr(Shortcuts, name)[0]
+
+    def _default_shortcut(self, name):
+        return getattr(Shortcuts, name)[1]
+
+    ##############################################
+
+    def _shortcut_path(self, name):
+        return 'shortcut/{}'.format(name)
+
+    ##############################################
+
+    def _get_shortcut(self, name):
+        path = self._shortcut_path(name)
+        if self.contains(path):
+            return self.value(path)
+        else:
+            return self._default_shortcut(name)
+
+    ##############################################
+
+    def set_shortcut(self, shortcut):
+        path = self._shortcut_path(shortcut.name)
+        self.setValue(path, shortcut.sequence)
+
+    ##############################################
+
+    @Property(QQmlListProperty, constant=True)
+    def shortcuts(self):
+        return QQmlListProperty(Shortcut, self, self._shortcuts)
+
+    ##############################################
+
+    @Slot(str, result=Shortcut)
+    def shortcut(self, name):
+        return self._shortcut_map.get(name, None)
+
+    ##############################################
+
+    # @Slot(str, result=str)
+    # def shortcut_sequence(self, name):
+    #     shortcut = self._shortcut_map.get(name, None)
+    #     if shortcut is not None:
+    #         return shortcut.sequence
+    #     else:
+    #         return None
diff --git a/src/CodeReview/QmlApplication/DefaultSettings.py b/src/CodeReview/QmlApplication/DefaultSettings.py
new file mode 100644
index 0000000..7763a83
--- /dev/null
+++ b/src/CodeReview/QmlApplication/DefaultSettings.py
@@ -0,0 +1,36 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+__all__ = [
+    'Shortcuts',
+]
+
+####################################################################################################
+
+from pathlib import Path
+
+from PyQt5.QtCore import QCoreApplication
+
+from CodeReview.Config import ConfigInstall
+
+####################################################################################################
+
+class Shortcuts:
+    pass
diff --git a/src/CodeReview/QmlApplication/KeySequenceEditor.py b/src/CodeReview/QmlApplication/KeySequenceEditor.py
new file mode 100644
index 0000000..c132e6e
--- /dev/null
+++ b/src/CodeReview/QmlApplication/KeySequenceEditor.py
@@ -0,0 +1,316 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+#
+#  Translated from C++ to Python
+#
+#   https://github.com/mitchcurtis/slate/blob/master/lib/keysequenceeditor.cpp
+#   https://github.com/mitchcurtis/slate/blob/master/lib/keysequenceeditor.h
+#
+#     Copyright 2016, Mitch Curtis
+#
+#     This file is part of Slate.
+#
+#     Slate is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     Slate is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with Slate. If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+import logging
+
+from PyQt5.QtCore import QMetaEnum
+from PyQt5.QtGui import QKeyEvent, QKeySequence
+from PyQt5.QtQuick import QQuickItem
+
+from QtShim.QtCore import (
+    Property, Signal, Slot, QObject,
+    Qt,
+)
+
+####################################################################################################
+
+_module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
+class KeyHelper(QObject):
+    def key_name(self, index):
+        key_enum_index = self.staticQtMetaObject.indexOfEnumerator('Key')
+        return self.staticQtMetaObject.enumerator(key_enum_index).valueToKey(index)
+
+_key_helper = KeyHelper()
+
+def _key_name(index):
+    # return _key_helper.key_name(index) # Fixme: PyQt5 issue
+    return index
+
+####################################################################################################
+
+class KeySequenceEditor(QQuickItem):
+
+    _logger = _module_logger.getChild('KeySequenceEditor')
+
+    ##############################################
+
+    def __init__(self, parent):
+
+        super().__init__(parent)
+
+        self._default_sequence = QKeySequence() # default sequence
+        self._edited_sequence = QKeySequence() # current/edited sequence
+        self._new_sequence = QKeySequence() # customised sequence
+
+        self._reset_pressed_keys()
+
+    ##############################################
+
+    def _reset_pressed_keys(self):
+        self._logger.info('Clearing pressed keys')
+        self._pressed_keys = []
+
+    ##############################################
+
+    default_sequence_changed = Signal()
+
+    @Property(str, notify=default_sequence_changed)
+    def default_sequence(self):
+        return self._default_sequence.toString()
+
+    ##############################################
+
+    @default_sequence.setter
+    def default_sequence(self, default_sequence):
+
+        if default_sequence != self._default_sequence.toString():
+            self._default_sequence = QKeySequence(default_sequence, QKeySequence.PortableText)
+            self._set_edited_sequence('') # Fixme: why reset ???
+            self.new_sequence = ''
+            self.default_sequence_changed.emit()
+            # This might not always be the case, I'm just lazy.
+            self.is_customised_changed.emit()
+            self.display_sequence_changed.emit()
+
+    ##############################################
+
+    new_sequence_changed = Signal()
+
+    @Property(str, notify=new_sequence_changed)
+    def new_sequence(self):
+        return self._new_sequence.toString()
+
+    @new_sequence.setter
+    def new_sequence(self, new_sequence):
+
+        if new_sequence != self._new_sequence.toString():
+            self._new_sequence = QKeySequence(new_sequence, QKeySequence.PortableText)
+            self._logger.info('Set new sequence to {}'.format(self._new_sequence.toString()))
+            self.new_sequence_changed.emit()
+            self.is_customised_changed.emit()
+            self.display_sequence_changed.emit()
+
+    ##############################################
+
+    display_sequence_changed = Signal()
+
+    @Property(str, notify=display_sequence_changed)
+    def display_sequence(self):
+
+        """Text to show in the sequence editor"""
+
+        if self.hasActiveFocus():
+            # we are editing the sequence
+            sequence = self._edited_sequence
+        elif self._new_sequence.isEmpty():
+            # no new sequence
+            sequence = self._default_sequence
+        else:
+            sequence = self._new_sequence
+
+        return sequence.toString()
+
+    ##############################################
+
+    is_customised_changed = Signal()
+
+    @Property(bool, notify=is_customised_changed)
+    def is_customised(self):
+        """Flag to indicate a new valid sequence is set"""
+        return not self._new_sequence.isEmpty() and self._new_sequence != self._default_sequence
+
+    ##############################################
+
+    @Slot()
+    def reset(self):
+        """Reset the sequence to the default one"""
+        self._set_edited_sequence(self.default_sequence)
+        self.new_sequence = self.default_sequence
+        self._reset_pressed_keys()
+
+    ##############################################
+
+    def _set_edited_sequence(self, edited_sequence=''):
+
+        """Update the edited sequence.
+
+        emit *is_customised* and *display_sequence*
+        """
+
+        if edited_sequence != self._edited_sequence.toString():
+            self._edited_sequence = QKeySequence(edited_sequence, QKeySequence.PortableText)
+            self._logger.info('Edited sequence changed to {}'.format(self._edited_sequence.toString()))
+            self.is_customised_changed.emit()
+            self.display_sequence_changed.emit()
+
+    ##############################################
+
+    def keyPressEvent(self, event):
+
+        """Handler when a key is pressed.
+
+        * use Escape to leave the control
+        * use Enter to accept the sequence
+
+        """
+
+        if event.key() == Qt.Key_Escape:
+            self.setFocus(False)
+
+        elif event.key() == Qt.Key_Return:
+            self._accept()
+
+        elif not event.isAutoRepeat():
+            modifiers = 0
+            # event.modifiers().testFlag(...)
+            if event.modifiers() & Qt.ControlModifier:
+                modifiers |= Qt.CTRL
+            if event.modifiers() & Qt.ShiftModifier:
+                modifiers |= Qt.SHIFT
+            if event.modifiers() & Qt.AltModifier:
+                modifiers |= Qt.ALT
+            if event.modifiers() & Qt.MetaModifier:
+                modifiers |= Qt.META
+
+            if Qt.Key_Shift <= event.key() <= Qt.Key_Meta:
+                self._logger.info('Only modifiers were pressed ({} / {} / {} ignoring'.format(
+                    event.text(),
+                    _key_name(event.key()),
+                    QKeySequence(event.key()).toString()
+                ))
+
+            else:
+                self._pressed_keys.append(event.key() | modifiers)
+                self._logger.info('Adding key {} / {} / {} with modifiers ({}) to pressed keys'.format(
+                    event.text(),
+                    _key_name(event.key()),
+                    QKeySequence(event.key()).toString(),
+                    # UnicodeEncodeError: 'utf-8' codec can't encode character '\udc21' in position 188: surrogates not allowed
+                    QKeySequence(self._pressed_keys[-1]).toString(),
+                ))
+
+                sequence = QKeySequence(*self._pressed_keys) # up to 4 keys
+                self._set_edited_sequence(sequence.toString())
+
+                if len(self._pressed_keys) == 4:
+                    # That was the last key out of four possible keys end it here.
+                    self._accept()
+
+        event.accept()
+
+    ##############################################
+
+    def keyReleaseEvent(self, event):
+        event.accept()
+
+    ##############################################
+
+    def focusInEvent(self, event):
+        event.accept()
+        # The text displaying the shortcut should be cleared when editing begins.
+        self.display_sequence_changed.emit()
+
+    ##############################################
+
+    def focusOutEvent(self, event):
+        event.accept()
+        self._cancel()
+
+    ##############################################
+
+    def _accept(self):
+
+        """Update *new_sequence* if the input is valid."""
+
+        self._logger.info('Attempting to accept input...')
+
+        # If there hasn't been anything new successfully entered yet, check against the original
+        # sequence, otherwise check against the latest successfully entered sequence.
+        # Note: is_customised() assumes that an empty sequence isn't possible we might want to account
+        # for this in the future.
+        if ((self._edited_sequence != self._default_sequence) or
+            (self.is_customised and self._edited_sequence != self._new_sequence)):
+            if self._validate(self._edited_sequence):
+                self._logger.info('Input valid')
+                self.new_sequence = self._edited_sequence.toString()
+            else:
+                self._logger.info('Input invalid')
+                self._cancel()
+        else:
+            self._logger.info('Nothing has changed in the input')
+            # Nothing's changed.
+
+        self._reset_pressed_keys()
+        self.setFocus(False)
+
+    ##############################################
+
+    def _cancel(self):
+
+        self._reset_pressed_keys()
+        if self._edited_sequence.isEmpty():
+            # If the edited sequence is empty, setting it to an empty string
+            # obviously won't change anything, and it will return early.
+            # We need the display sequence to update though, so call it here.
+            self.display_sequence_changed.emit()
+        else:
+            self._set_edited_sequence('')
+
+    ##############################################
+
+    def _validate(self, sequence):
+
+        """Method to validate the new sequence"""
+
+        self._logger.info('Validating key sequence {} ...'.format(sequence.toString()))
+        valid = True # False
+        # do some checks
+        return valid
diff --git a/src/CodeReview/QmlApplication/QmlBaseApplication.py b/src/CodeReview/QmlApplication/QmlBaseApplication.py
new file mode 100644
index 0000000..a28fa34
--- /dev/null
+++ b/src/CodeReview/QmlApplication/QmlBaseApplication.py
@@ -0,0 +1,409 @@
+###################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+__all__ = ['QmlApplication', 'Application']
+
+####################################################################################################
+
+from pathlib import Path
+import argparse
+import logging
+import sys
+import traceback
+
+# Fixme:
+from PyQt5 import QtCore
+from PyQt5.QtWidgets import QApplication
+
+from QtShim.QtCore import (
+    Property, Signal, Slot, QObject,
+    Qt, QTimer, QUrl
+)
+from QtShim.QtGui import QGuiApplication, QIcon
+from QtShim.QtQml import qmlRegisterType, QQmlApplicationEngine
+# Fixme: PYSIDE-574 qmlRegisterSingletonType and qmlRegisterUncreatableType missing in QtQml
+from QtShim.QtQml import qmlRegisterUncreatableType
+from QtShim.QtQuick import QQuickPaintedItem, QQuickView
+# from QtShim.QtQuickControls2 import QQuickStyle
+
+from CodeReview.Common.ArgparseAction import PathAction
+from CodeReview.Common.Platform2 import QtPlatform
+from .ApplicationMetadata import ApplicationMetadata
+from .ApplicationSettings import ApplicationSettings, Shortcut
+from .KeySequenceEditor import KeySequenceEditor
+
+from .rcc import CodeReviewRessource
+
+####################################################################################################
+
+_module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
+class QmlApplication(QObject):
+
+    """Class to implement a Qt QML Application."""
+
+    show_message = Signal(str) # message
+    show_error = Signal(str, str) # message backtrace
+
+    _logger = _module_logger.getChild('QmlApplication')
+
+    ##############################################
+
+    def __init__(self, application):
+
+        super().__init__()
+
+        self._application = application
+
+    ##############################################
+
+    def notify_message(self ,message):
+        self.show_message.emit(str(message))
+
+    def notify_error(self, message):
+        backtrace_str = traceback.format_exc()
+        self.show_error.emit(str(message), backtrace_str)
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def application_name(self):
+        return ApplicationMetadata.name
+
+    @Property(str, constant=True)
+    def application_url(self):
+        return ApplicationMetadata.url
+
+    @Property(str, constant=True)
+    def about_message(self):
+        return ApplicationMetadata.about_message()
+
+####################################################################################################
+
+# Fixme: why not derive from QGuiApplication ???
+class Application(QObject):
+
+    """Class to implement a Qt Application."""
+
+    instance = None
+
+    QmlApplication_CLS = QmlApplication
+
+    _logger = _module_logger.getChild('Application')
+
+    ##############################################
+
+    # Fixme: Singleton
+
+    @classmethod
+    def create(cls, *args, **kwargs):
+
+        if cls.instance is not None:
+            raise NameError('Instance exists')
+
+        cls.instance = cls(*args, **kwargs)
+        return cls.instance
+
+    ##############################################
+
+    def __init__(self):
+
+        self._logger.info('Ctor')
+
+        super().__init__()
+
+        QtCore.qInstallMessageHandler(self._message_handler)
+
+        self._parse_arguments()
+
+        # For Qt Labs Platform native widgets
+        # self._application = QGuiApplication(sys.argv)
+        # use QCoreApplication::instance() to get instance
+        self._application = QApplication(sys.argv)
+        self._application.main = self
+        self._init_application()
+
+        self._engine = QQmlApplicationEngine()
+        self._qml_application = self.QmlApplication_CLS(self)
+        self._application.qml_main = self._qml_application
+
+        self._platform = QtPlatform()
+        # self._logger.info('\n' + str(self._platform))
+
+        #! self._load_translation()
+        self.register_qml_types()
+        self._set_context_properties()
+        self._load_qml_main()
+
+        # self._run_before_event_loop()
+
+        self._application.aboutToQuit.connect(self.aboutToQuit)
+
+        QTimer.singleShot(0, self.post_init)
+
+    ##############################################
+
+    @property
+    def parser(self):
+        return self._parser
+
+    @property
+    def args(self):
+        return self._args
+
+    @property
+    def platform(self):
+        return self._platform
+
+    @property
+    def settings(self):
+        return self._settings
+
+    @property
+    def qml_application(self):
+        return self._qml_application
+
+    ##############################################
+
+    def _print_critical_message(self, message):
+        # print('\nCritical Error on {}'.format(datetime.datetime.now()))
+        # print('-'*80)
+        # print(message)
+        self._logger.critical(message)
+
+    ##############################################
+
+    def _message_handler(self, msg_type, context, msg):
+
+        if msg_type == QtCore.QtDebugMsg:
+            method = self._logger.debug
+        elif msg_type == QtCore.QtInfoMsg:
+            method = self._logger.info
+        elif msg_type == QtCore.QtWarningMsg:
+            method = self._logger.warning
+        elif msg_type in (QtCore.QtCriticalMsg, QtCore.QtFatalMsg):
+            method = self._logger.critical
+            # method = None
+
+        # local_msg = msg.toLocal8Bit()
+        # localMsg.constData()
+        context_file = context.file
+        if context_file is not None:
+            file_path = Path(context_file).name
+        else:
+            file_path = ''
+        message = '{1} {3} — {0}'.format(msg, file_path, context.line, context.function)
+        if method is not None:
+            method(message)
+        else:
+            self._print_critical_message(message)
+
+    ##############################################
+
+    def _on_critical_exception(self, exception):
+        message = str(exception) + '\n' + traceback.format_exc()
+        self._print_critical_message(message)
+        self._qml_application.notify_error(exception)
+        # sys.exit(1)
+
+    ##############################################
+
+    def _init_application(self):
+
+        self._application.setOrganizationName(ApplicationMetadata.organisation_name)
+        self._application.setOrganizationDomain(ApplicationMetadata.organisation_domain)
+
+        self._application.setApplicationName(ApplicationMetadata.name)
+        self._application.setApplicationDisplayName(ApplicationMetadata.display_name)
+        self._application.setApplicationVersion(ApplicationMetadata.version)
+
+        logo_path = ':/icons/logo/logo-256.png'
+        self._application.setWindowIcon(QIcon(logo_path))
+
+        QIcon.setThemeName('material')
+
+        self._settings = ApplicationSettings()
+
+    ##############################################
+
+    @classmethod
+    def setup_gui_application(self):
+
+        QGuiApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
+        # QQuickStyle.setStyle('Material')
+
+    ##############################################
+
+    def _parse_arguments(self):
+
+        self._parser = argparse.ArgumentParser(
+            description='CodeReview',
+        )
+
+        self.parse_arguments()
+
+        self._args = self._parser.parse_args()
+
+    ##############################################
+
+    def parse_arguments(self):
+
+        # self.parser.add_argument(
+        #     '--version',
+        #     action='store_true', default=False,
+        #     help="show version and exit",
+        # )
+
+        self.parser.add_argument(
+            '--dont-translate',
+            action='store_true',
+            default=False,
+            help="Don't translate application",
+        )
+
+        self.parser.add_argument(
+            '--user-script',
+            action=PathAction,
+            default=None,
+            help='user script to execute',
+        )
+
+        self.parser.add_argument(
+            '--user-script-args',
+            default='',
+            help="user script args (don't forget to quote)",
+        )
+
+    ##############################################
+
+    def _load_translation(self):
+
+        if self._args.dont_translate:
+            return
+
+        # Fixme: ConfigInstall
+        # directory = ':/translations'
+        directory = str(Path(__file__).parent.joinpath('rcc', 'translations'))
+
+        locale = QtCore.QLocale()
+        self._translator = QtCore.QTranslator()
+        if self._translator.load(locale, 'code-review', '.', directory, '.qm'):
+            self._application.installTranslator(self._translator)
+        else:
+            raise NameError('No translator for locale {}'.format(locale.name()))
+
+    ##############################################
+
+    def register_qml_types(self):
+
+        qmlRegisterType(KeySequenceEditor, 'CodeReview', 1, 0, 'KeySequenceEditor')
+
+        qmlRegisterUncreatableType(Shortcut, 'CodeReview', 1, 0, 'Shortcut', 'Cannot create Shortcut')
+        qmlRegisterUncreatableType(ApplicationSettings, 'CodeReview', 1, 0, 'ApplicationSettings', 'Cannot create ApplicationSettings')
+        qmlRegisterUncreatableType(self.QmlApplication_CLS, 'CodeReview', 1, 0, 'QmlApplication', 'Cannot create QmlApplication')
+
+    ##############################################
+
+    def _set_context_properties(self):
+        context = self._engine.rootContext()
+        context.setContextProperty('application', self._qml_application)
+        context.setContextProperty('application_settings', self._settings)
+
+    ##############################################
+
+    def _load_qml_main(self):
+
+        self._logger.info('Load QML...')
+
+        qml_path = Path(__file__).parent.joinpath('qml')
+        # qml_path = 'qrc:///qml'
+        self._engine.addImportPath(str(qml_path))
+
+        main_qml_path = qml_path.joinpath('main.qml')
+        self._qml_url = QUrl.fromLocalFile(str(main_qml_path))
+        # QUrl('qrc:/qml/main.qml')
+        self._engine.objectCreated.connect(self._check_qml_is_loaded)
+        self._engine.load(self._qml_url)
+
+        self._logger.info('QML loaded')
+
+    ##############################################
+
+    def _check_qml_is_loaded(self, obj, url):
+        # See https://bugreports.qt.io/browse/QTBUG-39469
+        if (obj is None and url == self._qml_url):
+            sys.exit(-1)
+
+    ##############################################
+
+    def exec_(self):
+        self._logger.info('Start event loop')
+        rc = self._application.exec_()
+        self._logger.info('Event loop done {}'.format(rc))
+        del self._engine # solve quit issue ?
+        sys.exit(rc)
+
+    ##############################################
+
+    def aboutToQuit(self):
+        self._logger.info('')
+
+    ##############################################
+
+    def post_init(self):
+
+        # Fixme: ui refresh ???
+
+        self._logger.info('post Init...')
+
+        if self._args.user_script is not None:
+            self.execute_user_script(self._args.user_script)
+
+        self._logger.info('Post Init Done')
+
+    ##############################################
+
+    def execute_user_script(self, script_path):
+
+        """Execute an user script provided by file *script_path* in a context where is defined a
+        variable *application* that is a reference to the application instance.
+
+        """
+
+        script_path = Path(script_path).absolute()
+        self._logger.info('Execute user script:\n  {}'.format(script_path))
+        try:
+            source = open(script_path).read()
+        except FileNotFoundError:
+            self._logger.info('File {} not found'.format(script_path))
+            sys.exit(1)
+        try:
+            bytecode = compile(source, script_path, 'exec')
+        except SyntaxError as exception:
+            self._on_critical_exception(exception)
+        try:
+            exec(bytecode, {'application':self})
+        except Exception as exception:
+            self._on_critical_exception(exception)
+        self._logger.info('User script done')
diff --git a/src/CodeReview/QmlApplication/QmlMainApplication.py b/src/CodeReview/QmlApplication/QmlMainApplication.py
new file mode 100644
index 0000000..ca8a530
--- /dev/null
+++ b/src/CodeReview/QmlApplication/QmlMainApplication.py
@@ -0,0 +1,138 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+__all__ = ['Application']
+
+####################################################################################################
+
+import logging
+
+from QtShim.QtCore import (
+    Property, Signal, Slot, QObject,
+    Qt, QTimer, QUrl
+)
+
+# Fixme: PYSIDE-574 qmlRegisterSingletonType and qmlRegisterUncreatableType missing in QtQml
+from QtShim.QtQml import qmlRegisterUncreatableType
+
+from . import QmlBaseApplication
+from ..Common.ArgparseAction import PathAction
+from .QmlRepository import (
+    QmlBranch,
+    QmlCommit,
+    QmlCommitPool,
+    QmlNote,
+    QmlReference,
+    QmlRepository,
+)
+
+####################################################################################################
+
+_module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
+class QmlApplication(QmlBaseApplication.QmlApplication):
+
+    _logger = _module_logger.getChild('QmlApplication')
+
+    ##############################################
+
+    def __init__(self, application):
+
+        super().__init__(application)
+
+        self._repository = None
+
+    ##############################################
+
+    @Slot(str)
+    def load_repository(self, path):
+
+        self._logger.info(path)
+        try:
+            self._repository = QmlRepository(path)
+        except NameError as exception:
+            # self.show_message(, warn=True)
+            self._repository = None
+            pass
+        self.repository_changed.emit()
+
+    ##############################################
+
+    repository_changed = Signal()
+
+    @Property(QmlRepository, notify=repository_changed)
+    def repository(self):
+        return self._repository
+
+####################################################################################################
+
+class Application(QmlBaseApplication.Application):
+
+    _logger = _module_logger.getChild('Application')
+
+    QmlApplication_CLS = QmlApplication
+
+    ##############################################
+
+    def parse_arguments(self):
+
+        super().parse_arguments()
+
+        self.parser.add_argument(
+            'path', metavar='PATH',
+            action=PathAction,
+            nargs='?', default='.',
+            help='path',
+        )
+
+        self.parser.add_argument(
+            '--diff-a',
+            default=None,
+            help='set a/old reference for diff a/b',
+        )
+
+        self.parser.add_argument(
+            '--diff-b',
+            default=None,
+            help='set b/new reference for diff a/b',
+        )
+
+    ##############################################
+
+    def register_qml_types(self):
+
+        super().register_qml_types()
+
+        qmlRegisterUncreatableType(QmlBranch, 'CodeReview', 1, 0, 'QmlBranch', 'Cannot create QmlBranch')
+        qmlRegisterUncreatableType(QmlCommit, 'CodeReview', 1, 0, 'QmlCommit', 'Cannot create QmlCommit')
+        qmlRegisterUncreatableType(QmlCommitPool, 'CodeReview', 1, 0, 'QmlCommitPool', 'Cannot create QmlCommitPool')
+        qmlRegisterUncreatableType(QmlNote, 'CodeReview', 1, 0, 'QmlNote', 'Cannot create QmlNote')
+        qmlRegisterUncreatableType(QmlReference, 'CodeReview', 1, 0, 'QmlReference', 'Cannot create QmlReference')
+        qmlRegisterUncreatableType(QmlRepository, 'CodeReview', 1, 0, 'QmlRepository', 'Cannot create QmlRepository')
+
+    ##############################################
+
+    def post_init(self):
+        self.qml_application.load_repository(self.args.path)
+        super().post_init()
diff --git a/src/CodeReview/QmlApplication/QmlRepository.py b/src/CodeReview/QmlApplication/QmlRepository.py
new file mode 100644
index 0000000..ff718a6
--- /dev/null
+++ b/src/CodeReview/QmlApplication/QmlRepository.py
@@ -0,0 +1,352 @@
+###################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+__all__ = [
+    'QmlBranch',
+    'QmlCommit'
+    'QmlCommitPool',
+    'QmlNote',
+    'QmlReference',
+    'QmlRepository',
+]
+
+####################################################################################################
+
+# import re
+import datetime
+import logging
+import os
+
+fromtimestamp = datetime.datetime.fromtimestamp
+
+from PyQt5.QtQml import QQmlListProperty
+from QtShim.QtCore import (
+    Property, Signal, Slot, QObject,
+)
+
+from CodeReview.Repository.Git import pygit, RepositoryNotFound, GitRepository
+
+####################################################################################################
+
+_module_logger = logging.getLogger(__name__)
+
+
+####################################################################################################
+
+class QmlRepositoryChild(QObject):
+
+    ##############################################
+
+    def __init__(self, repository):
+        # repository: QmlRepository
+        super().__init__()
+        self._repository = repository
+
+####################################################################################################
+
+class QmlBranch(QmlRepositoryChild):
+
+    # https://www.pygit2.org/branches.html#the-branch-type
+
+    ##############################################
+
+    def __init__(self, repository, branch: pygit.Branch):
+        super().__init__(repository)
+        self._branch = branch
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def name(self):
+        return self._branch.name
+
+    ##############################################
+
+    @Property(bool)
+    def is_checked_out(self):
+        """ True if branch is checked out by any repo connected to the current one, False otherwise."""
+        return self._branch.is_checked_out
+
+    @Property(bool)
+    def is_head(self):
+        """True if HEAD points at the branch, False otherwise."""
+        return self._branch.is_head
+
+    @Property(str)
+    def remote_name(self):
+        """The name of the remote set to be the upstream of this branch."""
+        return self._branch.remote_name
+
+    @Property(str)
+    def upstream_name(self):
+        """The name of the reference set to be the upstream of this one"""
+        return self._branch.upstream_name
+
+    # upstream
+    # The branch’s upstream branch or None if this branch does not have an upstream set. Set to None
+    # to unset the upstream configuration.
+
+    ##############################################
+
+    @Slot()
+    def delete(self):
+        """Delete this branch. It will no longer be valid!"""
+        self._branch.delete() # DANGER
+
+    @Slot(str, bool)
+    def rename(self, name, force=False):
+        """Move/rename an existing local branch reference. The new branch name will be checked for validity. Returns the new branch."""
+        self._branch.rename(name, force)
+
+####################################################################################################
+
+class QmlReference(QmlRepositoryChild):
+
+    # https://www.pygit2.org/references.html#the-reference-type
+
+    ##############################################
+
+    def __init__(self, repository, reference: pygit.Reference):
+        super().__init__(repository)
+        self._reference = reference
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def name(self):
+        """The full name of the reference."""
+        return self._reference.name
+
+    @Property(str, constant=True)
+    def shorthand(self):
+        """The shorthand “human-readable” name of the reference."""
+        return self._reference.name
+
+    @Slot(bool)
+    def is_oid(self, name):
+        """"""
+        self._reference.type == pygit.GIT_REF_OID
+
+    @Slot(bool)
+    def is_symbolic(self, name):
+        """"""
+        self._reference.type == pygit.GIT_REF_SYMBOLIC
+
+    ##############################################
+
+    @Slot()
+    def delete(self, name):
+        """Delete this reference. It will no longer be valid!"""
+        self._reference.delete() # DANGER
+
+    @Slot(str)
+    def rename(self, name):
+        """Rename the reference."""
+        self._reference.rename(name)
+
+    # .set_target(target[, message])
+    # Set the target of this reference.
+
+    # @Slot(result=QmlReference)
+    def resolve(self):
+        """Resolve a symbolic reference and return a direct reference."""
+        return self.__class__(self._repository, self._reference.resolve()) # Fixme: keep ref. ?
+
+    # @Slot(result=QmlCommit)
+    def commit(self):
+        """"""
+        commit = self._reference.peel()
+        return self._repository.commit_pool.from_commit(commit)
+
+QmlReference.resolve = Slot(result=QmlReference)(QmlReference.resolve)
+
+####################################################################################################
+
+class QmlCommit(QmlRepositoryChild):
+
+    # https://www.pygit2.org/objects.html#commits
+
+    ##############################################
+
+    def __init__(self, repository, commit: pygit.Commit):
+        super().__init__(repository)
+        self._commit = commit
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def message(self):
+        return self._commit.message
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def sha(self):
+        return str(self._commit.hex)
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def time(self):
+        return fromtimestamp(self._commit.commit_time).strftime('%Y-%m-%d %H:%M:%S'),
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def committer(self):
+        committer = self._commit.committer
+        return '{} <{}>'.format(committer.name, committer.email),
+
+    ##############################################
+
+    @Property(str, constant=True)
+    def author(self):
+        author = self._commit.author
+        return '{} <{}>'.format(author.name, author.email),
+
+QmlReference.commit = Slot(result=QmlCommit)(QmlReference.commit)
+
+####################################################################################################
+
+class QmlCommitPool(QmlRepositoryChild):
+
+    ##############################################
+
+    def __init__(self, repository):
+        super().__init__(repository)
+        self._commits = {}
+
+    ##############################################
+
+    def from_commit(self, commit):
+        sha = str(commit.hex)
+        if sha in self._commits:
+            return self._commits[sha]
+        else:
+            qml_commit = QmlCommit(self._repository, commit)
+            self._commits[sha] = qml_commit
+            return qml_commit
+
+    ##############################################
+
+    @Slot(str, result=QmlCommit)
+    def get(self, sha):
+        return self._commits.get(sha, None)
+
+####################################################################################################
+
+class QmlNote(QmlRepositoryChild):
+
+    # https://www.pygit2.org/references.html#notes
+    # GIT-NOTES(1)
+
+    ##############################################
+
+    def __init__(self, repository, note):
+        super().__init__(repository)
+        self._note = {}
+
+    ##############################################
+
+    @property
+    def message(self):
+        return self._message
+
+####################################################################################################
+
+class QmlRepository(QObject):
+
+    _logger = _module_logger.getChild('QmlRepository')
+
+    ##############################################
+
+    def __init__(self, path=None):
+
+        super().__init__()
+
+        self._logger.info('Init Repository')
+
+        if path is None:
+            path = os.getcwd()
+        try:
+            self._repository = GitRepository(path)
+        except RepositoryNotFound:
+            raise NameError("Any Git repository was found in path {}".format(path))
+            self._repository = None
+            return
+
+        self._branches = []
+        self._update_branches()
+
+        self._commit_pool = QmlCommitPool(self)
+        self._commits = []
+        self._update_commits()
+
+        self._tags = []
+        self._update_tags()
+
+    ##############################################
+
+    def __bool__(self):
+        return self._repository is not None
+
+    ##############################################
+
+    @Property(QmlCommitPool, constant=True)
+    def commit_pool(self):
+        return self._commit_pool
+
+    ##############################################
+
+    def _update_branches(self):
+        self._branches = [QmlBranch(self, branch) for branch in self._repository.branches]
+        self.branches_changed.emit()
+
+    branches_changed = Signal()
+
+    @Property(QQmlListProperty, notify=branches_changed)
+    def branches(self):
+        return QQmlListProperty(QmlBranch, self, self._branches)
+
+    ##############################################
+
+    def _update_commits(self):
+        self._commits = [self._commit_pool.from_commit(commit) for commit in self._repository.commits_for_head]
+        self.commits_changed.emit()
+
+    commits_changed = Signal()
+
+    @Property(QQmlListProperty, notify=commits_changed)
+    def commits(self):
+        return QQmlListProperty(QmlCommit, self, self._commits)
+
+    ##############################################
+
+    def _update_tags(self):
+        self._tags = [QmlReference(self, reference) for reference in self._repository.tags]
+        self.tags_changed.emit()
+
+    tags_changed = Signal()
+
+    @Property(QQmlListProperty, notify=tags_changed)
+    def tags(self):
+        return QQmlListProperty(QmlReference, self, self._tags)
diff --git a/src/CodeReview/QmlApplication/__init__.py b/src/CodeReview/QmlApplication/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/CodeReview/QmlApplication/qml/Constants/Style.qml b/src/CodeReview/QmlApplication/qml/Constants/Style.qml
new file mode 100644
index 0000000..965d85a
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Constants/Style.qml
@@ -0,0 +1,74 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+// cf. http://wiki.qt.io/Qml_Styling
+
+// Fixme: lupdate
+pragma Singleton
+import QtQml 2.11
+import QtQuick 2.6
+
+QtObject {
+
+    property QtObject color: QtObject {
+        // property color primary: darken('#428bca', 0.65)
+        // property color success: '#5cb85c'
+        // property color info:    '#5bc0de'
+        // property color warning: '#f0ad4e'
+        // property color danger:  '#d9534f'
+
+        property color primary: '#007bff'
+        property color success: '#28a745'
+        property color info:    '#17a2b8'
+        property color warning: '#ffc107'
+        property color danger:  '#dc3545'
+
+        property color orange: '#e67e22'
+
+        // "#5cb85c" hsv 120 128 184
+        // "#f0ad4e" hsv 35 172 240
+    }
+
+    property QtObject font_size: QtObject {
+        property int tiny:   8
+        property int small: 10
+        property int base:  12
+        property int large: 18
+        property int huge:  20
+    }
+
+    property QtObject spacing: QtObject {
+        property int xs:     1
+        property int small:  5
+        property int base:  10
+        property int large: 20
+        property int huge:  30
+
+        property int xs_horizontal:     1
+        property int small_horizontal:  5
+        property int base_horizontal:  10
+        property int large_horizontal: 20
+
+        property int xs_vertical:       1
+        property int small_vertical:    5
+        property int base_vertical:    10
+        property int large_vertical:   20
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Constants/qmldir b/src/CodeReview/QmlApplication/qml/Constants/qmldir
new file mode 100644
index 0000000..f0a2972
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Constants/qmldir
@@ -0,0 +1,2 @@
+module Constants
+singleton Style 1.0 Style.qml
diff --git a/src/CodeReview/QmlApplication/qml/Controls/qmldir b/src/CodeReview/QmlApplication/qml/Controls/qmldir
new file mode 100644
index 0000000..e9c2809
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Controls/qmldir
@@ -0,0 +1 @@
+module Controls
diff --git a/src/CodeReview/QmlApplication/qml/UserInterface/Actions.qml b/src/CodeReview/QmlApplication/qml/UserInterface/Actions.qml
new file mode 100644
index 0000000..b8dc38f
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/UserInterface/Actions.qml
@@ -0,0 +1,28 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+
+import CodeReview 1.0
+
+Item {
+    id: root
+}
diff --git a/src/CodeReview/QmlApplication/qml/UserInterface/FooterToolBar.qml b/src/CodeReview/QmlApplication/qml/UserInterface/FooterToolBar.qml
new file mode 100644
index 0000000..e68d214
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/UserInterface/FooterToolBar.qml
@@ -0,0 +1,43 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+ToolBar {
+    id: root
+
+    /*******************************************************
+     *
+     * API
+     *
+     */
+
+    property alias message: message_label.text
+
+    /******************************************************/
+
+    RowLayout {
+        Label {
+            id: message_label
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/UserInterface/HeaderToolBar.qml b/src/CodeReview/QmlApplication/qml/UserInterface/HeaderToolBar.qml
new file mode 100644
index 0000000..272de45
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/UserInterface/HeaderToolBar.qml
@@ -0,0 +1,44 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+import CodeReview 1.0
+import Widgets 1.0 as Widgets
+import UserInterface 1.0 as Ui
+
+ToolBar {
+    id: root
+
+    /*******************************************************
+     *
+     * API
+     *
+     */
+
+    /******************************************************/
+
+    RowLayout {
+        anchors.fill: parent
+        spacing: 10
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/UserInterface/MenuBar.qml b/src/CodeReview/QmlApplication/qml/UserInterface/MenuBar.qml
new file mode 100644
index 0000000..f645b5f
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/UserInterface/MenuBar.qml
@@ -0,0 +1,84 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQml 2.2
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+
+import CodeReview 1.0
+
+MenuBar {
+    id: root
+
+    /*******************************************************
+     *
+     * API
+     *
+     */
+
+    property var about_dialog
+    property var options_dialog
+    // application_window.close_application()
+
+    /******************************************************/
+
+    Action {
+        id: toggle_menu_bar_action
+        shortcut: 'm'
+        onTriggered: visible = !visible
+    }
+
+    /******************************************************/
+
+    Menu {
+        title: qsTr('File')
+
+        // onClosed: xxx.forceActiveFocus()
+
+        MenuSeparator { }
+
+        MenuItem {
+            icon.name: 'settings-black'
+            text: "Options"
+            onTriggered: options_dialog.open()
+        }
+
+        MenuSeparator { }
+
+        Action {
+            text: qsTr('Quit')
+            onTriggered: close_application()
+        }
+    }
+
+    Menu {
+        title: qsTr('Help')
+
+        Action {
+            text: qsTr('Documentation')
+            onTriggered: Qt.openUrlExternally(application.application_url)
+        }
+
+        Action {
+            text: qsTr('About')
+            onTriggered: about_dialog.open()
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/UserInterface/OptionsDialog.qml b/src/CodeReview/QmlApplication/qml/UserInterface/OptionsDialog.qml
new file mode 100644
index 0000000..d2e0d73
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/UserInterface/OptionsDialog.qml
@@ -0,0 +1,74 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQml.Models 2.2
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+import CodeReview 1.0
+import Widgets 1.0 as Widgets
+
+Widgets.CentredDialog {
+    id: dialog
+    implicitWidth: 800
+    implicitHeight: 400
+
+    standardButtons: Dialog.Ok | Dialog.Cancel
+
+    // onAccepted:
+    // onRejected:
+
+    /******************************************************/
+
+    header: TabBar {
+        id: tab_bar
+
+        TabButton {
+            text: qsTr("General")
+	}
+
+        TabButton {
+            text: qsTr("Shortcuts")
+        }
+    }
+
+    StackLayout {
+        anchors.fill: parent
+        currentIndex: tab_bar.currentIndex
+
+        Item {
+            id: shortcut_list_view_container
+
+            ListView {
+                id: shortcut_list_view
+                anchors.fill: parent
+                clip: true
+
+                //! model: application_settings.shortcuts
+
+                delegate: Widgets.ShortcutRow {
+                    width: parent.width
+                    shortcut: modelData
+                }
+            }
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/UserInterface/qmldir b/src/CodeReview/QmlApplication/qml/UserInterface/qmldir
new file mode 100644
index 0000000..c6d287a
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/UserInterface/qmldir
@@ -0,0 +1,6 @@
+module Widgets
+Actions 1.0 Actions.qml
+FooterToolBar 1.0 FooterToolBar.qml
+HeaderToolBar 1.0 HeaderToolBar.qml
+MenuBar 1.0 MenuBar.qml
+OptionsDialog 1.0 OptionsDialog.qml
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/AboutDialog.qml b/src/CodeReview/QmlApplication/qml/Widgets/AboutDialog.qml
new file mode 100644
index 0000000..ae2cfe9
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/AboutDialog.qml
@@ -0,0 +1,49 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+
+import Widgets 1.0 as Widgets
+
+Widgets.CentredDialog {
+
+    /******************************************************
+     *
+     * API
+     *
+     */
+
+    property alias about_message: text_area.text
+
+    /******************************************************/
+
+    id: dialog
+    modal: true
+    standardButtons: Dialog.Ok
+
+    TextArea {
+        id: text_area
+        width: 800
+        anchors.margins: 20
+        wrapMode: TextEdit.Wrap
+        textFormat: TextEdit.RichText
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/BranchList.qml b/src/CodeReview/QmlApplication/qml/Widgets/BranchList.qml
new file mode 100644
index 0000000..f520803
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/BranchList.qml
@@ -0,0 +1,44 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2020 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+ListView {
+    id: branch_listview
+
+    model: null
+
+    spacing: 2
+
+    clip: true
+
+    delegate: Rectangle {
+        width: branch_listview.width
+        height: childrenRect.height
+
+        RowLayout {
+            Label {
+                text: modelData.name
+            }
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/CentredDialog.qml b/src/CodeReview/QmlApplication/qml/Widgets/CentredDialog.qml
new file mode 100644
index 0000000..a7eded5
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/CentredDialog.qml
@@ -0,0 +1,29 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.12
+
+Dialog {
+    modal: true
+    anchors.centerIn: parent
+    dim: true
+    // Fixme: cannot be resized
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/CommitLog.qml b/src/CodeReview/QmlApplication/qml/Widgets/CommitLog.qml
new file mode 100644
index 0000000..bcd2d02
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/CommitLog.qml
@@ -0,0 +1,44 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2020 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+ListView {
+    id: commit_log_listview
+
+    model: null
+
+    spacing: 2
+
+    clip: true
+
+    delegate: Rectangle {
+        width: commit_log_listview.width
+        height: childrenRect.height
+
+        RowLayout {
+            Label {
+                text: modelData.message
+            }
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/ErrorMessageDialog.qml b/src/CodeReview/QmlApplication/qml/Widgets/ErrorMessageDialog.qml
new file mode 100644
index 0000000..b50454e
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/ErrorMessageDialog.qml
@@ -0,0 +1,52 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+
+import Widgets 1.0 as Widgets
+
+Widgets.CentredDialog {
+
+    /******************************************************
+     *
+     * API
+     *
+     */
+
+    function open_with_message(message) {
+        text_area.text = message
+        open()
+    }
+
+    /******************************************************/
+
+    id: dialog
+    modal: true
+    standardButtons: Dialog.Ok
+
+    TextArea {
+        id: text_area
+        width: 800
+        anchors.margins: 20
+        wrapMode: TextEdit.Wrap
+        textFormat: TextEdit.RichText
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/MarkdownViewer.qml b/src/CodeReview/QmlApplication/qml/Widgets/MarkdownViewer.qml
new file mode 100644
index 0000000..7bff8f8
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/MarkdownViewer.qml
@@ -0,0 +1,129 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+import Widgets 1.0 as Widgets
+import Constants 1.0
+
+Item {
+
+    /******************************************************
+     *
+     * API
+     *
+     */
+
+    property alias html_text: viewer.text
+    property alias markdown_text: editor.text
+
+    signal markdown_text_edited() // Fixme: onMarkdown_textChanged ???
+
+    /******************************************************/
+
+    id: root
+
+    /******************************************************/
+
+    Rectangle {
+        anchors.top: root.top
+        anchors.left: root.left
+        height: root.height
+        width: root.width - edit_button.width
+        // Fixme:
+        border.color: editor_container.visible ? Style.color.danger : '#ababac'
+
+        ScrollView {
+            id: viewer_container
+            anchors.fill: parent
+
+            TextArea {
+                id: viewer
+                wrapMode: TextEdit.Wrap
+                textFormat: TextEdit.RichText
+                readOnly: true
+		selectByMouse: true
+
+                // background: Rectangle {
+                // }
+            }
+
+            ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+        }
+
+        ScrollView {
+            id: editor_container
+            anchors.fill: parent
+            visible: false
+
+            TextArea {
+                id: editor
+                wrapMode: TextEdit.Wrap
+                textFormat: TextEdit.PlainText
+		selectByMouse: true
+
+                // background: Rectangle {
+                // }
+
+                Keys.onEscapePressed: {
+                    focus = false
+                    event.accepted = true
+                }
+
+                onEditingFinished: {
+                    markdown_text_edited()
+                    // swap
+                    editor_container.visible = false
+                    viewer_container.visible = true
+                }
+            }
+
+            ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+        }
+    }
+
+    Widgets.WarnedToolButton {
+        id: edit_button
+        anchors.top: root.top
+        anchors.right: root.right
+
+        icon.name: 'edit-black'
+        tip: qsTr('Edit Markdown')
+        icon.color: warned ? Style.color.danger : 'black'
+
+        warned: editor.focus
+
+        // When a user click on button while the editor has focus, signal order is
+        //   1) editor.onEditingFinished !!!
+        //   2) button.onFocuschanged
+        //   3) editor.onFocuschanged
+        //   4) button.onPressed
+        //   5) button.onClicked
+
+        onClicked: {
+            // swap and set focus
+            viewer_container.visible = false
+            editor_container.visible = true
+            editor.focus = true
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/ShortcutRow.qml b/src/CodeReview/QmlApplication/qml/Widgets/ShortcutRow.qml
new file mode 100644
index 0000000..6abbb81
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/ShortcutRow.qml
@@ -0,0 +1,105 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+// Forked from https://github.com/mitchcurtis/slate/blob/master/app/qml/ui/ShortcutRow.qml
+// See KeySequenceEditor.py for item implementation
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.1
+
+import CodeReview 1.0
+
+RowLayout {
+
+    /*******************************************************
+     *
+     * API
+     *
+     */
+
+    property var shortcut
+
+    function reset() {
+        editor.reset()
+    }
+
+    /******************************************************/
+
+    Label {
+        Layout.leftMargin: 10
+        Layout.fillWidth: true
+        text: shortcut.display_name
+    }
+
+    KeySequenceEditor {
+        id: editor
+        Layout.minimumWidth: 200
+        implicitHeight: edit_button.implicitHeight
+
+        // enabled: shortcut_name.length > 0
+        default_sequence: shortcut.default_sequence
+
+        // Fixme: name ...
+        onNew_sequenceChanged: {
+            console.info('New sequence', editor.new_sequence)
+            shortcut.sequence = editor.new_sequence
+        }
+
+        // The fix for QTBUG-57098 probably should have been implemented in C++ as well.
+        // I've tried implementing it in C++ with event() and converting the event
+        // to a QKeyEvent when the type is ShortcutOverride, but it didn't work.
+        Keys.onShortcutOverride: event.accepted = (event.key === Qt.Key_Escape)
+
+        ItemDelegate {
+            id: edit_button
+            width: parent.width
+            implicitWidth: 200
+            text: editor.display_sequence
+            font.bold: editor.is_customised
+
+            onClicked: editor.forceActiveFocus()
+
+            // Animation to blink the sequence while editing
+            SequentialAnimation {
+                id: flash_animation
+                running: editor.activeFocus
+
+                loops: Animation.Infinite
+                alwaysRunToEnd: true
+
+                NumberAnimation {
+                    target: edit_button.contentItem
+                    property: 'opacity'
+                    from: 1
+                    to: 0.5
+                    duration: 300
+                }
+                NumberAnimation {
+                    target: edit_button.contentItem
+                    property: 'opacity'
+                    from: 0.5
+                    to: 1
+                    duration: 300
+                }
+            }
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/TagList.qml b/src/CodeReview/QmlApplication/qml/Widgets/TagList.qml
new file mode 100644
index 0000000..4f9d04e
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/TagList.qml
@@ -0,0 +1,44 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2020 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+ListView {
+    id: tag_listview
+
+    model: null
+
+    spacing: 2
+
+    clip: true
+
+    delegate: Rectangle {
+        width: tag_listview.width
+        height: childrenRect.height
+
+        RowLayout {
+            Label {
+                text: modelData.name
+            }
+        }
+    }
+}
diff --git a/src/CodeReview/QmlApplication/qml/Widgets/qmldir b/src/CodeReview/QmlApplication/qml/Widgets/qmldir
new file mode 100644
index 0000000..a24b512
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/Widgets/qmldir
@@ -0,0 +1,9 @@
+module Widgets
+AboutDialog 1.0 AboutDialog.qml
+BranchList 1.0 BranchList.qml
+CentredDialog 1.0 CentredDialog.qml
+CommitLog 1.0 CommitLog.qml
+ErrorMessageDialog 1.0 ErrorMessageDialog.qml
+MarkdownViewer 1.0 MarkdownViewer.qml
+ShortcutRow 1.0 ShortcutRow.qml
+TagList 1.0 TagList.qml
diff --git a/src/CodeReview/QmlApplication/qml/main.qml b/src/CodeReview/QmlApplication/qml/main.qml
new file mode 100644
index 0000000..abc4287
--- /dev/null
+++ b/src/CodeReview/QmlApplication/qml/main.qml
@@ -0,0 +1,226 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
+
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+
+import CodeReview 1.0
+import Widgets 1.0 as Widgets
+import UserInterface 1.0 as Ui
+
+ApplicationWindow {
+    id: application_window
+
+    /*******************************************************
+     *
+     * API
+     *
+     */
+
+     property var shortcuts: null
+
+    function close_application(close) {
+        console.info('Close application')
+        show_message(qsTr('Close ...'))
+        if (!close)
+            Qt.quit()
+        // else
+        //    close.accepted = false
+    }
+
+    function clear_message() {
+        footer_tool_bar.message = ''
+    }
+
+    function show_message(message) {
+        footer_tool_bar.message = message
+    }
+
+    /*******************************************************
+     *
+     *
+     */
+
+    title: qsTr('Code Review') // Fixme: ???
+    visible: true
+    width: 1000
+    height: 500
+
+    Component.onCompleted: {
+        console.info('ApplicationWindow.onCompleted')
+        application.show_message.connect(on_message)
+        application.show_error.connect(on_error)
+        application_window.showMaximized()
+
+        application.repository_changed.connect(on_repository_loaded)
+
+        // Fixme: prevent crash when opening option dialog
+        //   RuntimeError: wrapped C/C++ object of type Shortcut has been deleted
+        let _shortcuts = application_settings.shortcuts
+        shortcuts = {} // []
+        /* for (var shortcut in _shortcuts) */
+        /*     console.info('shortcut', shortcut) */
+        for (var i = 0; i < _shortcuts.length; i++) {
+            var shortcut = _shortcuts[i]
+            shortcuts[shortcut.name] = shortcut
+            // shortcuts.push(shortcut)
+        }
+    }
+
+    function on_message(message) {
+        error_message_dialog.open_with_message(message)
+    }
+
+    function on_error(message, backtrace) {
+        var text = message + '\n' + backtrace
+        error_message_dialog.open_with_message(text)
+    }
+
+    function on_repository_loaded() {
+        console.info('on_repository_loaded')
+        var repository = application.repository
+        branch_listview.model = repository.branches
+        tag_listview.model = repository.tags
+        commit_log.model = repository.commits
+    }
+
+    /*******************************************************
+     *
+     * Slots
+     *
+     */
+
+    onClosing: close_application(close)
+
+    /*******************************************************
+     *
+     * Dialogs
+     *
+     */
+
+    Widgets.AboutDialog {
+        id: about_dialog
+        title: qsTr('About Code Review')
+        about_message: application.about_message // qsTr('...')
+    }
+
+    Widgets.ErrorMessageDialog {
+        id: error_message_dialog
+        title: qsTr('An error occurred in Code Review')
+    }
+
+    Ui.OptionsDialog {
+        id: options_dialog
+    }
+
+    /*******************************************************
+     *
+     * Actions
+     *
+     */
+
+    Ui.Actions {
+        id: actions
+    }
+
+    /*******************************************************
+     *
+     * Menu
+     *
+     */
+
+    // Fixme: use native menu ???
+    menuBar: Ui.MenuBar {
+        id: menu_bar
+        about_dialog: about_dialog
+        options_dialog: options_dialog
+    }
+
+    /*******************************************************
+     *
+     * Header
+     *
+     */
+
+    /* header: Ui.HeaderToolBar { */
+    /*     id: header_tool_bar */
+    /*     actions: actions */
+    /* } */
+
+    /*******************************************************
+     *
+     * Items
+     *
+     */
+
+    // ColumnLayout {
+    Column {
+        id: central_widget
+        anchors.fill: parent
+        spacing: 2
+
+        Item {
+            // Layout.fillHeight: true
+            height: parent.height / 4
+            width: parent.width
+
+            Widgets.BranchList {
+                id: branch_listview
+                enabled: application.repository
+                anchors.fill: parent
+            }
+        }
+
+        Item {
+            // Layout.fillHeight: true
+            height: parent.height / 4
+            width: parent.width
+
+            Widgets.TagList {
+                id: tag_listview
+                enabled: application.repository
+                anchors.fill: parent
+            }
+        }
+
+        Item {
+            // Layout.fillHeight: true
+            height: parent.height / 2
+            width: parent.width
+
+            Widgets.CommitLog {
+                id: commit_log
+                enabled: application.repository
+                anchors.fill: parent
+            }
+        }
+    }
+
+    /*******************************************************
+     *
+     * Footer
+     *
+     */
+
+    footer: Ui.FooterToolBar {
+        id: footer_tool_bar
+    }
+}
diff --git a/src/CodeReview/QmlApplication/rcc/Makefile b/src/CodeReview/QmlApplication/rcc/Makefile
new file mode 120000
index 0000000..b991ffc
--- /dev/null
+++ b/src/CodeReview/QmlApplication/rcc/Makefile
@@ -0,0 +1 @@
+../../../tasks/Makefile
\ No newline at end of file
diff --git a/src/CodeReview/QmlApplication/rcc/__init__.py b/src/CodeReview/QmlApplication/rcc/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/CodeReview/QmlApplication/rcc/code-review.qrc b/src/CodeReview/QmlApplication/rcc/code-review.qrc
new file mode 100644
index 0000000..0d2191e
--- /dev/null
+++ b/src/CodeReview/QmlApplication/rcc/code-review.qrc
@@ -0,0 +1,17 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource prefix="/">
+        <file>qtquickcontrols2.conf</file>
+    </qresource>
+
+    <!-- <qresource prefix="/"> -->
+    <!-- 	<file>icons/logo/logo.svg</file> -->
+    <!-- 	<file>icons/logo/logo-256.png</file> -->
+    <!-- </qresource> -->
+
+    <qresource prefix="/">
+	<!-- <file>icons/material/index.theme</file> -->
+
+        <!-- <file>icons/material/36x36/.png</file> -->
+    </qresource>
+</RCC>
diff --git a/src/CodeReview/QmlApplication/rcc/qtquickcontrols2.conf b/src/CodeReview/QmlApplication/rcc/qtquickcontrols2.conf
new file mode 100644
index 0000000..9cd1411
--- /dev/null
+++ b/src/CodeReview/QmlApplication/rcc/qtquickcontrols2.conf
@@ -0,0 +1,2 @@
+[Controls]
+Style=Fusion
diff --git a/CodeReview/Repository/Git.py b/src/CodeReview/Repository/Git.py
similarity index 55%
rename from CodeReview/Repository/Git.py
rename to src/CodeReview/Repository/Git.py
index 91e1f4e..5de5af7 100644
--- a/CodeReview/Repository/Git.py
+++ b/src/CodeReview/Repository/Git.py
@@ -16,12 +16,16 @@
 #
 ####################################################################################################
 
+__all__ = ['GitRepository', 'RepositoryNotFound', 'Diff', 'pygit']
+
 ####################################################################################################
 
+from pathlib import Path
 import logging
-import os
+import re
+import sys
 
-import pygit2 as git
+import pygit2 as pygit
 
 ####################################################################################################
 
@@ -34,36 +38,67 @@ class RepositoryNotFound(Exception):
 
 ####################################################################################################
 
+class Diff:
+
+    ##############################################
+
+    def __init__(self, diff, patches):
+        self.diff = diff
+        self._patches = patches
+
+    ##############################################
+
+    def __len__(self):
+        return len(self._patches)
+
+    ##############################################
+
+    def __iter__(self):
+        return iter(self._patches)
+
+    ##############################################
+
+    def __getitem__(self, i):
+        return self._patches[i]
+
+    ##############################################
+
+    def new_paths(self):
+        return [patch.delta.new_file.path for patch in self._patches]
+
+####################################################################################################
+
 class GitRepository:
 
+    """Class to implement a wrapper on top pygit2.
+    """
+
     _logger = _module_logger.getChild('GitRepository')
 
-    INDEX_PATH = os.path.join('.git', 'index')
-    REFS_PATH = os.path.join('.git', 'refs', 'heads')
+    INDEX_PATH = Path('.git').joinpath('index')
+    REFS_PATH = Path('.git').joinpath('refs', 'heads')
 
     ##############################################
 
     def __init__(self, path):
-
-        path = os.path.realpath(path)
-
-        try:
-            repository_path = git.discover_repository(path)
-            self._repository = git.Repository(repository_path)
-            workdir = self._repository.workdir
-            if os.path.isdir(path) and not path.endswith(os.sep):
-                path += os.sep
-            self._path_filter = path.replace(workdir, '')
-            self._logger.info('\nPath %s\nWork Dir: %s\nPath Filter: %s',
-                              path, workdir, self._path_filter)
-        except KeyError:
-            raise RepositoryNotFound
+        path = Path(path).absolute().resolve()
+        repository_path = pygit.discover_repository(str(path))
+        if repository_path is None:
+            print(f'Error: Directory {path} is not a Git repository')
+            sys.exit(1)
+        self._repository = pygit.Repository(repository_path)
+        self._workdir = Path(self._repository.workdir)
+        self._path_filter = str(path.relative_to(self._workdir))
+        if self._path_filter == '.':
+            self._path_filter = ''
+        template = '\nPath {}\nWork Dir: {}\nPath Filter: {}'
+        self._logger.info(template.format(path, self._workdir, self._path_filter))
 
     ##############################################
 
     @property
     def workdir(self):
-        return self._repository.workdir
+        return self._workdir
 
     @property
     def index(self):
@@ -75,29 +110,90 @@ def head(self):
 
     @property
     def repository_status(self):
+        # can raise UnicodeDecodeError
         return self._repository.status()
 
+    @property
+    def branch_name(self) -> str:
+        # head = self._repository.lookup_reference('HEAD').resolve()
+        head = self._repository.head
+        return head.name
+
     ##############################################
 
     def join_repository_path(self, path):
-        return os.path.join(self._repository.workdir, path)
+        return self._workdir.joinpath(path)
 
     ##############################################
 
-    def commits(self):
+    def references(self, regexp=None) -> pygit.Reference:
+        # https://www.pygit2.org/references.html
+        if regexp is not None:
+            regexp_ = re.compile(str(regexp))
+            return [
+                self._repository.references[name]
+                for name in self._repository.references if regexp_.match(name)
+            ]
+        else:
+            return [self._repository.references[name] for name in self._repository.references]
+
+    ##############################################
+
+    @property
+    def tags(self) -> pygit.Reference:
+        return self.references('^refs/tags')
+
+    ##############################################
+
+    @property
+    def branches(self) -> pygit.Branch:
+        # https://www.pygit2.org/branches.html
+        return [self._repository.branches[name] for name in self._repository.branches]
+
+    ##############################################
+
+    def commits(self, oid, topological=True, by_time=False): # -> iter on pygit.Commit
+
+        # https://www.pygit2.org/commit_log.html
+        # https://www.pygit2.org/commit_log.html?highlight=walk#pygit2.Repository.walk
 
-        head = self._repository.head
-        head_commit = self._repository[head.target]
         # GIT_SORT_TOPOLOGICAL. Sort the repository contents in topological order (parents before children);
         # this sorting mode can be combined with time sorting.
-        sorting = git.GIT_SORT_TOPOLOGICAL # git.GIT_SORT_TIME
-        commits = [commit for commit in self._repository.walk(head_commit.id, sorting)]
+        if topological and not by_time:
+            sorting = pygit.GIT_SORT_TOPOLOGICAL
+        if topological and by_time:
+            sorting = pygit.GIT_SORT_TOPOLOGICAL | pygit.GIT_SORT_TIME
+        else:
+            sorting = pygit.GIT_SORT_NONE
+
+        commits = self._repository.walk(oid, sorting) # -> pygit.Walker
 
         return commits
 
     ##############################################
 
-    def diff(self, a=None, b=None, cached=False, path_filter=None):
+    @property
+    def commits_for_head(self): # -> iter on pygit.Commit
+        # https://www.pygit2.org/references.html#the-head
+        # Current head reference of the repository
+        # head = repo.references['HEAD'].resolve()
+        head = self._repository.head # -> pygit.Reference
+        head_commit = self._repository[head.target] # -> pygit.Commit
+        oid = head_commit.id
+        return self.commits(oid)
+
+    ##############################################
+
+    def diff(self, a=None, b=None, cached=False, path_filter=None) -> Diff:
+        if isinstance(a, pygit.Commit):
+            a_str = str(a.id)
+        else:
+            a_str = str(a)
+        if isinstance(b, pygit.Commit):
+            b_str = str(b.id)
+        else:
+            b_str = str(b)
+        self._logger.info('{} {} {} {}'.format(a_str, b_str, cached, path_filter))
 
         if path_filter is None:
             path_filter = self._path_filter
@@ -119,7 +215,7 @@ def diff(self, a=None, b=None, cached=False, path_filter=None):
 
     ##############################################
 
-    def file_content(self, oid):
+    def file_content(self, oid) -> str:
         try:
             return self._repository[oid].data.decode('utf-8')
         except KeyError:
@@ -127,24 +223,23 @@ def file_content(self, oid):
 
     ##############################################
 
-    __STATUS_TEXT__ = {
-        git.GIT_STATUS_CONFLICTED: 'conflicted',
-        git.GIT_STATUS_CURRENT: 'current',
-        git.GIT_STATUS_IGNORED: 'ignored',
-        git.GIT_STATUS_INDEX_DELETED: 'index deleted',
-        git.GIT_STATUS_INDEX_MODIFIED: 'index modified',
-        git.GIT_STATUS_INDEX_NEW: 'index new',
-        git.GIT_STATUS_WT_DELETED: 'working tree deleted',
-        git.GIT_STATUS_WT_MODIFIED: 'working tree modified',
-        git.GIT_STATUS_WT_NEW: 'working tree new',
+    _STATUS_TEXT = {
+        pygit.GIT_STATUS_CONFLICTED: 'conflicted',
+        pygit.GIT_STATUS_CURRENT: 'current',
+        pygit.GIT_STATUS_IGNORED: 'ignored',
+        pygit.GIT_STATUS_INDEX_DELETED: 'index deleted',
+        pygit.GIT_STATUS_INDEX_MODIFIED: 'index modified',
+        pygit.GIT_STATUS_INDEX_NEW: 'index new',
+        pygit.GIT_STATUS_WT_DELETED: 'working tree deleted',
+        pygit.GIT_STATUS_WT_MODIFIED: 'working tree modified',
+        pygit.GIT_STATUS_WT_NEW: 'working tree new',
     }
 
     def status(self, path):
-
         try:
             status = self.repository_status[path]
-            status_text = ' | '.join([self.__STATUS_TEXT__[bit]
-                                      for bit in self.__STATUS_TEXT__
+            status_text = ' | '.join([self._STATUS_TEXT[bit]
+                                      for bit in self._STATUS_TEXT
                                       if status & bit])
             self._logger.info("File {} has status {} / {}".format(path, status, status_text))
             return status
@@ -153,8 +248,7 @@ def status(self, path):
 
     ##############################################
 
-    def is_staged(self, path):
-
+    def is_staged(self, path) -> bool:
         # index = self._repository.index
         # head_tree = self._repository.revparse_single('HEAD').tree
         # try:
@@ -163,18 +257,16 @@ def is_staged(self, path):
         #     return index_oid != head_oid
         # except KeyError:
         #     return False # untracked file
-        return self.status(path) == git.GIT_STATUS_INDEX_MODIFIED
+        return self.status(path) == pygit.GIT_STATUS_INDEX_MODIFIED
 
     ##############################################
 
-    def is_modified(self, path):
-
-        return self.status(path) == git.GIT_STATUS_WT_MODIFIED
+    def is_modified(self, path) -> bool:
+        return self.status(path) == pygit.GIT_STATUS_WT_MODIFIED
 
     ##############################################
 
     def stage(self, path):
-
         index = self.index
         index.add(path)
         index.write()
@@ -182,7 +274,6 @@ def stage(self, path):
     ##############################################
 
     def unstage(self, path):
-
         self._logger.info("Unstage {}".format(path))
         index = self.index
         index.remove(path)
@@ -190,39 +281,7 @@ def unstage(self, path):
         if path in head_tree:
             # Restore index to HEAD
             tree_entry = head_tree[path]
-            index_entry = git.IndexEntry(path, tree_entry.oid, tree_entry.filemode)
+            index_entry = pygit.IndexEntry(path, tree_entry.oid, tree_entry.filemode)
             self._logger.info("Reset index to HEAD for {}".format(path))
             index.add(index_entry)
         index.write()
-
-####################################################################################################
-
-class Diff:
-
-    ##############################################
-
-    def __init__(self, diff, patches):
-
-        self.diff = diff
-        self._patches = patches
-
-    ##############################################
-
-    def __len__(self):
-        return len(self._patches)
-
-    ##############################################
-
-    def __iter__(self):
-        return iter(self._patches)
-
-    ##############################################
-
-    def __getitem__(self, i):
-        return self._patches[i]
-
-    ##############################################
-
-    def new_paths(self):
-
-        return [patch.delta.new_file.path for patch in self._patches]
diff --git a/src/CodeReview/Repository/__init__.py b/src/CodeReview/Repository/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/CodeReview/Review/__init__.py b/src/CodeReview/Review/__init__.py
new file mode 100644
index 0000000..011a5cd
--- /dev/null
+++ b/src/CodeReview/Review/__init__.py
@@ -0,0 +1,89 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2020 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
+# General Public License as published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with this program.  If
+# not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+__all__ = ['Review']
+
+####################################################################################################
+
+from pathlib import Path
+
+import json
+
+####################################################################################################
+
+class ReviewNote:
+
+    ##############################################
+
+    def __init__(self, sha, text=''):
+
+        self._sha = str(sha)
+        self._text = str(text)
+
+    ##############################################
+
+    @property
+    def sha(self):
+        return self._sha
+
+    @property
+    def text(self):
+        return self._text
+
+    @text.setter
+    def text(self, value):
+        self._text = str(value)
+
+    ##############################################
+
+    def to_json(self):
+        return {key:getattr(self, key) for key in ('text',)}
+
+####################################################################################################
+
+class Review:
+
+    ##############################################
+
+    def __init__(self, path):
+
+        self._path = Path(path)
+
+        self._notes = {}
+        if self._path.exists():
+            with open(self._path) as fh:
+                data = json.load(fh)
+                for sha, review in data.items():
+                    self.add(ReviewNote(sha, **review))
+
+    ##############################################
+
+    def save(self):
+        with open(self._path, 'w') as fh:
+            data = {note.sha:note.to_json() for note in self._notes.values()}
+            json.dump(data, fh, indent=4, sort_keys=True, ensure_ascii=False)
+
+    ##############################################
+
+    def __getitem__(self, sha):
+        return self._notes.get(sha, None)
+
+    ##############################################
+
+    def add(self, review_note):
+        self._notes[review_note.sha] = review_note
diff --git a/CodeReview/TextDistance/__init__.py b/src/CodeReview/TextDistance/__init__.py
similarity index 100%
rename from CodeReview/TextDistance/__init__.py
rename to src/CodeReview/TextDistance/__init__.py
diff --git a/CodeReview/TextDistance/levenshtein_distance.c b/src/CodeReview/TextDistance/levenshtein_distance.c
similarity index 100%
rename from CodeReview/TextDistance/levenshtein_distance.c
rename to src/CodeReview/TextDistance/levenshtein_distance.c
diff --git a/CodeReview/Version.py b/src/CodeReview/Version.py
similarity index 95%
rename from CodeReview/Version.py
rename to src/CodeReview/Version.py
index dfb1c7d..5b08740 100644
--- a/CodeReview/Version.py
+++ b/src/CodeReview/Version.py
@@ -18,7 +18,7 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.RevisionVersion import RevisionVersion
+from CodeReview.Common.RevisionVersion import RevisionVersion
 
 ####################################################################################################
 
diff --git a/CodeReview/Version.py.in b/src/CodeReview/Version.py.in
similarity index 95%
rename from CodeReview/Version.py.in
rename to src/CodeReview/Version.py.in
index 75a4b82..2354e2a 100644
--- a/CodeReview/Version.py.in
+++ b/src/CodeReview/Version.py.in
@@ -20,7 +20,7 @@
 
 ####################################################################################################
 
-from CodeReview.Tools.RevisionVersion import RevisionVersion
+from CodeReview.Common.RevisionVersion import RevisionVersion
 
 ####################################################################################################
 
diff --git a/src/CodeReview/__init__.py b/src/CodeReview/__init__.py
new file mode 100644
index 0000000..1a72d32
--- /dev/null
+++ b/src/CodeReview/__init__.py
@@ -0,0 +1 @@
+__version__ = '1.1.0'
diff --git a/src/CodeReview/scripts/__init__.py b/src/CodeReview/scripts/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/CodeReview/scripts/diffviewer.py b/src/CodeReview/scripts/diffviewer.py
new file mode 100644
index 0000000..bcfd338
--- /dev/null
+++ b/src/CodeReview/scripts/diffviewer.py
@@ -0,0 +1,72 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2015 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from CodeReview.Common.Logging import Logging
+logger = Logging.setup_logging('pyqgit')
+
+####################################################################################################
+
+import argparse
+
+####################################################################################################
+
+from CodeReview.GUI.DiffViewer.DiffViewerApplication import DiffViewerApplication
+from CodeReview.Common.ProgramOptions import PathAction
+
+####################################################################################################
+
+def main() -> None:
+
+    argument_parser = argparse.ArgumentParser(description='Diff Viewer')
+
+    argument_parser.add_argument(
+        'file1', metavar='File1',
+        help='First file',
+    )
+
+    argument_parser.add_argument(
+        'file2', metavar='File2',
+        help='Second File',
+    )
+
+    argument_parser.add_argument(
+        '--show',
+        action='store_true',
+    )
+
+    argument_parser.add_argument(
+        '--user-script',
+        action=PathAction,
+        default=None,
+        help='user script to execute',
+    )
+
+    argument_parser.add_argument(
+        '--user-script-args',
+        default='',
+        help="user script args (don't forget to quote)",
+    )
+
+    args = argument_parser.parse_args()
+
+    application = DiffViewerApplication(args)
+    application.exec_()
diff --git a/src/CodeReview/scripts/pyqgit.py b/src/CodeReview/scripts/pyqgit.py
new file mode 100644
index 0000000..803f923
--- /dev/null
+++ b/src/CodeReview/scripts/pyqgit.py
@@ -0,0 +1,73 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2015 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+import CodeReview.Common.Logging.Logging as Logging
+logger = Logging.setup_logging('pyqgit')
+
+####################################################################################################
+
+import argparse
+
+from CodeReview.GUI.LogBrowser.LogBrowserApplication import LogBrowserApplication
+from CodeReview.Common.ProgramOptions import PathAction
+
+####################################################################################################
+
+def main():
+    argument_parser = argparse.ArgumentParser(description='Log Browser')
+
+    argument_parser.add_argument(
+        'path', metavar='PATH',
+        action=PathAction,
+        nargs='?', default='.',
+        help='path',
+    )
+
+    argument_parser.add_argument(
+        '--diff-a',
+        default=None,
+        help='set a/old reference for diff a/b',
+    )
+
+    argument_parser.add_argument(
+        '--diff-b',
+        default=None,
+        help='set b/new reference for diff a/b',
+    )
+
+    argument_parser.add_argument(
+        '--user-script',
+        action=PathAction,
+        default=None,
+        help='user script to execute',
+    )
+
+    argument_parser.add_argument(
+        '--user-script-args',
+        default='',
+        help="user script args (don't forget to quote)",
+    )
+
+    args = argument_parser.parse_args()
+
+    application = LogBrowserApplication(args)
+    application.exec_()
diff --git a/share/icons/32x32/code-review.png b/src/CodeReview/share/icons/32x32/code-review.png
similarity index 100%
rename from share/icons/32x32/code-review.png
rename to src/CodeReview/share/icons/32x32/code-review.png
diff --git a/src/CodeReview/share/icons/32x32/edit-delete.svg b/src/CodeReview/share/icons/32x32/edit-delete.svg
new file mode 100644
index 0000000..0a62e5b
--- /dev/null
+++ b/src/CodeReview/share/icons/32x32/edit-delete.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><style type="text/css" id="current-color-scheme">.ColorScheme-NegativeText{color:#da4453;}</style><path d="m26 9v21h-20v-21h1v20h18v-20zm4-2h-28v1h28zm-8-5v4h-1v-3h-10v3h-1v-4z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText"/></svg>
\ No newline at end of file
diff --git a/share/icons/32x32/go-next.svg b/src/CodeReview/share/icons/32x32/go-next.svg
similarity index 100%
rename from share/icons/32x32/go-next.svg
rename to src/CodeReview/share/icons/32x32/go-next.svg
diff --git a/share/icons/32x32/go-previous.svg b/src/CodeReview/share/icons/32x32/go-previous.svg
similarity index 100%
rename from share/icons/32x32/go-previous.svg
rename to src/CodeReview/share/icons/32x32/go-previous.svg
diff --git a/src/CodeReview/share/icons/32x32/media-playlist-repeat.svg b/src/CodeReview/share/icons/32x32/media-playlist-repeat.svg
new file mode 100644
index 0000000..0e3071b
--- /dev/null
+++ b/src/CodeReview/share/icons/32x32/media-playlist-repeat.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none"
+     d="m 23.499999,7.0000003 v 3.0000007 0 H 8.5000006 C 6.0070006,10.000001 4,12.007 4,14.500001 V 16 H 5 V 14.500001 C 5,12.718151 6.6941822,11 8.5000006,11 H 23.5 l -1e-6,3 L 28,10.5 Z M 27,16 v 1.500001 C 27,19.287 25.286999,21 23.499999,21 H 8.5000006 V 18 L 4,21.5 8.5000006,25 v -3 0 H 23.499999 C 25.993,22 28,19.993 28,17.500001 V 16 Z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/share/icons/32x32/view-refresh.svg b/src/CodeReview/share/icons/32x32/view-refresh.svg
similarity index 100%
rename from share/icons/32x32/view-refresh.svg
rename to src/CodeReview/share/icons/32x32/view-refresh.svg
diff --git a/share/icons/48x48/dialog-warning.png b/src/CodeReview/share/icons/48x48/dialog-warning.png
similarity index 100%
rename from share/icons/48x48/dialog-warning.png
rename to src/CodeReview/share/icons/48x48/dialog-warning.png
diff --git a/share/icons/code-review-250.png b/src/CodeReview/share/icons/code-review-250.png
similarity index 100%
rename from share/icons/code-review-250.png
rename to src/CodeReview/share/icons/code-review-250.png
diff --git a/share/icons/svg/align-mode.svg b/src/CodeReview/share/icons/svg/align-mode.svg
similarity index 100%
rename from share/icons/svg/align-mode.svg
rename to src/CodeReview/share/icons/svg/align-mode.svg
diff --git a/share/icons/svg/code-review.svg b/src/CodeReview/share/icons/svg/code-review.svg
similarity index 100%
rename from share/icons/svg/code-review.svg
rename to src/CodeReview/share/icons/svg/code-review.svg
diff --git a/share/icons/svg/complete-mode.svg b/src/CodeReview/share/icons/svg/complete-mode.svg
similarity index 100%
rename from share/icons/svg/complete-mode.svg
rename to src/CodeReview/share/icons/svg/complete-mode.svg
diff --git a/src/CodeReview/share/icons/svg/edit-delete.svg b/src/CodeReview/share/icons/svg/edit-delete.svg
new file mode 120000
index 0000000..39d3d8a
--- /dev/null
+++ b/src/CodeReview/share/icons/svg/edit-delete.svg
@@ -0,0 +1 @@
+../32x32/edit-delete.svg
\ No newline at end of file
diff --git a/share/icons/svg/go-next.svg b/src/CodeReview/share/icons/svg/go-next.svg
similarity index 100%
rename from share/icons/svg/go-next.svg
rename to src/CodeReview/share/icons/svg/go-next.svg
diff --git a/share/icons/svg/go-previous.svg b/src/CodeReview/share/icons/svg/go-previous.svg
similarity index 100%
rename from share/icons/svg/go-previous.svg
rename to src/CodeReview/share/icons/svg/go-previous.svg
diff --git a/share/icons/svg/highlight.svg b/src/CodeReview/share/icons/svg/highlight.svg
similarity index 100%
rename from share/icons/svg/highlight.svg
rename to src/CodeReview/share/icons/svg/highlight.svg
diff --git a/share/icons/svg/line-number-mode.svg b/src/CodeReview/share/icons/svg/line-number-mode.svg
similarity index 100%
rename from share/icons/svg/line-number-mode.svg
rename to src/CodeReview/share/icons/svg/line-number-mode.svg
diff --git a/src/CodeReview/share/icons/svg/media-playlist-repeat.svg b/src/CodeReview/share/icons/svg/media-playlist-repeat.svg
new file mode 120000
index 0000000..47a4244
--- /dev/null
+++ b/src/CodeReview/share/icons/svg/media-playlist-repeat.svg
@@ -0,0 +1 @@
+../32x32/media-playlist-repeat.svg
\ No newline at end of file
diff --git a/share/icons/svg/view-refresh.svg b/src/CodeReview/share/icons/svg/view-refresh.svg
similarity index 100%
rename from share/icons/svg/view-refresh.svg
rename to src/CodeReview/share/icons/svg/view-refresh.svg
diff --git a/src/QtShim/QtConfig.py b/src/QtShim/QtConfig.py
new file mode 100644
index 0000000..e1b09db
--- /dev/null
+++ b/src/QtShim/QtConfig.py
@@ -0,0 +1,745 @@
+####################################################################################################
+
+"""Common members of all bindings
+
+This is where each member of Qt.py is explicitly defined.
+It is based on a 'lowest common denominator' of all bindings;
+including members found in each of the 4 bindings.
+
+The '_common_members' dictionary is generated using the
+build_membership.sh script.
+
+"""
+
+_common_members = {
+    'QtCore': [
+        'QAbstractAnimation',
+        'QAbstractEventDispatcher',
+        'QAbstractItemModel',
+        'QAbstractListModel',
+        'QAbstractState',
+        'QAbstractTableModel',
+        'QAbstractTransition',
+        'QAnimationGroup',
+        'QBasicTimer',
+        'QBitArray',
+        'QBuffer',
+        'QByteArray',
+        'QByteArrayMatcher',
+        'QChildEvent',
+        'QCoreApplication',
+        'QCryptographicHash',
+        'QDataStream',
+        'QDate',
+        'QDateTime',
+        'QDir',
+        'QDirIterator',
+        'QDynamicPropertyChangeEvent',
+        'QEasingCurve',
+        'QElapsedTimer',
+        'QEvent',
+        'QEventLoop',
+        'QEventTransition',
+        'QFile',
+        'QFileInfo',
+        'QFileSystemWatcher',
+        'QFinalState',
+        'QGenericArgument',
+        'QGenericReturnArgument',
+        'QHistoryState',
+        'QItemSelectionRange',
+        'QIODevice',
+        'QLibraryInfo',
+        'QLine',
+        'QLineF',
+        'QLocale',
+        'QMargins',
+        'QMetaClassInfo',
+        'QMetaEnum',
+        'QMetaMethod',
+        'QMetaObject',
+        'QMetaProperty',
+        'QMimeData',
+        'QModelIndex',
+        'QMutex',
+        'QMutexLocker',
+        'QObject',
+        'QParallelAnimationGroup',
+        'QPauseAnimation',
+        'QPersistentModelIndex',
+        'QPluginLoader',
+        'QPoint',
+        'QPointF',
+        'QProcess',
+        'QProcessEnvironment',
+        'QPropertyAnimation',
+        'QReadLocker',
+        'QReadWriteLock',
+        'QRect',
+        'QRectF',
+        'QRegExp',
+        'QResource',
+        'QRunnable',
+        'QSemaphore',
+        'QSequentialAnimationGroup',
+        'QSettings',
+        'QSignalMapper',
+        'QSignalTransition',
+        'QSize',
+        'QSizeF',
+        'QSocketNotifier',
+        'QState',
+        'QStateMachine',
+        'QSysInfo',
+        'QSystemSemaphore',
+        'QT_TRANSLATE_NOOP',
+        'QT_TR_NOOP',
+        'QT_TR_NOOP_UTF8',
+        'QTemporaryFile',
+        'QTextBoundaryFinder',
+        'QTextCodec',
+        'QTextDecoder',
+        'QTextEncoder',
+        'QTextStream',
+        'QTextStreamManipulator',
+        'QThread',
+        'QThreadPool',
+        'QTime',
+        'QTimeLine',
+        'QTimer',
+        'QTimerEvent',
+        'QTranslator',
+        'QUrl',
+        'QVariantAnimation',
+        'QWaitCondition',
+        'QWriteLocker',
+        'QXmlStreamAttribute',
+        'QXmlStreamAttributes',
+        'QXmlStreamEntityDeclaration',
+        'QXmlStreamEntityResolver',
+        'QXmlStreamNamespaceDeclaration',
+        'QXmlStreamNotationDeclaration',
+        'QXmlStreamReader',
+        'QXmlStreamWriter',
+        'Qt',
+        'QtCriticalMsg',
+        'QtDebugMsg',
+        'QtFatalMsg',
+        'QtMsgType',
+        'QtSystemMsg',
+        'QtWarningMsg',
+        'qAbs',
+        'qAddPostRoutine',
+        'qChecksum',
+        'qCritical',
+        'qDebug',
+        'qFatal',
+        'qFuzzyCompare',
+        'qIsFinite',
+        'qIsInf',
+        'qIsNaN',
+        'qIsNull',
+        'qRegisterResourceData',
+        'qUnregisterResourceData',
+        'qVersion',
+        'qWarning',
+        'qrand',
+        'qsrand'
+    ],
+    'QtGui': [
+        'QAbstractTextDocumentLayout',
+        'QActionEvent',
+        'QBitmap',
+        'QBrush',
+        'QClipboard',
+        'QCloseEvent',
+        'QColor',
+        'QConicalGradient',
+        'QContextMenuEvent',
+        'QCursor',
+        'QDesktopServices',
+        'QDoubleValidator',
+        'QDrag',
+        'QDragEnterEvent',
+        'QDragLeaveEvent',
+        'QDragMoveEvent',
+        'QDropEvent',
+        'QFileOpenEvent',
+        'QFocusEvent',
+        'QFont',
+        'QFontDatabase',
+        'QFontInfo',
+        'QFontMetrics',
+        'QFontMetricsF',
+        'QGradient',
+        'QGuiApplication',
+        'QHelpEvent',
+        'QHideEvent',
+        'QHoverEvent',
+        'QIcon',
+        'QIconDragEvent',
+        'QIconEngine',
+        'QImage',
+        'QImageIOHandler',
+        'QImageReader',
+        'QImageWriter',
+        'QInputEvent',
+        'QInputMethodEvent',
+        'QIntValidator',
+        'QKeyEvent',
+        'QKeySequence',
+        'QLinearGradient',
+        'QMatrix2x2',
+        'QMatrix2x3',
+        'QMatrix2x4',
+        'QMatrix3x2',
+        'QMatrix3x3',
+        'QMatrix3x4',
+        'QMatrix4x2',
+        'QMatrix4x3',
+        'QMatrix4x4',
+        'QMouseEvent',
+        'QMoveEvent',
+        'QMovie',
+        'QPaintDevice',
+        'QPaintEngine',
+        'QPaintEngineState',
+        'QPaintEvent',
+        'QPainter',
+        'QPainterPath',
+        'QPainterPathStroker',
+        'QPalette',
+        'QPen',
+        'QPicture',
+        'QPictureIO',
+        'QPixmap',
+        'QPixmapCache',
+        'QPolygon',
+        'QPolygonF',
+        'QQuaternion',
+        'QRadialGradient',
+        'QRegExpValidator',
+        'QRegion',
+        'QResizeEvent',
+        'QSessionManager',
+        'QShortcutEvent',
+        'QShowEvent',
+        'QStandardItem',
+        'QStandardItemModel',
+        'QStatusTipEvent',
+        'QSyntaxHighlighter',
+        'QTabletEvent',
+        'QTextBlock',
+        'QTextBlockFormat',
+        'QTextBlockGroup',
+        'QTextBlockUserData',
+        'QTextCharFormat',
+        'QTextCursor',
+        'QTextDocument',
+        'QTextDocumentFragment',
+        'QTextFormat',
+        'QTextFragment',
+        'QTextFrame',
+        'QTextFrameFormat',
+        'QTextImageFormat',
+        'QTextInlineObject',
+        'QTextItem',
+        'QTextLayout',
+        'QTextLength',
+        'QTextLine',
+        'QTextList',
+        'QTextListFormat',
+        'QTextObject',
+        'QTextObjectInterface',
+        'QTextOption',
+        'QTextTable',
+        'QTextTableCell',
+        'QTextTableCellFormat',
+        'QTextTableFormat',
+        'QTouchEvent',
+        'QTransform',
+        'QValidator',
+        'QVector2D',
+        'QVector3D',
+        'QVector4D',
+        'QWhatsThisClickedEvent',
+        'QWheelEvent',
+        'QWindowStateChangeEvent',
+        'qAlpha',
+        'qBlue',
+        'qGray',
+        'qGreen',
+        'qIsGray',
+        'qRed',
+        'qRgb',
+        'qRgba'
+    ],
+    # 'QtHelp': [
+    #     'QHelpContentItem',
+    #     'QHelpContentModel',
+    #     'QHelpContentWidget',
+    #     'QHelpEngine',
+    #     'QHelpEngineCore',
+    #     'QHelpIndexModel',
+    #     'QHelpIndexWidget',
+    #     'QHelpSearchEngine',
+    #     'QHelpSearchQuery',
+    #     'QHelpSearchQueryWidget',
+    #     'QHelpSearchResultWidget'
+    # ],
+    # 'QtMultimedia': [
+    #     'QAbstractVideoBuffer',
+    #     'QAbstractVideoSurface',
+    #     'QAudio',
+    #     'QAudioDeviceInfo',
+    #     'QAudioFormat',
+    #     'QAudioInput',
+    #     'QAudioOutput',
+    #     'QVideoFrame',
+    #     'QVideoSurfaceFormat'
+    # ],
+    # 'QtNetwork': [
+    #     'QAbstractNetworkCache',
+    #     'QAbstractSocket',
+    #     'QAuthenticator',
+    #     'QHostAddress',
+    #     'QHostInfo',
+    #     'QLocalServer',
+    #     'QLocalSocket',
+    #     'QNetworkAccessManager',
+    #     'QNetworkAddressEntry',
+    #     'QNetworkCacheMetaData',
+    #     'QNetworkConfiguration',
+    #     'QNetworkConfigurationManager',
+    #     'QNetworkCookie',
+    #     'QNetworkCookieJar',
+    #     'QNetworkDiskCache',
+    #     'QNetworkInterface',
+    #     'QNetworkProxy',
+    #     'QNetworkProxyFactory',
+    #     'QNetworkProxyQuery',
+    #     'QNetworkReply',
+    #     'QNetworkRequest',
+    #     'QNetworkSession',
+    #     'QSsl',
+    #     'QTcpServer',
+    #     'QTcpSocket',
+    #     'QUdpSocket'
+    # ],
+    # 'QtOpenGL': [
+    #     'QGL',
+    #     'QGLContext',
+    #     'QGLFormat',
+    #     'QGLWidget'
+    # ],
+    # 'QtPrintSupport': [
+    #     'QAbstractPrintDialog',
+    #     'QPageSetupDialog',
+    #     'QPrintDialog',
+    #     'QPrintEngine',
+    #     'QPrintPreviewDialog',
+    #     'QPrintPreviewWidget',
+    #     'QPrinter',
+    #     'QPrinterInfo'
+    # ],
+    # 'QtSql': [
+    #     'QSql',
+    #     'QSqlDatabase',
+    #     'QSqlDriver',
+    #     'QSqlDriverCreatorBase',
+    #     'QSqlError',
+    #     'QSqlField',
+    #     'QSqlIndex',
+    #     'QSqlQuery',
+    #     'QSqlQueryModel',
+    #     'QSqlRecord',
+    #     'QSqlRelation',
+    #     'QSqlRelationalDelegate',
+    #     'QSqlRelationalTableModel',
+    #     'QSqlResult',
+    #     'QSqlTableModel'
+    # ],
+    'QtSvg': [
+        'QGraphicsSvgItem',
+        'QSvgGenerator',
+        'QSvgRenderer',
+        'QSvgWidget'
+    ],
+    # 'QtTest': [
+    #     'QTest'
+    # ],
+    'QtWidgets': [
+        'QAbstractButton',
+        'QAbstractGraphicsShapeItem',
+        'QAbstractItemDelegate',
+        'QAbstractItemView',
+        'QAbstractScrollArea',
+        'QAbstractSlider',
+        'QAbstractSpinBox',
+        'QAction',
+        'QActionGroup',
+        'QApplication',
+        'QBoxLayout',
+        'QButtonGroup',
+        'QCalendarWidget',
+        'QCheckBox',
+        'QColorDialog',
+        'QColumnView',
+        'QComboBox',
+        'QCommandLinkButton',
+        'QCommonStyle',
+        'QCompleter',
+        'QDataWidgetMapper',
+        'QDateEdit',
+        'QDateTimeEdit',
+        'QDesktopWidget',
+        'QDial',
+        'QDialog',
+        'QDialogButtonBox',
+        'QDirModel',
+        'QDockWidget',
+        'QDoubleSpinBox',
+        'QErrorMessage',
+        'QFileDialog',
+        'QFileIconProvider',
+        'QFileSystemModel',
+        'QFocusFrame',
+        'QFontComboBox',
+        'QFontDialog',
+        'QFormLayout',
+        'QFrame',
+        'QGesture',
+        'QGestureEvent',
+        'QGestureRecognizer',
+        'QGraphicsAnchor',
+        'QGraphicsAnchorLayout',
+        'QGraphicsBlurEffect',
+        'QGraphicsColorizeEffect',
+        'QGraphicsDropShadowEffect',
+        'QGraphicsEffect',
+        'QGraphicsEllipseItem',
+        'QGraphicsGridLayout',
+        'QGraphicsItem',
+        'QGraphicsItemGroup',
+        'QGraphicsLayout',
+        'QGraphicsLayoutItem',
+        'QGraphicsLineItem',
+        'QGraphicsLinearLayout',
+        'QGraphicsObject',
+        'QGraphicsOpacityEffect',
+        'QGraphicsPathItem',
+        'QGraphicsPixmapItem',
+        'QGraphicsPolygonItem',
+        'QGraphicsProxyWidget',
+        'QGraphicsRectItem',
+        'QGraphicsRotation',
+        'QGraphicsScale',
+        'QGraphicsScene',
+        'QGraphicsSceneContextMenuEvent',
+        'QGraphicsSceneDragDropEvent',
+        'QGraphicsSceneEvent',
+        'QGraphicsSceneHelpEvent',
+        'QGraphicsSceneHoverEvent',
+        'QGraphicsSceneMouseEvent',
+        'QGraphicsSceneMoveEvent',
+        'QGraphicsSceneResizeEvent',
+        'QGraphicsSceneWheelEvent',
+        'QGraphicsSimpleTextItem',
+        'QGraphicsTextItem',
+        'QGraphicsTransform',
+        'QGraphicsView',
+        'QGraphicsWidget',
+        'QGridLayout',
+        'QGroupBox',
+        'QHBoxLayout',
+        'QHeaderView',
+        'QInputDialog',
+        'QItemDelegate',
+        'QItemEditorCreatorBase',
+        'QItemEditorFactory',
+        'QKeyEventTransition',
+        'QLCDNumber',
+        'QLabel',
+        'QLayout',
+        'QLayoutItem',
+        'QLineEdit',
+        'QListView',
+        'QListWidget',
+        'QListWidgetItem',
+        'QMainWindow',
+        'QMdiArea',
+        'QMdiSubWindow',
+        'QMenu',
+        'QMenuBar',
+        'QMessageBox',
+        'QMouseEventTransition',
+        'QPanGesture',
+        'QPinchGesture',
+        'QPlainTextDocumentLayout',
+        'QPlainTextEdit',
+        'QProgressBar',
+        'QProgressDialog',
+        'QPushButton',
+        'QRadioButton',
+        'QRubberBand',
+        'QScrollArea',
+        'QScrollBar',
+        'QShortcut',
+        'QSizeGrip',
+        'QSizePolicy',
+        'QSlider',
+        'QSpacerItem',
+        'QSpinBox',
+        'QSplashScreen',
+        'QSplitter',
+        'QSplitterHandle',
+        'QStackedLayout',
+        'QStackedWidget',
+        'QStatusBar',
+        'QStyle',
+        'QStyleFactory',
+        'QStyleHintReturn',
+        'QStyleHintReturnMask',
+        'QStyleHintReturnVariant',
+        'QStyleOption',
+        'QStyleOptionButton',
+        'QStyleOptionComboBox',
+        'QStyleOptionComplex',
+        'QStyleOptionDockWidget',
+        'QStyleOptionFocusRect',
+        'QStyleOptionFrame',
+        'QStyleOptionGraphicsItem',
+        'QStyleOptionGroupBox',
+        'QStyleOptionHeader',
+        'QStyleOptionMenuItem',
+        'QStyleOptionProgressBar',
+        'QStyleOptionRubberBand',
+        'QStyleOptionSizeGrip',
+        'QStyleOptionSlider',
+        'QStyleOptionSpinBox',
+        'QStyleOptionTab',
+        'QStyleOptionTabBarBase',
+        'QStyleOptionTabWidgetFrame',
+        'QStyleOptionTitleBar',
+        'QStyleOptionToolBar',
+        'QStyleOptionToolBox',
+        'QStyleOptionToolButton',
+        'QStyleOptionViewItem',
+        'QStylePainter',
+        'QStyledItemDelegate',
+        'QSwipeGesture',
+        'QSystemTrayIcon',
+        'QTabBar',
+        'QTabWidget',
+        'QTableView',
+        'QTableWidget',
+        'QTableWidgetItem',
+        'QTableWidgetSelectionRange',
+        'QTapAndHoldGesture',
+        'QTapGesture',
+        'QTextBrowser',
+        'QTextEdit',
+        'QTimeEdit',
+        'QToolBar',
+        'QToolBox',
+        'QToolButton',
+        'QToolTip',
+        'QTreeView',
+        'QTreeWidget',
+        'QTreeWidgetItem',
+        'QTreeWidgetItemIterator',
+        'QUndoCommand',
+        'QUndoGroup',
+        'QUndoStack',
+        'QUndoView',
+        'QVBoxLayout',
+        'QWhatsThis',
+        'QWidget',
+        'QWidgetAction',
+        'QWidgetItem',
+        'QWizard',
+        'QWizardPage'
+    ],
+    # 'QtX11Extras': [
+    #     'QX11Info'
+    # ],
+    # 'QtXml': [
+    #     'QDomAttr',
+    #     'QDomCDATASection',
+    #     'QDomCharacterData',
+    #     'QDomComment',
+    #     'QDomDocument',
+    #     'QDomDocumentFragment',
+    #     'QDomDocumentType',
+    #     'QDomElement',
+    #     'QDomEntity',
+    #     'QDomEntityReference',
+    #     'QDomImplementation',
+    #     'QDomNamedNodeMap',
+    #     'QDomNode',
+    #     'QDomNodeList',
+    #     'QDomNotation',
+    #     'QDomProcessingInstruction',
+    #     'QDomText',
+    #     'QXmlAttributes',
+    #     'QXmlContentHandler',
+    #     'QXmlDTDHandler',
+    #     'QXmlDeclHandler',
+    #     'QXmlDefaultHandler',
+    #     'QXmlEntityResolver',
+    #     'QXmlErrorHandler',
+    #     'QXmlInputSource',
+    #     'QXmlLexicalHandler',
+    #     'QXmlLocator',
+    #     'QXmlNamespaceSupport',
+    #     'QXmlParseException',
+    #     'QXmlReader',
+    #     'QXmlSimpleReader'
+    # ],
+    # 'QtXmlPatterns': [
+    #     'QAbstractMessageHandler',
+    #     'QAbstractUriResolver',
+    #     'QAbstractXmlNodeModel',
+    #     'QAbstractXmlReceiver',
+    #     'QSourceLocation',
+    #     'QXmlFormatter',
+    #     'QXmlItem',
+    #     'QXmlName',
+    #     'QXmlNamePool',
+    #     'QXmlNodeModelIndex',
+    #     'QXmlQuery',
+    #     'QXmlResultItems',
+    #     'QXmlSchema',
+    #     'QXmlSchemaValidator',
+    #     'QXmlSerializer'
+    # ]
+    'QtQml': [
+        'qmlRegisterType',
+        'qmlRegisterUncreatableType',
+        'QQmlApplicationEngine',
+    ],
+    'QtQuick': [
+        'QQuickPaintedItem',
+        'QQuickView',
+    ],
+}
+
+####################################################################################################
+
+"""Misplaced members
+
+These members from the original submodule are misplaced relative PySide2
+
+"""
+
+_misplaced_members = {
+    'PySide2': {
+        'QtCore.QStringListModel': 'QtCore.QStringListModel',
+        'QtGui.QStringListModel': 'QtCore.QStringListModel',
+        'QtCore.Property': 'QtCore.Property',
+        'QtCore.Signal': 'QtCore.Signal',
+        'QtCore.Slot': 'QtCore.Slot',
+        'QtCore.QAbstractProxyModel': 'QtCore.QAbstractProxyModel',
+        'QtCore.QSortFilterProxyModel': 'QtCore.QSortFilterProxyModel',
+        'QtCore.QItemSelection': 'QtCore.QItemSelection',
+        'QtCore.QItemSelectionModel': 'QtCore.QItemSelectionModel',
+        'QtCore.QItemSelectionRange': 'QtCore.QItemSelectionRange',
+        # 'QtUiTools.QUiLoader': ['QtCompat.loadUi', _loadUi],
+        # 'shiboken2.wrapInstance': ['QtCompat.wrapInstance', _wrapinstance],
+        # 'shiboken2.getCppPointer': ['QtCompat.getCppPointer', _getcpppointer],
+        'QtWidgets.qApp': 'QtWidgets.QApplication.instance()',
+        # 'QtCore.QCoreApplication.translate': [
+        #     'QtCompat.translate', _translate
+        # ],
+        # 'QtWidgets.QApplication.translate': [
+        #     'QtCompat.translate', _translate
+        # ],
+        # 'QtCore.qInstallMessageHandler': [
+        #     'QtCompat.qInstallMessageHandler', _qInstallMessageHandler
+        # ],
+    },
+    'PyQt5': {
+        'QtCore.pyqtProperty': 'QtCore.Property',
+        'QtCore.pyqtSignal': 'QtCore.Signal',
+        'QtCore.pyqtSlot': 'QtCore.Slot',
+        'QtCore.QAbstractProxyModel': 'QtCore.QAbstractProxyModel',
+        'QtCore.QSortFilterProxyModel': 'QtCore.QSortFilterProxyModel',
+        'QtCore.QStringListModel': 'QtCore.QStringListModel',
+        'QtCore.QItemSelection': 'QtCore.QItemSelection',
+        'QtCore.QItemSelectionModel': 'QtCore.QItemSelectionModel',
+        'QtCore.QItemSelectionRange': 'QtCore.QItemSelectionRange',
+        # 'uic.loadUi': ['QtCompat.loadUi', _loadUi],
+        # 'sip.wrapinstance': ['QtCompat.wrapInstance', _wrapinstance],
+        # 'sip.unwrapinstance': ['QtCompat.getCppPointer', _getcpppointer],
+        'QtWidgets.qApp': 'QtWidgets.QApplication.instance()',
+        # 'QtCore.QCoreApplication.translate': [
+        #     'QtCompat.translate', _translate
+        # ],
+        # 'QtWidgets.QApplication.translate': [
+        #     'QtCompat.translate', _translate
+        # ],
+        # 'QtCore.qInstallMessageHandler': [
+        #     'QtCompat.qInstallMessageHandler', _qInstallMessageHandler
+        # ],
+    },
+}
+
+####################################################################################################
+
+"""Compatibility Members
+
+This dictionary is used to build Qt.QtCompat objects that provide a consistent
+interface for obsolete members, and differences in binding return values.
+
+{
+    'binding': {
+        'classname': {
+            'targetname': 'binding_namespace',
+        }
+    }
+}
+
+"""
+
+_compatibility_members = {
+    'PySide2': {
+        # 'QWidget': {
+        #     'grab': 'QtWidgets.QWidget.grab',
+        # },
+        # 'QHeaderView': {
+        #     'sectionsClickable': 'QtWidgets.QHeaderView.sectionsClickable',
+        #     'setSectionsClickable':
+        #         'QtWidgets.QHeaderView.setSectionsClickable',
+        #     'sectionResizeMode': 'QtWidgets.QHeaderView.sectionResizeMode',
+        #     'setSectionResizeMode':
+        #         'QtWidgets.QHeaderView.setSectionResizeMode',
+        #     'sectionsMovable': 'QtWidgets.QHeaderView.sectionsMovable',
+        #     'setSectionsMovable': 'QtWidgets.QHeaderView.setSectionsMovable',
+        # },
+        # 'QFileDialog': {
+        #     'getOpenFileName': 'QtWidgets.QFileDialog.getOpenFileName',
+        #     'getOpenFileNames': 'QtWidgets.QFileDialog.getOpenFileNames',
+        #     'getSaveFileName': 'QtWidgets.QFileDialog.getSaveFileName',
+        # },
+    },
+    'PyQt5': {
+        # 'QWidget': {
+        #     'grab': 'QtWidgets.QWidget.grab',
+        # },
+        # 'QHeaderView': {
+        #     'sectionsClickable': 'QtWidgets.QHeaderView.sectionsClickable',
+        #     'setSectionsClickable':
+        #         'QtWidgets.QHeaderView.setSectionsClickable',
+        #     'sectionResizeMode': 'QtWidgets.QHeaderView.sectionResizeMode',
+        #     'setSectionResizeMode':
+        #         'QtWidgets.QHeaderView.setSectionResizeMode',
+        #     'sectionsMovable': 'QtWidgets.QHeaderView.sectionsMovable',
+        #     'setSectionsMovable': 'QtWidgets.QHeaderView.setSectionsMovable',
+        # },
+        # 'QFileDialog': {
+        #     'getOpenFileName': 'QtWidgets.QFileDialog.getOpenFileName',
+        #     'getOpenFileNames': 'QtWidgets.QFileDialog.getOpenFileNames',
+        #     'getSaveFileName': 'QtWidgets.QFileDialog.getSaveFileName',
+        # },
+    },
+}
diff --git a/src/QtShim/Wrapper.py b/src/QtShim/Wrapper.py
new file mode 100644
index 0000000..a398f00
--- /dev/null
+++ b/src/QtShim/Wrapper.py
@@ -0,0 +1,34 @@
+####################################################################################################
+
+def _qInstallMessageHandler(handler):
+    '''Install a message handler that works in all bindings
+
+    Args:
+        handler: A function that takes 3 arguments, or None
+    '''
+
+    def messageOutputHandler(*args):
+        # In Qt5 bindings, message handlers are passed 3 arguments
+        # The first argument is a QtMsgType
+        # The last argument is the message to be printed
+        # The Middle argument (if passed) is a QMessageLogContext
+        if len(args) == 3:
+            msgType, logContext, msg = args
+        elif len(args) == 2:
+            msgType, msg = args
+            logContext = None
+        else:
+            raise TypeError(
+                'handler expected 2 or 3 arguments, got {0}'.format(len(args)))
+
+        if isinstance(msg, bytes):
+            # In python 3, some bindings pass a bytestring, which cannot be
+            # used elsewhere. Decoding a python 2 or 3 bytestring object will
+            # consistently return a unicode object.
+            msg = msg.decode()
+
+        handler(msgType, logContext, msg)
+
+    if not handler:
+        handler = messageOutputHandler
+    return Qt._QtCore.qInstallMessageHandler(handler)
diff --git a/src/QtShim/__init__.py b/src/QtShim/__init__.py
new file mode 100644
index 0000000..0438cc0
--- /dev/null
+++ b/src/QtShim/__init__.py
@@ -0,0 +1,389 @@
+"""Minimal Python 3 shim around PyQt5 and Pyside2 Qt bindings for QML applications.
+
+Forked from https://github.com/mottosso/Qt.py under MIT License.
+Copyright (c) 2016 Marcus Ottosson
+
+Changes
+
+* Dropped Python2 and Qt4 support
+* Focus on last Python 3 release
+* Focus on last Qt API : QML
+
+Requirements
+
+* make use of lazy loading to speed up startup time !
+"""
+
+# Fixme: ressource file CodeReview/QtApplication/rcc/CodeReviewRessource.py
+
+####################################################################################################
+
+# Enable support for `from Qt import *`
+__all__ = []
+
+####################################################################################################
+
+import importlib
+import logging
+import os
+import sys
+import types
+
+from .QtConfig import _common_members, _misplaced_members, _compatibility_members
+
+####################################################################################################
+
+# _module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
+# Flags from environment variables
+QT_VERBOSE = bool(os.getenv('QT_VERBOSE'))
+
+QT_PREFERRED_BINDING = os.getenv('QT_PREFERRED_BINDING', '')
+if QT_PREFERRED_BINDING:
+    QT_PREFERRED_BINDING = list(x for x in QT_PREFERRED_BINDING.split(',') if x)
+else:
+    # on dec 2018, PySide2 is still not fully operational
+    QT_PREFERRED_BINDING = ('PyQt5', 'PySide2')
+
+####################################################################################################
+
+def _new_module(name):
+    return types.ModuleType(__name__ + '.' + name)
+
+####################################################################################################
+
+# Reference to Qt.py
+Qt = sys.modules[__name__]
+Qt.QtCompat = _new_module('QtCompat')
+
+####################################################################################################
+
+def _log(text):
+    if QT_VERBOSE:
+        # _logger print
+        sys.stdout.write(text + '\n')
+
+####################################################################################################
+
+def _import_sub_module(module, name):
+    """import a submodule"""
+    _log('_import_sub_module {} {}'.format(module, name))
+    module_name = module.__name__ + '.' + name # e.g. PyQt5.QtCore
+    module = importlib.import_module(module_name)
+    return module
+
+####################################################################################################
+
+def _setup(module, extras):
+    """Install common submodules"""
+
+    Qt.__binding__ = module.__name__
+
+    for name in list(_common_members) + extras:
+        try:
+            submodule = _import_sub_module(module, name)
+        except ImportError:
+            try:
+                # For extra modules like sip and shiboken that may not be
+                # children of the binding.
+                submodule = __import__(name)
+            except ImportError:
+                continue
+
+        setattr(Qt, '_' + name, submodule)
+
+        if name not in extras:
+            # Store reference to original binding
+            setattr(Qt, name, _new_module(name)) # Qt.QtCore = module(so module)
+
+####################################################################################################
+
+def _reassign_misplaced_members(binding):
+    """Apply misplaced members from `binding` to Qt.py
+
+    Arguments:
+        binding (dict): Misplaced members
+
+    """
+
+    for src, dst in _misplaced_members[binding].items():
+        # print()
+        dst_value = None
+
+        # Fixme: to func
+        src_parts = src.split('.')
+        src_module = src_parts[0]
+        if len(src_parts):
+            src_member = src_parts[1:]
+        else:
+            src_member = None
+
+        if isinstance(dst, (list, tuple)):
+            dst, dst_value = dst
+        # print(src, '->', dst, dst_value)
+        # print(src_module, src_member)
+
+        dst_parts = dst.split('.')
+        dst_module = dst_parts[0]
+        if len(dst_parts):
+            dst_member = dst_parts[1]
+        else:
+            dst_member = None
+        # print(dst_module, dst_member)
+
+        # Get the member we want to store in the namesapce.
+        if not dst_value:
+            try:
+                _part = getattr(Qt, '_' + src_module)
+                while src_member:
+                    member = src_member.pop(0)
+                    _part = getattr(_part, member)
+                dst_value = _part
+            except AttributeError:
+                # If the member we want to store in the namespace does not
+                # exist, there is no need to continue. This can happen if a
+                # request was made to rename a member that didn't exist, for
+                # example if QtWidgets isn't available on the target platform.
+                _log('Misplaced member has no source: {0}'.format(src))
+                continue
+        # print(dst_value)
+
+        try:
+            # Fixme: src_object ???
+            src_object = getattr(Qt, dst_module)
+        except AttributeError:
+            # print('Failed to get src_object')
+            if dst_module not in _common_members:
+                # Only create the Qt parent module if its listed in
+                # _common_members. Without this check, if you remove QtCore
+                # from _common_members, the default _misplaced_members will add
+                # Qt.QtCore so it can add Signal, Slot, etc.
+                msg = "Not creating missing member module '{m}' for '{c}'"
+                _log(msg.format(m=dst_module, c=dst_member))
+                continue
+            # If the dst is valid but the Qt parent module does not exist
+            # then go ahead and create a new module to contain the member.
+            setattr(Qt, dst_module, _new_module(dst_module))
+            src_object = getattr(Qt, dst_module)
+            # Enable direct import of the new module
+            sys.modules[__name__ + '.' + dst_module] = src_object
+
+        if not dst_value:
+            dst_value = getattr(Qt, '_' + src_module)
+            if src_member:
+                dst_value = getattr(dst_value, src_member)
+
+        setattr(
+            src_object,
+            dst_member or dst_module,
+            dst_value
+        )
+
+####################################################################################################
+
+def _build_compatibility_members(binding, decorators=None):
+    """Apply `binding` to QtCompat
+
+    Arguments:
+        binding (str): Top level binding in _compatibility_members.
+        decorators (dict, optional): Provides the ability to decorate the
+            original Qt methods when needed by a binding. This can be used
+            to change the returned value to a standard value. The key should
+            be the classname, the value is a dict where the keys are the
+            target method names, and the values are the decorator functions.
+
+    """
+
+    decorators = decorators or dict()
+
+    # Allow optional site-level customization of the compatibility members.
+    # This method does not need to be implemented in QtSiteConfig.
+    try:
+        import QtSiteConfig
+    except ImportError:
+        pass
+    else:
+        if hasattr(QtSiteConfig, 'update_compatibility_decorators'):
+            QtSiteConfig.update_compatibility_decorators(binding, decorators)
+
+    _QtCompat = type('QtCompat', (object,), {})
+
+    for classname, bindings in _compatibility_members[binding].items():
+        attrs = {}
+        for target, binding in bindings.items():
+            namespaces = binding.split('.')
+            try:
+                src_object = getattr(Qt, '_' + namespaces[0])
+            except AttributeError as e:
+                _log('QtCompat: AttributeError: %s' % e)
+                # Skip reassignment of non-existing members.
+                # This can happen if a request was made to
+                # rename a member that didn't exist, for example
+                # if QtWidgets isn't available on the target platform.
+                continue
+
+            # Walk down any remaining namespace getting the object assuming
+            # that if the first namespace exists the rest will exist.
+            for namespace in namespaces[1:]:
+                src_object = getattr(src_object, namespace)
+
+            # decorate the Qt method if a decorator was provided.
+            if target in decorators.get(classname, []):
+                # staticmethod must be called on the decorated method to
+                # prevent a TypeError being raised when the decorated method
+                # is called.
+                src_object = staticmethod(
+                    decorators[classname][target](src_object))
+
+            attrs[target] = src_object
+
+        # Create the QtCompat class and install it into the namespace
+        compat_class = type(classname, (_QtCompat,), attrs)
+        setattr(Qt.QtCompat, classname, compat_class)
+
+####################################################################################################
+
+def _pyside2():
+    """Initialise PySide2
+
+    These functions serve to test the existence of a binding
+    along with set it up in such a way that it aligns with
+    the final step; adding members from the original binding
+    to Qt.py
+
+    """
+
+    import PySide2 as module
+    extras = []
+    # try:
+    #     from PySide2 import shiboken2
+    #     extras.append('shiboken2')
+    # except ImportError:
+    #     pass
+
+    _setup(module, extras)
+    Qt.__binding_version__ = module.__version__
+
+    # if hasattr(Qt, '_shiboken2'):
+    #     Qt.QtCompat.wrapInstance = _wrapinstance
+    #     Qt.QtCompat.getCppPointer = _getcpppointer
+    #     Qt.QtCompat.delete = shiboken2.delete
+
+    if hasattr(Qt, '_QtCore'):
+        Qt.__qt_version__ = Qt._QtCore.qVersion()
+
+    # if hasattr(Qt, '_QtWidgets'):
+    #     Qt.QtCompat.setSectionResizeMode = \
+    #         Qt._QtWidgets.QHeaderView.setSectionResizeMode
+
+    _reassign_misplaced_members('PySide2')
+    # _build_compatibility_members('PySide2')
+
+####################################################################################################
+
+def _pyqt5():
+    """Initialise PyQt5"""
+
+    import PyQt5 as module
+    extras = []
+    # try:
+    #     import sip
+    #     extras.append(sip.__name__)
+    # except ImportError:
+    #     sip = None
+
+    _setup(module, extras)
+    # if hasattr(Qt, '_sip'):
+    #     Qt.QtCompat.wrapInstance = _wrapinstance
+    #     Qt.QtCompat.getCppPointer = _getcpppointer
+    #     Qt.QtCompat.delete = sip.delete
+
+    if hasattr(Qt, '_QtCore'):
+        Qt.__binding_version__ = Qt._QtCore.PYQT_VERSION_STR
+        Qt.__qt_version__ = Qt._QtCore.QT_VERSION_STR
+
+    # if hasattr(Qt, '_QtWidgets'):
+    #     Qt.QtCompat.setSectionResizeMode = \
+    #         Qt._QtWidgets.QHeaderView.setSectionResizeMode
+
+    _reassign_misplaced_members('PyQt5')
+    # _build_compatibility_members('PyQt5')
+
+####################################################################################################
+
+def _install():
+
+    # Default order (customise order and content via QT_PREFERRED_BINDING)
+    order = QT_PREFERRED_BINDING
+
+    available = {
+        'PySide2': _pyside2,
+        'PyQt5': _pyqt5,
+    }
+
+    _log("Order: {}".format(' '.join(order)))
+
+    found_binding = False
+    for name in order:
+        _log('Trying %s' % name)
+
+        try:
+            available[name]()
+            found_binding = True
+            break
+
+        except ImportError as e:
+            _log('ImportError: %s' % e)
+
+        except KeyError:
+            _log("ImportError: Preferred binding '%s' not found." % name)
+
+    if not found_binding:
+        # If not binding were found, throw this error
+        raise ImportError('No Qt binding were found.')
+
+    # Install individual members
+    for name, members in _common_members.items():
+        try:
+            their_submodule = getattr(Qt, '_' + name)
+        except AttributeError:
+            continue
+
+        our_submodule = getattr(Qt, name)
+
+        # Enable import *
+        __all__.append(name)
+
+        # Enable direct import of submodule,
+        # e.g. import Qt.QtCore
+        sys.modules[__name__ + '.' + name] = our_submodule
+
+        for member in members:
+            # Accept that a submodule may miss certain members.
+            try:
+                their_member = getattr(their_submodule, member)
+            except AttributeError:
+                _log("'%s.%s' was missing." % (name, member))
+                continue
+            setattr(our_submodule, member, their_member)
+
+    # Enable direct import of QtCompat
+    sys.modules['Qt.QtCompat'] = Qt.QtCompat
+
+####################################################################################################
+
+_install()
+
+####################################################################################################
+
+# Fixme: Python 3.7
+# def __getattr__(name):
+#     print('__getattr__', name)
+
+####################################################################################################
+
+# Setup Binding Enum states
+Qt.IsPySide2 = Qt.__binding__ == 'PySide2'
+Qt.IsPyQt5 = not Qt.IsPySide2
diff --git a/src/QtShim/not-implemented.py b/src/QtShim/not-implemented.py
new file mode 100644
index 0000000..be022e1
--- /dev/null
+++ b/src/QtShim/not-implemented.py
@@ -0,0 +1,116 @@
+####################################################################################################
+
+def _getcpppointer(object):
+    if hasattr(Qt, '_shiboken2'):
+        return getattr(Qt, '_shiboken2').getCppPointer(object)[0]
+    elif hasattr(Qt, '_sip'):
+        return getattr(Qt, '_sip').unwrapinstance(object)
+    raise AttributeError("'module' has no attribute 'getCppPointer'")
+
+####################################################################################################
+
+def _wrapinstance(ptr, base=None):
+    '''Enable implicit cast of pointer to most suitable class
+
+    This behaviour is available in sip per default.
+
+    Based on http://nathanhorne.com/pyqtpyside-wrap-instance
+
+    Usage:
+        This mechanism kicks in under these circumstances.
+        1. Qt.py is using PySide 1 or 2.
+        2. A `base` argument is not provided.
+
+        See :func:`QtCompat.wrapInstance()`
+
+    Arguments:
+        ptr (int): Pointer to QObject in memory
+        base (QObject, optional): Base class to wrap with. Defaults to QObject,
+            which should handle anything.
+
+    '''
+
+    assert isinstance(ptr, int), "Argument 'ptr' must be of type <int>"
+    assert (base is None) or issubclass(base, Qt.QtCore.QObject), (
+        "Argument 'base' must be of type <QObject>")
+
+    if Qt.IsPyQt4 or Qt.IsPyQt5:
+        func = getattr(Qt, '_sip').wrapinstance
+    elif Qt.IsPySide2:
+        func = getattr(Qt, '_shiboken2').wrapInstance
+    elif Qt.IsPySide:
+        func = getattr(Qt, '_shiboken').wrapInstance
+    else:
+        raise AttributeError("'module' has no attribute 'wrapInstance'")
+
+    if base is None:
+        q_object = func(int(ptr), Qt.QtCore.QObject)
+        meta_object = q_object.metaObject()
+        class_name = meta_object.className()
+        super_class_name = meta_object.superClass().className()
+
+        if hasattr(Qt.QtWidgets, class_name):
+            base = getattr(Qt.QtWidgets, class_name)
+
+        elif hasattr(Qt.QtWidgets, super_class_name):
+            base = getattr(Qt.QtWidgets, super_class_name)
+
+        else:
+            base = Qt.QtCore.QObject
+
+    return func(int(ptr), base)
+
+####################################################################################################
+
+def _translate(context, sourceText, *args):
+    # In Qt4 bindings, translate can be passed 2 or 3 arguments
+    # In Qt5 bindings, translate can be passed 2 arguments
+    # The first argument is disambiguation[str]
+    # The last argument is n[int]
+    # The middle argument can be encoding[QtCore.QCoreApplication.Encoding]
+    if len(args) == 3:
+        disambiguation, encoding, n = args
+    elif len(args) == 2:
+        disambiguation, n = args
+        encoding = None
+    else:
+        raise TypeError(
+            'Expected 4 or 5 arguments, got {0}.'.format(len(args) + 2))
+
+    if hasattr(Qt.QtCore, 'QCoreApplication'):
+        app = getattr(Qt.QtCore, 'QCoreApplication')
+    else:
+        raise NotImplementedError(
+            'Missing QCoreApplication implementation for {binding}'.format(
+                binding=Qt.__binding__,
+            )
+        )
+    if Qt.__binding__ in ('PySide2', 'PyQt5'):
+        sanitized_args = [context, sourceText, disambiguation, n]
+    else:
+        sanitized_args = [
+            context,
+            sourceText,
+            disambiguation,
+            encoding or app.CodecForTr,
+            n
+        ]
+    return app.translate(*sanitized_args)
+
+####################################################################################################
+####################################################################################################
+
+def _none():
+    '''Internal option (used in installer)'''
+
+    Mock = type('Mock', (), {'__getattr__': lambda Qt, attr: None})
+
+    Qt.__binding__ = 'None'
+    Qt.__qt_version__ = '0.0.0'
+    Qt.__binding_version__ = '0.0.0'
+    Qt.QtCompat.loadUi = lambda uifile, baseinstance=None: None
+    Qt.QtCompat.setSectionResizeMode = lambda *args, **kwargs: None
+
+    for submodule in _common_members.keys():
+        setattr(Qt, submodule, Mock())
+        setattr(Qt, '_' + submodule, Mock())
diff --git a/tasks/__init__.py b/tasks/__init__.py
new file mode 100644
index 0000000..ce165f0
--- /dev/null
+++ b/tasks/__init__.py
@@ -0,0 +1,37 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+# http://www.pyinvoke.org
+
+####################################################################################################
+
+from invoke import task, Collection
+ # import sys
+
+####################################################################################################
+
+from . import clean
+from . import doc
+from . import release
+
+ns = Collection()
+ns.add_collection(Collection.from_module(clean))
+ns.add_collection(Collection.from_module(release))
+ns.add_collection(Collection.from_module(doc))
diff --git a/tasks/clean.py b/tasks/clean.py
new file mode 100644
index 0000000..2ef1b71
--- /dev/null
+++ b/tasks/clean.py
@@ -0,0 +1,38 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from invoke import task
+
+####################################################################################################
+
+@task
+def clean_flycheck(ctx):
+    with ctx.cd(ctx.Package):
+        ctx.run('find . -name "flycheck*.py" -exec rm {} \;')
+
+@task
+def clean_emacs_backup(ctx):
+    ctx.run('find . -name "*~" -type f -exec rm -f {} \;')
+
+@task(clean_flycheck, clean_emacs_backup)
+def clean(ctx):
+    pass
diff --git a/tasks/data/license-template.py b/tasks/data/license-template.py
new file mode 100644
index 0000000..1de9fa0
--- /dev/null
+++ b/tasks/data/license-template.py
@@ -0,0 +1,19 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+####################################################################################################
diff --git a/tasks/data/license-template.qml b/tasks/data/license-template.qml
new file mode 100644
index 0000000..63f63df
--- /dev/null
+++ b/tasks/data/license-template.qml
@@ -0,0 +1,19 @@
+/***************************************************************************************************
+ *
+ *  CodeReview - A Code Review GUI
+ *  Copyright (C) 2019 Fabrice Salvaire
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ ***************************************************************************************************/
diff --git a/tasks/doc.py b/tasks/doc.py
new file mode 100644
index 0000000..7e6af7d
--- /dev/null
+++ b/tasks/doc.py
@@ -0,0 +1,90 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from pathlib import Path
+
+from invoke import task
+
+####################################################################################################
+
+from .clean import clean_flycheck as clean_flycheck
+
+####################################################################################################
+
+CODEREVIEW_SOURCE_PATH = Path(__file__).resolve().parents[1]
+
+SPHINX_PATH = CODEREVIEW_SOURCE_PATH.joinpath('doc', 'sphinx')
+BUILD_PATH = SPHINX_PATH.joinpath('build')
+RST_SOURCE_PATH = SPHINX_PATH.joinpath('source')
+RST_API_PATH = RST_SOURCE_PATH.joinpath('api')
+RST_EXAMPLES_PATH = RST_SOURCE_PATH.joinpath('examples')
+
+####################################################################################################
+
+@task
+def clean_api(ctx):
+    ctx.run('rm -rf doc/sphinx/source/api')
+
+####################################################################################################
+
+@task(clean_flycheck, clean_api)
+def make_api(ctx):
+    print('\nGenerate RST API files')
+    ctx.run('pyterate-rst-api {0.Package}'.format(ctx))
+    print('\nRun Sphinx')
+    with ctx.cd('doc/sphinx/'):
+        ctx.run('./make-html') #--clean
+
+####################################################################################################
+
+@task
+def run_sphinx(ctx):
+    print()
+    print('Run Sphinx')
+    working_path = SPHINX_PATH
+    # subprocess.run(('make-html'), cwd=working_path)
+    # --clean
+    with ctx.cd(str(working_path)):
+        ctx.run('make-html')
+
+@task(run_sphinx)
+def publish(ctx):
+    with ctx.cd(str(CODEREVIEW_SOURCE_PATH.joinpath('gh-pages'))):
+        ctx.run('update-gh-pages')
+
+####################################################################################################
+
+@task()
+def make_readme(ctx):
+    from setup_data import long_description
+    with open('README.rst', 'w') as fh:
+        fh.write(long_description)
+    # import subprocess
+    # subprocess.call(('rst2html', 'README.rst', 'README.html'))
+    ctx.run('rst2html README.rst README.html')
+
+####################################################################################################
+
+@task
+def update_authors(ctx):
+    # Keep authors in the order of appearance and use awk to filter out dupes
+    ctx.run("git log --format='- %aN <%aE>' --reverse | awk '!x[$0]++' > AUTHORS")
diff --git a/tasks/release.py b/tasks/release.py
new file mode 100644
index 0000000..f25e113
--- /dev/null
+++ b/tasks/release.py
@@ -0,0 +1,200 @@
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from pathlib import Path
+import re
+import shutil
+
+from invoke import task
+
+####################################################################################################
+
+STANDARD_PACKAGES = (
+    'argparse',
+    'atexit',
+    'datetime',
+    'glob',
+    'hashlib',
+    'importlib',
+    'json',
+    'logging',
+    'operator',
+    'os',
+    'pathlib',
+    'shutil',
+    'signal',
+    'stat',
+    'subprocess',
+    'sys',
+    'time',
+    'traceback',
+)
+
+@task()
+def show_import(ctx):
+    package = ctx.Package
+    with ctx.cd(package):
+        result = ctx.run("grep -r -h -E  '^(import|from) [a-zA-Z]' . | sort | uniq", hide='out')
+    imports = set()
+    for line in result.stdout.split('\n'):
+        if line.startswith('from'):
+            position = line.find('import')
+            line = line[5:position]
+        elif line.startswith('import'):
+            line = line[7:]
+        # print('|{}|'.format(line))
+        position = line.find('.')
+        if position != -1:
+            line = line[:position]
+        line = line.strip()
+        if line:
+            imports.add(line)
+    imports -= set(STANDARD_PACKAGES)
+    imports -= set((package,))
+    for item in sorted(imports):
+        print(item)
+
+@task
+def find_package(ctx, name):
+    ctx.run('pip freeze | grep -i {}'.format(name))
+
+####################################################################################################
+
+@task()
+def update_git_sha(ctx):
+    # Fixme: wrong workflow, must tag the last commit
+    result = ctx.run('git describe --tags --abbrev=0 --always', hide='out')
+    tag = result.stdout.strip()
+    print(f"Tag is {tag}")
+    if tag.startswith('v'):
+        version = tag[1:]
+        version = version.replace('-branched', '')
+    else:
+        version = tag
+    if not re.match('\d+(\.\d+(\.\d+)?)?', version):
+        raise ValueError('Invalid version {}'.format(version))
+    result = ctx.run('git rev-parse HEAD', hide='out')
+    sha = result.stdout.strip()
+    print(f"SHA {sha}")
+    print(f"Tag {tag}")
+    print(f"Version {version}")
+    filename = Path(ctx.Package, '__init__.py')
+    with open(str(filename), 'r') as fh:
+        lines = fh.readlines()
+    with open(filename, 'w') as fh:
+        for line in lines:
+            if line.startswith('__version__'):
+                line = "__version__ = '{}'\n".format(version)
+            if line.startswith('GIT_TAG'):
+                line = "GIT_TAG = '{}'\n".format(tag)
+            if line.startswith('GIT_SHA'):
+                line = "GIT_SHA = '{}'\n".format(sha)
+            fh.write(line)
+
+####################################################################################################
+
+@task()
+def clean(ctx):
+    for directory in ('build', 'dist', 'PySpice.egg-info'):
+        shutil.rmtree(directory, ignore_errors=True)
+
+@task()
+def show_python_site(ctx):
+    ctx.run('python3 -m site')
+
+@task(update_git_sha)
+def build(ctx):
+    ctx.run('python3 setup.py build')
+
+@task(build)
+def install(ctx):
+    ctx.run('python3 setup.py install')
+
+# @task(clean, build)
+# def sdist(ctx):
+#     ctx.run('python3 setup.py sdist')
+
+# @task(clean, build)
+# def bdist(ctx):
+#     ctx.run('python3 setup.py bdist')
+
+@task(clean, build)
+def wheel(ctx):
+    ctx.run('python3 setup.py sdist')
+    ctx.run('python3 setup.py bdist_wheel')
+
+@task(wheel)
+def upload(ctx):
+    # Twine documentation: https://pypi.org/project/twine/
+    # ctx.run('twine register dist/*whl')
+    # Sign using
+    #   BA24CE0F65CB8C67 Fabrice SALVAIRE <gpg AT fabrice-salvaire.fr>
+    #   registered on key servers: hkps://hkps.pool.sks-keyservers.net hkp://pgp.mit.edu
+    ctx.run('gpg --detach-sign --armor dist/*tar.gz')
+    ctx.run('gpg --detach-sign --armor dist/*whl')
+    # Binary wheel 'CodeReview-1.1.0-cp310-cp310-linux_x86_64.whl' has an unsupported platform tag 'linux_x86_64'.
+    # see https://github.com/pypa/manylinux
+    # see https://github.com/pypa/auditwheel
+    ctx.run('twine upload dist/*tar.gz')
+
+def _get_pipy_json():
+    import requests
+    response = requests.get('https://pypi.org/pypi/PySpice/json')
+    assert(response.status_code == requests.codes.ok)
+    return response.json()
+
+@task()
+def get_pypi_json(ctx):
+    import json
+    print(json.dumps(_get_pipy_json(), sort_keys=True, indent=4))
+
+@task()
+def get_wheel(ctx):
+    # https://dzone.com/articles/package-signing-in-pip-it-works-in-a-roundabout-so
+    data = _get_pipy_json()
+    version = data['info']['version']
+    filename = data['urls'][0]['filename']
+    wheel_url = data['urls'][0]['url']
+    print('Get version {}'.format(version))
+    ctx.run('curl --output {} {}'.format(filename, wheel_url))
+    asc_suffix = '.asc'
+    filename_asc = filename + asc_suffix
+    ctx.run('curl --output {} {}'.format(filename_asc, wheel_url + asc_suffix))
+    # ctx.run('gpg --keyserver pgp.mit.edu --search-keys {}'.format(key_id))
+    ctx.run('gpg --verify {} {}'.format(filename_asc, filename))
+
+####################################################################################################
+
+@task()
+def get_github_tar_sha(ctx):
+    # Fixme: check git sha
+    result = ctx.run('git describe --tags --abbrev=0 --always', hide='out')
+    tag = result.stdout.strip()
+    url = 'https://github.com/FabriceSalvaire/PySpice/archive/{}.tar.gz'.format(tag)
+    print('Get', url)
+    import hashlib
+    import requests
+    response = requests.get(url, allow_redirects=True)
+    assert(response.status_code == requests.codes.ok)
+    sha = hashlib.sha256(response.content)
+    print(sha.hexdigest())
+
diff --git a/tasks/scripts/Makefile b/tasks/scripts/Makefile
new file mode 100644
index 0000000..45e869a
--- /dev/null
+++ b/tasks/scripts/Makefile
@@ -0,0 +1,18 @@
+# -*- Makefile -*-
+
+####################################################################################################
+
+all: code-review.rcc CodeReviewRessource.py
+
+####################################################################################################
+
+%.rcc : %.qrc
+	rcc-qt5 -binary $< -o $@
+
+CodeReviewRessource.py : code-review.qrc
+	pyrcc5 -o $@ $<
+
+####################################################################################################
+
+clean:
+	rm *.py *.rcc
diff --git a/tasks/scripts/get-material-icon b/tasks/scripts/get-material-icon
new file mode 100755
index 0000000..61673a4
--- /dev/null
+++ b/tasks/scripts/get-material-icon
@@ -0,0 +1,184 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+
+# https://material.io/tools/icons/static/icons/baseline-save-24px.svg
+# https://material.io/tools/icons/static/icons/baseline-save-black-36.zip
+
+# https://material.io/tools/icons/static/icons/outline-save-black-36.zip
+# https://material.io/tools/icons/static/icons/round-save-black-36.zip
+# https://material.io/tools/icons/static/icons/sharp-save-black-36.zip
+# https://material.io/tools/icons/static/icons/twotone-save-black-36.zip
+
+# https://material.io/tools/icons/static/icons/baseline-save-white-36.zip
+
+# 1x/baseline_save_black_18dp.png: PNG image data, 18 x 18, 8-bit gray+alpha, non-interlaced
+# 1x/baseline_save_black_24dp.png: PNG image data, 24 x 24, 8-bit gray+alpha, non-interlaced
+# 1x/baseline_save_black_36dp.png: PNG image data, 36 x 36, 8-bit gray+alpha, non-interlaced
+# 1x/baseline_save_black_48dp.png: PNG image data, 48 x 48, 8-bit gray+alpha, non-interlaced
+
+# 2x/baseline_save_black_18dp.png: PNG image data, 36 x 36, 8-bit gray+alpha, non-interlaced
+# 2x/baseline_save_black_24dp.png: PNG image data, 48 x 48, 8-bit gray+alpha, non-interlaced
+# 2x/baseline_save_black_36dp.png: PNG image data, 72 x 72, 8-bit gray+alpha, non-interlaced
+# 2x/baseline_save_black_48dp.png: PNG image data, 96 x 96, 8-bit gray+alpha, non-interlaced
+
+####################################################################################################
+
+from pathlib import Path
+from zipfile import ZipFile
+import argparse
+import os
+import shutil
+import tempfile
+import urllib3
+
+####################################################################################################
+
+parser = argparse.ArgumentParser(description='Fetch material icon.')
+
+parser.add_argument(
+    'src_name', metavar='NAME',
+    help='icon name',
+)
+
+parser.add_argument(
+    '--dst-name',
+    default=None,
+    help='dst name, default is same name',
+)
+
+parser.add_argument(
+    '--style',
+    default='baseline',
+    help='style: [baseline], outline, round, twotone, sharp',
+)
+
+parser.add_argument(
+    '--color',
+    default='black',
+    help='color: [black], white',
+)
+
+args = parser.parse_args()
+
+####################################################################################################
+
+urllib3.disable_warnings()
+
+####################################################################################################
+
+class MaterialIconFetcher:
+
+    SCALE = (1, 2)
+    DP = (18, 24, 36, 48)
+
+    ##############################################
+
+    def __init__(self, icons_path, theme):
+
+        self._icons_path = Path(str(icons_path)).resolve()
+        self._theme = str(theme)
+        self._theme_path = self._icons_path.joinpath(self._theme)
+
+        if not self._icons_path.exists():
+            os.mkdir(self._icons_path)
+        if not self._theme_path.exists():
+            os.mkdir(self._theme_path)
+
+        self._http = urllib3.PoolManager()
+
+        # with tempfile.TemporaryDirectory() as tmp_directory:
+        self._tmp_directory = tempfile.TemporaryDirectory()
+        self._tmp_directory_path = Path(self._tmp_directory.name)
+        print('tmp_directory', self._tmp_directory_path)
+
+    ##############################################
+
+    def _fetch_ressource(self, url):
+        print('Fetch', url, '...')
+        request = self._http.request('GET', url)
+        return request.data
+
+    ##############################################
+
+    def _fetch_png_icon(self, **kwargs):
+
+        # https://material.io/tools/icons/static/icons/baseline-save-black-36.zip
+        root = 'https://material.io/tools/icons/static/icons/'
+        url_pattern = '{style}-{name}-{color}-{dp}.zip'
+        filename = url_pattern.format(**kwargs)
+        url = root + filename
+
+        data = self._fetch_ressource(url)
+
+        return filename, data
+
+    ##############################################
+
+    def _extract_png_archive(self, **kwargs):
+
+            filename, data = self._fetch_png_icon(**kwargs)
+            zip_path = self._tmp_directory_path.joinpath(filename)
+            with open(zip_path, 'wb') as fh:
+                fh.write(data)
+            with ZipFile(zip_path, 'r') as zip_archive:
+                zip_archive.extractall(self._tmp_directory_path)
+
+    ##############################################
+
+    def fetch_icon(self, src_name, dst_name, style, color):
+
+        kwargs = dict(src_name=src_name, dst_name=dst_name, style=style, color=color)
+
+        for dp in self.DP:
+            self._extract_png_archive(name=src_name, dp=dp, **kwargs)
+
+        print()
+        for scale in self.SCALE:
+            for dp in self.DP:
+                dst_kwargs = dict(kwargs)
+                dst_kwargs.update(dict(scale=scale, dp=dp))
+
+                # 1x/baseline_save_black_18dp.png
+                filename_pattern = '{style}_{src_name}_{color}_{dp}dp.png'
+                src_path = self._tmp_directory_path.joinpath(
+                    '{scale}x'.format(**dst_kwargs),
+                    filename_pattern.format(**dst_kwargs),
+                )
+
+                if scale > 1:
+                    size_directory = '{dp}x{dp}@{scale}'.format(**dst_kwargs)
+                else:
+                    size_directory = '{dp}x{dp}'.format(**dst_kwargs)
+                size_path = self._theme_path.joinpath(size_directory)
+                if not size_path.exists():
+                    os.mkdir(size_path)
+                filename_pattern = '{dst_name}-{color}.png'
+                filename = filename_pattern.format(**dst_kwargs)
+                dst_path = size_path.joinpath(filename)
+
+                # print('Copy', src_path, dst_path)
+                shutil.copyfile(src_path, dst_path)
+
+                rcc_pattern = '<file>icons/{}/{}/{}</file>'
+                rcc_line = rcc_pattern.format(self._theme, size_directory, filename)
+                if dp != 36:
+                    rcc_line = '<!-- {} -->'.format(rcc_line)
+                rcc_line = ' '*8 + rcc_line
+                print(rcc_line)
+
+####################################################################################################
+
+root_path = Path(__file__).resolve().parents[1]
+icons_path = root_path.joinpath('share', 'icons')
+theme = 'material'
+print('Icons path:', icons_path, theme)
+
+fetcher = MaterialIconFetcher(icons_path, theme)
+
+fetcher.fetch_icon(
+    args.src_name,
+    args.dst_name or args.src_name.replace('_', '-'),
+    args.style,
+    args.color,
+)
diff --git a/tasks/scripts/make-icon-png b/tasks/scripts/make-icon-png
new file mode 100755
index 0000000..b982a8d
--- /dev/null
+++ b/tasks/scripts/make-icon-png
@@ -0,0 +1,80 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from pathlib import Path
+import argparse
+import subprocess
+
+####################################################################################################
+
+parser = argparse.ArgumentParser(description='Generate PNG files from a SVG.')
+parser.add_argument(
+    'svg_path', metavar='file.svg',
+    help='SVG PATH',
+)
+args = parser.parse_args()
+
+####################################################################################################
+
+theme = 'material'
+DP = (36, 48)
+SCALE = (1, 2)
+
+svg_path = Path(args.svg_path).resolve()
+theme_path = svg_path.parents[1].joinpath(theme)
+print('Theme path:', theme_path)
+
+####################################################################################################
+
+inkscape_options = [
+    '--export-area-page',
+    '--export-background=white',
+    '--export-background-opacity=0',
+]
+
+####################################################################################################
+
+def run_inkscape(svg_path, dp, scale):
+    filename = svg_path.name.replace('.svg', '.png')
+    if scale > 1:
+        size_directory = '{dp}x{dp}@{scale}'.format(dp=dp, scale=scale)
+    else:
+        size_directory = '{dp}x{dp}'.format(dp=dp)
+    png_path = theme_path.joinpath(size_directory, filename)
+    command = (
+        'inkscape',
+        *inkscape_options,
+        '--export-png={}'.format(png_path),
+        # --export-width=
+        '--export-height={}'.format(dp*scale),
+        str(svg_path),
+    )
+    print('>', ' '.join(command))
+    subprocess.check_call(command)
+
+####################################################################################################
+
+for dp in DP:
+    for scale in SCALE:
+        run_inkscape(svg_path, dp, scale)
diff --git a/tasks/scripts/make-logo-png b/tasks/scripts/make-logo-png
new file mode 100755
index 0000000..d5dd866
--- /dev/null
+++ b/tasks/scripts/make-logo-png
@@ -0,0 +1,67 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+####################################################################################################
+
+from pathlib import Path
+import argparse
+import subprocess
+
+####################################################################################################
+
+parser = argparse.ArgumentParser(description='Generate PNG files from a SVG.')
+parser.add_argument(
+    'svg_path', metavar='file.svg',
+    help='SVG PATH',
+)
+args = parser.parse_args()
+
+svg_path = Path(args.svg_path).resolve()
+
+####################################################################################################
+
+sizes = (32, 64, 96, 128, 256, 512)
+
+inkscape_options = [
+    '--export-area-page',
+    '--export-background=white',
+    '--export-background-opacity=0',
+]
+
+####################################################################################################
+
+def run_inkscape(svg_path, size):
+    command = (
+        'inkscape',
+        *inkscape_options,
+        '--export-png=logo-{}.png'.format(size),
+        # --export-width=
+        '--export-height={}'.format(size),
+        str(svg_path),
+    )
+    print('>', ' '.join(command))
+    subprocess.check_call(command)
+
+####################################################################################################
+
+for size in sizes:
+    run_inkscape(svg_path, size)
diff --git a/tasks/scripts/translate b/tasks/scripts/translate
new file mode 100755
index 0000000..d1f0d4c
--- /dev/null
+++ b/tasks/scripts/translate
@@ -0,0 +1,534 @@
+#! /usr/bin/env python3
+
+####################################################################################################
+#
+# CodeReview - A Code Review GUI
+# Copyright (C) 2019 Fabrice Salvaire
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+####################################################################################################
+
+"""Program to manage and translate Qt translation files.
+
+It features:
+
+* lupdate, linguist, lrelease
+* conversion to/from .po file
+* poedit
+* translation using Google Translation
+
+Actions are run in the right order.
+
+"""
+
+####################################################################################################
+
+from pathlib import Path
+import argparse
+import os
+import subprocess
+
+from googletrans import Translator
+# https://py-googletrans.readthedocs.io/en/latest/
+
+####################################################################################################
+
+DEFAULT_LANGUAGES = (
+    'fr_FR',
+)
+
+# Fixme: project dependent
+source_path = Path(__file__).resolve().parents[1]
+qml_path = source_path.joinpath('qml')
+py_path = source_path.joinpath('CodeReview')
+translation_path = source_path.joinpath('share', 'translations')
+base_name = 'code-review'
+
+####################################################################################################
+
+parser = argparse.ArgumentParser(description='Translate Qt Application.')
+
+parser.add_argument(
+    '--language',
+    default=None,
+    help='languages, default {}'.format(DEFAULT_LANGUAGES),
+)
+
+parser.add_argument(
+    '--update',
+    default=False,
+    action='store_true',
+    help='run lupdate',
+)
+
+parser.add_argument(
+    '--translate',
+    default=False,
+    action='store_true',
+    help='translate using Google Translate',
+)
+
+parser.add_argument(
+    '--convert-to-po',
+    default=False,
+    action='store_true',
+    help='convert to .po file',
+)
+
+parser.add_argument(
+    '--convert-from-po',
+    default=False,
+    action='store_true',
+    help='convert from .po file',
+)
+
+parser.add_argument(
+    '--poedit',
+    default=False,
+    action='store_true',
+    help='run poedit',
+)
+
+parser.add_argument(
+    '--linguist',
+    default=False,
+    action='store_true',
+    help='run linguist',
+)
+
+parser.add_argument(
+    '--release',
+    default=False,
+    action='store_true',
+    help='run lrelease',
+)
+
+args = parser.parse_args()
+
+####################################################################################################
+
+def _clean_path(path):
+    return Path(str(path)).resolve()
+
+####################################################################################################
+
+class TanslationManager:
+
+    ##############################################
+
+    def __init__(self, translation_path, base_name, py_path, qml_path):
+
+        self._translation_path = _clean_path(translation_path)
+        self._base_name = base_name
+        self._py_path = _clean_path(py_path)
+        self._qml_path = _clean_path(qml_path)
+
+        if not self._translation_path.exists():
+            os.mkdir(self._translation_path)
+
+    ##############################################
+
+    def ts_path(self, scope, language):
+        if scope:
+            filename = '{}.{}.{}.ts'.format(self._base_name, scope, language)
+        else:
+            filename = '{}.{}.ts'.format(self._base_name, language)
+        return self._translation_path.joinpath(filename)
+
+    def po_path(self, scope, language):
+        filename = '{}.{}.{}.po'.format(self._base_name, scope, language)
+        return self._translation_path.joinpath(filename)
+
+    ##############################################
+
+    def run_lupdate(self, language):
+
+        # Usage:
+        #     lupdate [options] [project-file]...
+        #     lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
+        #
+        # lupdate is part of Qt's Linguist tool chain. It extracts translatable
+        # messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
+        # Extracted messages are stored in textual translation source files (typically
+        # Qt TS XML). New and modified messages can be merged into existing TS files.
+        #
+        # Options:
+        #     -help  Display this information and exit.
+        #     -no-obsolete
+        #            Drop all obsolete and vanished strings.
+        #     -extensions <ext>[,<ext>]...
+        #            Process files with the given extensions only.
+        #            The extension list must be separated with commas, not with whitespace.
+        #            Default: 'java,jui,ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml,qrc'.
+        #     -pluralonly
+        #            Only include plural form messages.
+        #     -silent
+        #            Do not explain what is being done.
+        #     -no-sort
+        #            Do not sort contexts in TS files.
+        #     -no-recursive
+        #            Do not recursively scan the following directories.
+        #     -recursive
+        #            Recursively scan the following directories (default).
+        #     -I <includepath> or -I<includepath>
+        #            Additional location to look for include files.
+        #            May be specified multiple times.
+        #     -locations {absolute|relative|none}
+        #            Specify/override how source code references are saved in TS files.
+        #            Guessed from existing TS files if not specified.
+        #            Default is absolute for new files.
+        #     -no-ui-lines
+        #            Do not record line numbers in references to UI files.
+        #     -disable-heuristic {sametext|similartext|number}
+        #            Disable the named merge heuristic. Can be specified multiple times.
+        #     -pro <filename>
+        #            Name of a .pro file. Useful for files with .pro file syntax but
+        #            different file suffix. Projects are recursed into and merged.
+        #     -pro-out <directory>
+        #            Virtual output directory for processing subsequent .pro files.
+        #     -pro-debug
+        #            Trace processing .pro files. Specify twice for more verbosity.
+        #     -source-language <language>[_<region>]
+        #            Specify the language of the source strings for new files.
+        #            Defaults to POSIX if not specified.
+        #     -target-language <language>[_<region>]
+        #            Specify the language of the translations for new files.
+        #            Guessed from the file name if not specified.
+        #     -tr-function-alias <function>{+=,=}<alias>[,<function>{+=,=}<alias>]...
+        #            With +=, recognize <alias> as an alternative spelling of <function>.
+        #            With  =, recognize <alias> as the only spelling of <function>.
+        #            Available <function>s (with their currently defined aliases) are:
+        #              Q_DECLARE_TR_FUNCTIONS (=Q_DECLARE_TR_FUNCTIONS)
+        #              QT_TR_N_NOOP (=QT_TR_N_NOOP)
+        #              QT_TRID_N_NOOP (=QT_TRID_N_NOOP)
+        #              QT_TRANSLATE_N_NOOP (=QT_TRANSLATE_N_NOOP)
+        #              QT_TRANSLATE_N_NOOP3 (=QT_TRANSLATE_N_NOOP3)
+        #              QT_TR_NOOP (=QT_TR_NOOP)
+        #              QT_TRID_NOOP (=QT_TRID_NOOP)
+        #              QT_TRANSLATE_NOOP (=QT_TRANSLATE_NOOP)
+        #              QT_TRANSLATE_NOOP3 (=QT_TRANSLATE_NOOP3)
+        #              QT_TR_NOOP_UTF8 (=QT_TR_NOOP_UTF8)
+        #              QT_TRANSLATE_NOOP_UTF8 (=QT_TRANSLATE_NOOP_UTF8)
+        #              QT_TRANSLATE_NOOP3_UTF8 (=QT_TRANSLATE_NOOP3_UTF8)
+        #              findMessage (=findMessage)
+        #              qtTrId (=qtTrId)
+        #              tr (=tr)
+        #              trUtf8 (=trUtf8)
+        #              translate (=translate)
+        #              qsTr (=qsTr)
+        #              qsTrId (=qsTrId)
+        #              qsTranslate (=qsTranslate)
+        #     -ts <ts-file>...
+        #            Specify the output file(s). This will override the TRANSLATIONS.
+        #     -version
+        #            Display the version of lupdate and exit.
+        #     @lst-file
+        #            Read additional file names (one per line) or includepaths (one per
+        #            line, and prefixed with -I) from lst-file.
+
+        command = (
+            'lupdate-qt5',
+            '-extensions', 'qml,js',
+            '-source-language', 'en_GB',
+            '-target-language', language,
+            str(self._qml_path),
+            '-ts', str(self.ts_path('qml', language)),
+        )
+        print('>', ' '.join(command))
+        subprocess.check_call(command)
+
+        py_filenames = []
+        for root, _, filenames in os.walk(self._py_path):
+            root = Path(root)
+            for filename in filenames:
+                filename = Path(filename)
+                if filename.suffix == '.py':
+                    filename = str(root.joinpath(filename))
+                    py_filenames.append(filename)
+
+        command = (
+            'pylupdate5',
+            '-verbose',
+            *py_filenames,
+            '-ts', str(self.ts_path('py', language)),
+        )
+        print('>', ' '.join(command))
+        subprocess.check_call(command)
+
+        # Fixme: pylupdate5 don't support qml and folder !!!
+
+        # print('Fix obsolete')
+        # with open(ts_path, 'r') as fh:
+        #     content = fh.readlines()
+        # with open(ts_path, 'w') as fh:
+        #     for line in content:
+        #         line = line.replace('type="obsolete"', '')
+        #         line = line.replace('<translation >', '<translation>')
+        #         fh.write(line)
+
+    ##############################################
+
+    def run_linguist(self, language):
+
+        for scope in ('qml', 'py'):
+            command = (
+                'linguist-qt5',
+                str(self.ts_path(scope, language)),
+            )
+            print('>', ' '.join(command))
+            subprocess.check_call(command)
+
+    ##############################################
+
+    def run_poedit(self, language):
+
+        command = (
+            'poedit',
+            str(self.po_path(language)),
+        )
+        print('>', ' '.join(command))
+        subprocess.check_call(command)
+
+    ##############################################
+
+    def run_lrelease(self, language):
+
+        # Usage:
+        #     lrelease [options] project-file
+        #     lrelease [options] ts-files [-qm qm-file]
+        #
+        # lrelease is part of Qt's Linguist tool chain. It can be used as a
+        # stand-alone tool to convert XML-based translations files in the TS
+        # format into the 'compiled' QM format used by QTranslator objects.
+        #
+        # Options:
+        #     -help  Display this information and exit
+        #     -idbased
+        #            Use IDs instead of source strings for message keying
+        #     -compress
+        #            Compress the QM files
+        #     -nounfinished
+        #            Do not include unfinished translations
+        #     -removeidentical
+        #            If the translated text is the same as
+        #            the source text, do not include the message
+        #     -markuntranslated <prefix>
+        #            If a message has no real translation, use the source text
+        #            prefixed with the given string instead
+        #     -silent
+        #            Do not explain what is being done
+        #     -version
+        #            Display the version of lrelease and exit
+
+        command = (
+            'lconvert-qt5',
+            '-i',
+            str(self.ts_path('qml', language)),
+            str(self.ts_path('py', language)),
+            '-o', str(self.ts_path(None, language)),
+        )
+        print('>', ' '.join(command))
+        subprocess.check_call(command)
+
+        command = (
+            'lrelease-qt5',
+            str(self.ts_path(None, language)),
+        )
+        print('>', ' '.join(command))
+        subprocess.check_call(command)
+
+    ##############################################
+
+    def run_lconvert(self, language, format):
+
+        # Usage:
+        #     lconvert [options] <infile> [<infile>...]
+        #
+        # lconvert is part of Qt's Linguist tool chain. It can be used as a
+        # stand-alone tool to convert and filter translation data files.
+        # The following file formats are supported:
+        #
+        #     qm    - Traductions Qt compilées
+        #     pot   - Fichiers de modèle de localisation GNU Gettext
+        #     qph   - Qt Linguist "livre de phrases"
+        #     ts    - Sources de traduction Qt
+        #     po    - Fichiers de localisation GNU Gettext
+        #     xlf   - Fichiers de localisation XLIFF
+        #
+        # If multiple input files are specified, they are merged with
+        # translations from later files taking precedence.
+        #
+        # Options:
+        #     -h
+        #     -help  Display this information and exit.
+        #
+        #     -i <infile>
+        #     -input-file <infile>
+        #            Specify input file. Use if <infile> might start with a dash.
+        #            This option can be used several times to merge inputs.
+        #            May be '-' (standard input) for use in a pipe.
+        #
+        #     -o <outfile>
+        #     -output-file <outfile>
+        #            Specify output file. Default is '-' (standard output).
+        #
+        #     -if <informat>
+        #     -input-format <format>
+        #            Specify input format for subsequent <infile>s.
+        #            The format is auto-detected from the file name and defaults to 'ts'.
+        #
+        #     -of <outformat>
+        #     -output-format <outformat>
+        #            Specify output format. See -if.
+        #
+        #     -drop-tags <regexp>
+        #            Drop named extra tags when writing TS or XLIFF files.
+        #            May be specified repeatedly.
+        #
+        #     -drop-translations
+        #            Drop existing translations and reset the status to 'unfinished'.
+        #            Note: this implies --no-obsolete.
+        #
+        #     -source-language <language>[_<region>]
+        #            Specify/override the language of the source strings. Defaults to
+        #            POSIX if not specified and the file does not name it yet.
+        #
+        #     -target-language <language>[_<region>]
+        #            Specify/override the language of the translation.
+        #            The target language is guessed from the file name if this option
+        #            is not specified and the file contents name no language yet.
+        #
+        #     -no-obsolete
+        #            Drop obsolete messages.
+        #
+        #     -no-finished
+        #            Drop finished messages.
+        #
+        #     -no-untranslated
+        #            Drop untranslated messages.
+        #
+        #     -sort-contexts
+        #            Sort contexts in output TS file alphabetically.
+        #
+        #     -locations {absolute|relative|none}
+        #            Override how source code references are saved in TS files.
+        #            Default is absolute.
+        #
+        #     -no-ui-lines
+        #            Drop line numbers from references to UI files.
+        #
+        #     -verbose
+        #            be a bit more verbose
+        #
+        # Long options can be specified with only one leading dash, too.
+        #
+        # Return value:
+        #     0 on success
+        #     1 on command line parse failures
+        #     2 on read failures
+        #     3 on write failures
+
+        is_po = format == 'po'
+
+        for scope in ('qml', 'py'):
+            command = (
+                'lconvert-qt5',
+                '-i' if is_po else '-o', str(self.ts_path(scope, language)),
+                '-o' if is_po else '-i', str(self.po_path(language)),
+            )
+            print('>', ' '.join(command))
+            subprocess.check_call(command)
+
+    ##############################################
+
+    def translate(self, language):
+        for scope in ('qml', 'py'):
+            self.translate_scope(scope, language)
+
+    ##############################################
+
+    def translate_scope(self, scope, language):
+
+        print('Translate {} {} ...'.format(scope, language))
+
+        language_code = language[:2]
+        if language_code == 'en':
+            return
+
+        translator = Translator(
+            service_urls=[
+                'translate.google.' + language_code,
+                'translate.google.com',
+            ],
+        )
+
+        def translate_string(source):
+            return translator.translate(source, src='en', dest=language_code).text
+
+        ts_path = self.ts_path(scope, language)
+        with open(ts_path, 'r') as fh:
+            lines = list(fh.readlines())
+
+        with open(ts_path, 'w') as fh:
+            source = None
+            for line in lines:
+                striped_line = line.strip()
+                if striped_line.startswith('<source>'):
+                    source = striped_line[striped_line.find('>')+1:striped_line.rfind('<')]
+                elif striped_line.startswith('<translation type="unfinished">'):
+                    old_translation = striped_line[striped_line.find('>')+1:striped_line.rfind('<')]
+                    if not old_translation:
+                        translation = translate_string(source)
+                        print()
+                        print(source)
+                        print(translation)
+                        line = line.replace(' type="unfinished">', '>' + translation)
+                fh.write(line)
+
+####################################################################################################
+
+manager = TanslationManager(
+    translation_path,
+    base_name,
+    py_path,
+    qml_path,
+)
+
+if not args.language:
+    languages = DEFAULT_LANGUAGES
+else:
+    languages = [x for x in [x.strip() for x in args.languages.split(',')] if x]
+
+if args.update:
+    for language in languages:
+        manager.run_lupdate(language)
+if args.translate:
+    for language in languages:
+        manager.translate(language)
+if args.convert_to_po:
+    for language in languages:
+        manager.run_lconvert(language, 'po')
+if args.poedit:
+    for language in languages:
+        manager.run_poedit(language)
+if args.convert_from_po:
+    for language in languages:
+        manager.run_lconvert(language, 'ts')
+if args.linguist:
+    for language in languages:
+        manager.run_linguist(language)
+if args.release:
+    for language in languages:
+        manager.run_lrelease(language)
diff --git a/tasks/scripts/upload-to-pypi b/tasks/scripts/upload-to-pypi
new file mode 100755
index 0000000..36398ab
--- /dev/null
+++ b/tasks/scripts/upload-to-pypi
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+# bdist
+# python setup.py check --verbose --metadata --restructuredtext --strict && \
+#   python setup.py register sdist upload
+
+python setup.py bdist_wheel
+
+twine register dist/*whl
+gpg --detach-sign -a dist/*whl
+twine upload dist/*