Merge lp:~saccadic-masking/qbrz/qbrz into lp:qbrz

[Robert Ladyman]

Updated to work with Python3: still using PyQt4. Applied Olaf Seibert's and Yasuyuki Furukawa's suggested changes. Note that, for me, qmain, qverify-signatures and qhelp did not work with bzr, so have not been fully updated.

[Jelmer Vernooij (jelmer)]

Awesome, this is great to see!

I'm not entirely sure how to go about reviewing this since it's so large - it exceeds the 5000 line limit from Launchpad. I don't think it's realistic to review everything in detail so perhaps we can just stick to the higher level bits.

Are you the author of all of the files that are being added, including e.g. the css files?

[Robert Ladyman (saccadic-masking)]

Dear Jelmer,

It's the old code updated. I have taken the code changes by Olaf Seibert
(He ran 2 to 3 to convert to Python3), applied (partially) the patch
from Yasuyuki Furukawa to slightly update the PyQt4 calls:

(https://bugs.launchpad.net/qbrz/+bug/1850054/comments/5)

and then worked at it all to get the tests to pass and then to test each
command (as the tests often passed even if the code failed). My hair is
now even more grey.

If it's too big to merge, it might be easier to replace trunk with this
(the old trunk doesn't work in Python 3 anyway). Almost every file has
been changed, including Makefiles: I managed to use the old translation
files without change, so it also works in the other languages (although
they will need QBzr / Bazaar changed to QBrz / Breezy, which I can do)
and have updated the release mechanism so there is an .exe as well as a
.tar.gz (I can't test the .exe though).

I have not updated all the brz references nor the Author / Readme files
yet: wasn't certain it would be accepted or work well enough.

I'll update it with the textual changes, etc. I expect that there are
the odd bits that are still broken, but I am using this now every day
and about to rewrite two of our own tools (EasyBreezy and bzr-xmpp) for
Breezy: I will apply bug-fixes as I go.

I cannot test it on Windows, as I've discovered, so am now looking at
the brz code, which I note has a whole tools/win32 section with the old
bazaar Makefiles, etc., in it, to get a working Breezy .exe to install.

Regards,
RJL

P.S. the literate documentation is produced by pycco, which sometimes
gets things horribly wrong. I'll fix pycco later and re-run it then.
Another project.

On 16/07/2020 21:08, Jelmer Vernooij wrote:
> Awesome, this is great to see!
>
> I'm not entirely sure how to go about reviewing this since it's so large - it exceeds the 5000 line limit from Launchpad. I don't think it's realistic to review everything in detail so perhaps we can just stick to the higher level bits.
>
> Are you the author of all of the files that are being added, including e.g. the css files?
>

--
Robert Ladyman
HunterBirnie
Tel: [phone]
Mobile: [phone]
http://www.hunterbirnie.com
PGP: E40A2EE2AA9991E7
*************************************************************
HunterBirnie is a trading name of File-Away Limited
Registered in Scotland, Company Number: SC222086
Registered address: 30 Church St, Newtyle PH128TZ

[Robert Ladyman (saccadic-masking)]

To add: pycco creates the CSS files.

[Jelmer Vernooij (jelmer)]

Yeah, replacing trunk with your branch is probably the best option.

I don't think I'll have time to do a meaningful review, and if I did do that I'm not sure whether that would be a valuable use of your or my time. I also don't have a good way of running qbrz myself, since python3-pyqt4 is no longer available on Debian.

Let me create a new team for qbrz and add you to that, and then we can pull your changes into trunk. I'm happy to review incremental changes on top of this branch if you think that would be useful, but otherwise feel free to just directly push to trunk.

[Robert Ladyman (saccadic-masking)]

OK, that seems easiest: plus it means I can fix any lurking problems that I find as I use it and keep it in step with breezy itself. The patches will be smaller in future.

[Robert Ladyman (saccadic-masking)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-10-11 15:20:54 +0000
+++ .bzrignore	2020-07-16 14:28:25 +0000
@@ -2,6 +2,11 @@
 ./build
 ./docs/**/*.html
 ./launchpad-export.tar.gz
-./locale
-./MANIFEST
 tags
+*.tar.gz
+*.tar.gz.asc
+.vscode/bookmarks.json
+.vscode
+qbrz-setup-iss.log
+*.exe
+*.exe.asc

=== added file 'MakeLiterate'
--- MakeLiterate	1970-01-01 00:00:00 +0000
+++ MakeLiterate	2020-07-16 14:28:25 +0000
@@ -0,0 +1,86 @@
+# RJL: This will make literate documents via pycco in docs/literate
+# Run this makefile via
+#
+#    make -f MakeLiterate...
+#
+# You should note that pycco gets confused sometimes and its output
+# can be a little garbled, but it can help to understand other
+# people's code more easily.
+
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+
+RST2HTML := rst2html5.py --initial-header-level=2 --footnote-references=superscript --smart-quotes=yes -g -d -t
+PDOC := pdoc --html --overwrite  --all-submodules --html-dir
+
+# Updated by RJL 13th May with more sensible behaviour
+# For some reason it won't generate SQL files
+
+# We build or rebuild the documentation with pycco - shorthand for the command here in PYCCO_ALL variable
+# This one builds the index.html file
+PYCCO_ALL := pycco --generate_index --paths -s --directory
+
+# This one does NOT build the index file - otherwise, if you pass a single file
+# it will be the ONLY one in the index. Do'h!
+PYCCO_ONE := pycco --paths -s --directory
+
+
+# We want to look at all the .py files in the Code directory (where we start)
+# in case any have changed. The makefile is in /Code so we just use './'
+# the shell for 'this directory that we are in' - so the following means
+# 'all the files ending in "py" in this directory'
+PYSOURCES=$(wildcard *.py)
+
+PYSUBSOURCES=$(wildcard lib/*.py)
+PYTESTSOURCES=$(wildcard lib/tests/*.py)
+PYWIDGESTSOURCES=$(wildcard lib/widgets/*.py)
+PYEXTRASOURCES=$(wildcard lib/extra/*.py)
+
+ALL_SOURCES=$(PYSOURCES) $(PYSUBSOURCES) $(PYTESTSOURCES) $(PYWIDGESTSOURCES) $(PYEXTRASOURCES)
+
+# This is how we extract an html file-name for each changed python file-name
+# It basically reads: for each .py file in the source directory (PYSOURCES),
+# there should be a matching .html file in Code_Documentation.
+# The % means the stem, for example world.py has a stem of 'world' so we
+# make world.html from world.py
+DOCUMENTS_NEEDED_BASE=$(PYSOURCES:%.py=docs/literate/%.html)
+
+# For subdirectories, we'll get the subdirectory as a prefix
+# for example, lib/widgets
+DOCUMENTS_NEEDED_SUB=$(PYSUBSOURCES:%.py=docs/literate/%.html)
+
+# What to do if we just type 'make' without any parameters - we generate the docs
+.DEFAULT_GOAL := all
+
+# No such file as all so mark it as a phony
+.PHONY: all
+.PHONY: base
+.PHONY: svrsub
+
+.PHONY: sqlfiles
+
+base: $(DOCUMENTS_NEEDED_BASE)
+svrsub: $(DOCUMENTS_NEEDED_SUB)
+
+all: sqlfiles base svrsub
+
+# The html file in docs/literate (and its cousins) depends upon the py file of the same name
+# If the html file is missing or older than the python one, run the pycco command
+# for the file (in $<)
+
+docs/literate/lib/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+docs/literate/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+# Call 'make index' to make the full documentation
+.PHONY: index
+index:
+	make clean
+	$(PYCCO_ALL) ./docs/literate $(ALL_SOURCES)
+
+.PHONY: clean
+clean:
+	rm -rf docs/literate
+

=== modified file 'Makefile'
--- Makefile	2018-01-31 22:46:16 +0000
+++ Makefile	2020-07-16 14:28:25 +0000
@@ -1,3 +1,4 @@
+
 all:
 	@echo Targets:
 	@echo   test   - run tests
@@ -8,36 +9,42 @@
 	@echo   docs   - build htmls for texts in docs/ directory
 	@echo   epydoc - build API docs with epydoc
 	@echo   ui     - compile UI files
+	@echo   inno   - compile exe (pass RELEASE=X.Y.Z)
 	@echo
 	@echo To build release run:
 	@echo    make release RELEASE=X.Y.Z
 
 .PHONY: test pot mo clean tags docs ui
 
-check: test
-	BRZ_PLUGINS_AT=qbrz@$(shell pwd) brz selftest -s bp.qbrz
-
-test:
-	brz selftest -s bp.qbzr
-
-pot:
-	python setup.py build_pot -N -d.
+# Making pot files is disabled for now - no translators!
+# pot:
+# 	python3 setup.py build_pot -N -d.
+
+.check-env-vars:
+	@test $${RELEASE?RELEASE is undefined. To build release run make release with RELEASE=X.Y.Z}
 
 mo:
-	python setup.py build_mo -f
-
-tarball:
-	bzr export --root=qbzr qbzr-$(RELEASE).tar.gz
-	gpg -ab qbzr-$(RELEASE).tar.gz
-
-inno: mo
-	iscc installer/qbzr-setup.iss
-	gpg -ab qbzr-setup-$(RELEASE).exe
-
+	python3 setup.py build_mo -f --verbose
+
+tarball: .check-env-vars
+	brz export --root=qbrz qbrz-$(RELEASE).tar.gz
+	rm -f qbrz-$(RELEASE).tar.gz.asc
+	gpg2 -ab qbrz-$(RELEASE).tar.gz
+
+# RJL needs to come back in
+# inno: mo
+# 	./iscc installer/qbrz-setup.iss
+# 	gpg -ab qbrz-setup-$(RELEASE).exe
+inno: .check-env-vars
+	./iscc installer/qbrz-setup.iss
+	rm -f qbrz-setup-$(RELEASE).exe.asc
+	gpg2 -ab qbrz-setup-$(RELEASE).exe
+
+# release: tarball inno
 release: tarball inno
 
 clean:
-	python setup.py clean -a
+	python3 setup.py clean -a
 
 tags:
 	ctags *.py lib/*.py lib/extra/*.py lib/tests/*.py
@@ -49,4 +56,211 @@
 	$(MAKE) -C docs
 
 ui:
-	python setup.py build_ui
+	python3 setup.py build_ui
+
+
+# === Tests beyond this point ===
+
+check: test
+	BRZ_PLUGINS_AT=qbrz@$(shell pwd) brz selftest -s bp.qbrz -x TestTreeFilterProxyModel
+
+# Stop on first error, ignore TestTreeFilterProxyModel for now
+
+checkone: test
+	BRZ_PLUGINS_AT=qbrz@$(shell pwd) brz selftest -v --one -s bp.qbrz -x  TestTreeFilterProxyModel
+
+# Test specific item - e.g. for internationalisation, use:
+#
+#  BRZ_PLUGINS_AT=qbrz@$(shell pwd) brz selftest --one --strict -s bp.qbrz TestI18n
+checkspecific: test
+	BRZ_PLUGINS_AT=qbrz@$(shell pwd) brz selftest --one --strict -s bp.qbrz TestBencode
+
+# Rather than running the test_ suite, this lets you run the actual plugin - note
+# that the tests can often pass but the code fails in actual use.
+qtest:
+# You can test on qbrz itself like this (qlog in this example):
+#
+	 BRZ_PLUGINS_AT=qbrz@$(shell pwd) brz qdiff
+#
+# If you have a test directory you wish to use, you can cd to it, run the code, cd back from it.
+# In this example, we have a test dir of ``~/pythonstuff/bzr_test_dir/sopsteward`` - we have
+# to ``cd`` to it (note the semi-colon) THEN execute the plugin code we want:
+#
+#  cd ~/pythonstuff/bzr_test_dir/sopsteward; BRZ_PLUGINS_AT=qbrz@/home/rjl/pythonstuff/fix-python-etc brz qdiff
+
+test:
+	brz selftest -s bp.qbrz
+
+
+# Fully working: (note, qcheckout-ala-explorer is qgetn).
+# qlog
+# qadd
+# qannotate, qblame
+# qcommit
+# qbrowse
+# qcat, qviewer
+# qversion
+# qplugins
+# qinit
+# qbranch
+# qbind
+# qunbind
+# qignore
+# qinfo
+# qupdate
+# quncommit
+# qpull
+# qshelve
+# qunshelve
+# qtag
+# qgetn
+# qrevert
+# qpush
+# qsend
+# qmerge
+# qconflicts
+# qresolve
+# qswitch
+# qcmd
+# qsubprocess
+# qdiff
+# qconfig
+
+
+# === qmain ===
+
+# qmain fails in bzr
+
+
+# === qverify-signatures ===
+
+# qverify-signatures fails in bzr
+
+
+# === qhelp ===
+
+# qhelp doesn't work for me even in bzr
+
+
+# === Items in Plug-ins ===
+
+# NOT working
+# qinit-workspace, qnew also unknown - they appear to be from the 'explorer' plugin
+
+
+# === Literate documentation, etc ===
+
+# This uses pycco to generate the literal documentation.
+# To rebuild all of it, with an index.html file, use:
+#
+#  make literate_index
+#
+# To just update (although new files won't be added to index.html), use:
+#
+#  make literate_docs
+#
+# otherwise, you can just make the base, lib, or whatever using (for example):
+#
+#  make widget_docs
+#
+# Output goes into docs/literate/... mirroring the source-code locations (e.g.
+# lib/widgets/... go into docs/literate/lib/widgets
+#
+# pycco isn't brilliant, but it tries its best
+
+# We build or rebuild the documentation with pycco - shorthand for the command here in PYCCO_ALL variable
+# This one builds the index.html file
+PYCCO_ALL := pycco --generate_index --paths -s --directory
+
+# This one does NOT build the index file - otherwise, if you pass a single file
+# it will be the ONLY one in the index. Do'h!
+PYCCO_ONE := pycco --paths -s --directory
+
+# We want to look at all the .py files in the Code directory (where we start)
+# in case any have changed. The makefile is in /Code so we just use './'
+# the shell for 'this directory that we are in' - so the following means
+# 'all the files ending in "py" in this directory'
+PYMAINSOURCES=$(wildcard ./*.py)
+# The lib sources
+PYLIBSOURCES=$(wildcard ./lib/*.py)
+# extras and tests
+PYEXTRASOURCES=$(wildcard ./lib/extra/*.py)
+PYEXTRASSOURCES=$(wildcard ./extras/*.py)
+PYTESTSSOURCES=$(wildcard ./lib/tests/*.py)
+PYWIDGETSOURCES=$(wildcard ./lib/widgets/*.py)
+
+# So now add them all together
+PYSOURCES=$(PYMAINSOURCES) $(PYLIBSOURCES) $(PYEXTRASOURCES) $(PYEXTRASSOURCES) $(PYTESTSSOURCES) $(PYWIDGETSOURCES)
+
+# This is how we extract an html file-name for each changed python file-name
+# It basically reads: for each .py file in the source directory (PYSOURCES),
+# there should be a matching .html file in Code_Documentation.
+# The % means the stem, for example world.py has a stem of 'world' so we
+# make world.html from world.py
+DOCUMENTS_NEEDED_BASE=$(PYSOURCES:%.py=docs/literate/%.html)
+
+# For subdirectories, we'll get the subdirectory as a prefix
+# for example, svrsub/svrconfig
+DOCUMENTS_NEEDED_LIB=$(PYLIBSOURCES:%.py=docs/literate/%.html)
+DOCUMENTS_NEEDED_EXTRA=$(PYEXTRASOURCES:%.py=docs/literate/%.html)
+DOCUMENTS_NEEDED_EXTRAS=$(PYEXTRASSOURCES:%.py=docs/literate/%.html)
+DOCUMENTS_NEEDED_TEST=$(PYTESTSSOURCES:%.py=docs/literate/%.html)
+DOCUMENTS_NEEDED_WIDGETS=$(PYWIDGETSOURCES:%.py=docs/literate/%.html)
+
+.PHONY: literate_docs
+# No such file as all so mark it as a phony
+.PHONY: base_docs
+.PHONY: lib_docs
+.PHONY: extra_docs
+.PHONY: extras_docs
+.PHONY: test_docs
+.PHONY: widget_docs
+
+base_docs: $(DOCUMENTS_NEEDED_BASE)
+lib_docs: $(DOCUMENTS_NEEDED_LIB)
+extra_docs: $(DOCUMENTS_NEEDED_EXTRA)
+extras_docs: $(DOCUMENTS_NEEDED_EXTRAS)
+test_docs: $(DOCUMENTS_NEEDED_TEST)
+widget_docs: $(DOCUMENTS_NEEDED_WIDGETS)
+
+literate_docs: base_docs lib_docs extra_docs extras_docs test_docs widget_docs
+
+# The html file in docs/literate (and its cousins) depends upon the py file of the same name
+# If the html file is missing or older than the python one, run the pycco command
+# for the file (in $<)
+
+
+
+docs/literate/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+
+docs/literate/extras/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+docs/literate/lib/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+
+docs/literate/lib/data/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+docs/literate/lib/extra/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+docs/literate/lib/test/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+docs/literate/lib/widgets/%.html: %.py
+	$(PYCCO_ONE) ./docs/literate $<
+
+# Call 'make index' to make the full documentation
+.PHONY: literate_index
+literate_index:
+	make literate_clean
+	$(PYCCO_ALL) ./docs/literate $(PYSOURCES)
+
+.PHONY: literate_clean
+literate_clean:
+	rm -rf docs/literate/
+

=== modified file '__init__.py'
--- __init__.py	2017-09-11 06:53:22 +0000
+++ __init__.py	2020-07-16 14:28:25 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/python3 -bb
 # -*- coding: utf-8 -*-
 #
 # QBzr - Qt frontend to Bazaar commands
@@ -70,11 +71,19 @@
 Miscellaneous:
 
  * bug-url - print full URL to a specific bug, or open it in your browser.
+
+RJL 2020:
+This is the updated version for QBrz
 """
 
-from __future__ import absolute_import
+# RJL to speed development, retain Qt4 for now: use ``sip.setapi`` to request
+# version 1 behaviour for ``QVariant`` (otherwise it's not available for python3)
+import sip
+sip.setapi('QVariant', 2)
 
-version_info = (0,23,2,'final',0)
+# RJL: set to 0,3,1 to match br
+# version_info = (0,23,2,'final',0)
+version_info = (0,3,1,'dev',0)
 __version__ = '.'.join(map(str, version_info))
 
 
@@ -82,7 +91,6 @@
 
 from breezy.commands import plugin_cmds
 
-
 # merge --qpreview disabled for 0.14 because it makes qbrz incompatible with bzr-pipeline plugin
 # see bug https://bugs.launchpad.net/bugs/395817
 #register_lazy_command('breezy.plugins.qbrz.lib.commands', 'cmd_merge', [], decorate=True)  # provides merge --qpreview

=== modified file 'docs/Makefile'
--- docs/Makefile	2010-05-12 12:20:13 +0000
+++ docs/Makefile	2020-07-16 14:28:25 +0000
@@ -2,13 +2,14 @@
 
 all: html
 
-rst2html := python rst2html.py
+# rst2html := python rst2html.py
+RST2HTML := rst2html5.py --initial-header-level=2 --footnote-references=superscript --smart-quotes=yes -g -d -t
 
 %.html: %.txt
-	$(rst2html) $< $@
+	$(RST2HTML) $< $@
 
 %.html: ../%.txt
-	$(rst2html) $< $@
+	$(RST2HTML) $< $@
 
 html: index.html gettext_usage.html make_release.html \
 	slot-signal-mini-tutorial/slot-signal-mini-tutorial.html \

=== added directory 'docs/literate'
=== added directory 'docs/literate/extras'
=== added directory 'docs/literate/lib'
=== added directory 'docs/literate/lib/extra'
=== added directory 'docs/literate/lib/tests'
=== added directory 'docs/literate/lib/widgets'
=== added file 'docs/literate/pycco.css'
--- docs/literate/pycco.css	1970-01-01 00:00:00 +0000
+++ docs/literate/pycco.css	2020-07-16 14:28:25 +0000
@@ -0,0 +1,191 @@
+/*--------------------- Layout and Typography ----------------------------*/
+body {
+  font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+  font-size: 16px;
+  line-height: 24px;
+  color: #252519;
+  margin: 0; padding: 0;
+  background: #f5f5ff;
+}
+a {
+  color: #261a3b;
+}
+  a:visited {
+    color: #261a3b;
+  }
+p {
+  margin: 0 0 15px 0;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin: 40px 0 15px 0;
+}
+h2, h3, h4, h5, h6 {
+    margin-top: 0;
+  }
+#container {
+  background: white;
+ }
+#container, div.section {
+  position: relative;
+}
+#background {
+  position: absolute;
+  top: 0; left: 580px; right: 0; bottom: 0;
+  background: #f5f5ff;
+  border-left: 1px solid #e5e5ee;
+  z-index: 0;
+}
+#jump_to, #jump_page {
+  background: white;
+  -webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777;
+  -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px;
+  font: 10px Arial;
+  text-transform: uppercase;
+  cursor: pointer;
+  text-align: right;
+}
+#jump_to, #jump_wrapper {
+  position: fixed;
+  right: 0; top: 0;
+  padding: 5px 10px;
+}
+  #jump_wrapper {
+    padding: 0;
+    display: none;
+  }
+    #jump_to:hover #jump_wrapper {
+      display: block;
+    }
+    #jump_page {
+      padding: 5px 0 3px;
+      margin: 0 0 25px 25px;
+    }
+      #jump_page .source {
+        display: block;
+        padding: 5px 10px;
+        text-decoration: none;
+        border-top: 1px solid #eee;
+      }
+        #jump_page .source:hover {
+          background: #f5f5ff;
+        }
+        #jump_page .source:first-child {
+        }
+div.docs {
+  float: left;
+  max-width: 500px;
+  min-width: 500px;
+  min-height: 5px;
+  padding: 10px 25px 1px 50px;
+  vertical-align: top;
+  text-align: left;
+}
+  .docs pre {
+    margin: 15px 0 15px;
+    padding-left: 15px;
+    overflow-y: scroll;
+  }
+  .docs p tt, .docs p code {
+    background: #f8f8ff;
+    border: 1px solid #dedede;
+    font-size: 12px;
+    padding: 0 0.2em;
+  }
+  .octowrap {
+    position: relative;
+  }
+    .octothorpe {
+      font: 12px Arial;
+      text-decoration: none;
+      color: #454545;
+      position: absolute;
+      top: 3px; left: -20px;
+      padding: 1px 2px;
+      opacity: 0;
+      -webkit-transition: opacity 0.2s linear;
+    }
+      div.docs:hover .octothorpe {
+        opacity: 1;
+      }
+div.code {
+  margin-left: 580px;
+  padding: 14px 15px 16px 50px;
+  vertical-align: top;
+}
+  .code pre, .docs p code {
+    font-size: 12px;
+  }
+    pre, tt, code {
+      line-height: 18px;
+      font-family: Monaco, Consolas, "Lucida Console", monospace;
+      margin: 0; padding: 0;
+    }
+div.clearall {
+    clear: both;
+}
+
+
+/*---------------------- Syntax Highlighting -----------------------------*/
+td.linenos { background-color: #f0f0f0; padding-right: 10px; }
+span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
+body .hll { background-color: #ffffcc }
+body .c { color: #408080; font-style: italic }  /* Comment */
+body .err { border: 1px solid #FF0000 }         /* Error */
+body .k { color: #954121 }                      /* Keyword */
+body .o { color: #666666 }                      /* Operator */
+body .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+body .cp { color: #BC7A00 }                     /* Comment.Preproc */
+body .c1 { color: #408080; font-style: italic } /* Comment.Single */
+body .cs { color: #408080; font-style: italic } /* Comment.Special */
+body .gd { color: #A00000 }                     /* Generic.Deleted */
+body .ge { font-style: italic }                 /* Generic.Emph */
+body .gr { color: #FF0000 }                     /* Generic.Error */
+body .gh { color: #000080; font-weight: bold }  /* Generic.Heading */
+body .gi { color: #00A000 }                     /* Generic.Inserted */
+body .go { color: #808080 }                     /* Generic.Output */
+body .gp { color: #000080; font-weight: bold }  /* Generic.Prompt */
+body .gs { font-weight: bold }                  /* Generic.Strong */
+body .gu { color: #800080; font-weight: bold }  /* Generic.Subheading */
+body .gt { color: #0040D0 }                     /* Generic.Traceback */
+body .kc { color: #954121 }                     /* Keyword.Constant */
+body .kd { color: #954121; font-weight: bold }  /* Keyword.Declaration */
+body .kn { color: #954121; font-weight: bold }  /* Keyword.Namespace */
+body .kp { color: #954121 }                     /* Keyword.Pseudo */
+body .kr { color: #954121; font-weight: bold }  /* Keyword.Reserved */
+body .kt { color: #B00040 }                     /* Keyword.Type */
+body .m { color: #666666 }                      /* Literal.Number */
+body .s { color: #219161 }                      /* Literal.String */
+body .na { color: #7D9029 }                     /* Name.Attribute */
+body .nb { color: #954121 }                     /* Name.Builtin */
+body .nc { color: #0000FF; font-weight: bold }  /* Name.Class */
+body .no { color: #880000 }                     /* Name.Constant */
+body .nd { color: #AA22FF }                     /* Name.Decorator */
+body .ni { color: #999999; font-weight: bold }  /* Name.Entity */
+body .ne { color: #D2413A; font-weight: bold }  /* Name.Exception */
+body .nf { color: #0000FF }                     /* Name.Function */
+body .nl { color: #A0A000 }                     /* Name.Label */
+body .nn { color: #0000FF; font-weight: bold }  /* Name.Namespace */
+body .nt { color: #954121; font-weight: bold }  /* Name.Tag */
+body .nv { color: #19469D }                     /* Name.Variable */
+body .ow { color: #AA22FF; font-weight: bold }  /* Operator.Word */
+body .w { color: #bbbbbb }                      /* Text.Whitespace */
+body .mf { color: #666666 }                     /* Literal.Number.Float */
+body .mh { color: #666666 }                     /* Literal.Number.Hex */
+body .mi { color: #666666 }                     /* Literal.Number.Integer */
+body .mo { color: #666666 }                     /* Literal.Number.Oct */
+body .sb { color: #219161 }                     /* Literal.String.Backtick */
+body .sc { color: #219161 }                     /* Literal.String.Char */
+body .sd { color: #219161; font-style: italic } /* Literal.String.Doc */
+body .s2 { color: #219161 }                     /* Literal.String.Double */
+body .se { color: #BB6622; font-weight: bold }  /* Literal.String.Escape */
+body .sh { color: #219161 }                     /* Literal.String.Heredoc */
+body .si { color: #BB6688; font-weight: bold }  /* Literal.String.Interpol */
+body .sx { color: #954121 }                     /* Literal.String.Other */
+body .sr { color: #BB6688 }                     /* Literal.String.Regex */
+body .s1 { color: #219161 }                     /* Literal.String.Single */
+body .ss { color: #19469D }                     /* Literal.String.Symbol */
+body .bp { color: #954121 }                     /* Name.Builtin.Pseudo */
+body .vc { color: #19469D }                     /* Name.Variable.Class */
+body .vg { color: #19469D }                     /* Name.Variable.Global */
+body .vi { color: #19469D }                     /* Name.Variable.Instance */
+body .il { color: #666666 }                     /* Literal.Number.Integer.Long */

=== added file 'docs/pycco.css'
--- docs/pycco.css	1970-01-01 00:00:00 +0000
+++ docs/pycco.css	2020-07-16 14:28:25 +0000
@@ -0,0 +1,191 @@
+/*--------------------- Layout and Typography ----------------------------*/
+body {
+  font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+  font-size: 16px;
+  line-height: 24px;
+  color: #252519;
+  margin: 0; padding: 0;
+  background: #f5f5ff;
+}
+a {
+  color: #261a3b;
+}
+  a:visited {
+    color: #261a3b;
+  }
+p {
+  margin: 0 0 15px 0;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin: 40px 0 15px 0;
+}
+h2, h3, h4, h5, h6 {
+    margin-top: 0;
+  }
+#container {
+  background: white;
+ }
+#container, div.section {
+  position: relative;
+}
+#background {
+  position: absolute;
+  top: 0; left: 580px; right: 0; bottom: 0;
+  background: #f5f5ff;
+  border-left: 1px solid #e5e5ee;
+  z-index: 0;
+}
+#jump_to, #jump_page {
+  background: white;
+  -webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777;
+  -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px;
+  font: 10px Arial;
+  text-transform: uppercase;
+  cursor: pointer;
+  text-align: right;
+}
+#jump_to, #jump_wrapper {
+  position: fixed;
+  right: 0; top: 0;
+  padding: 5px 10px;
+}
+  #jump_wrapper {
+    padding: 0;
+    display: none;
+  }
+    #jump_to:hover #jump_wrapper {
+      display: block;
+    }
+    #jump_page {
+      padding: 5px 0 3px;
+      margin: 0 0 25px 25px;
+    }
+      #jump_page .source {
+        display: block;
+        padding: 5px 10px;
+        text-decoration: none;
+        border-top: 1px solid #eee;
+      }
+        #jump_page .source:hover {
+          background: #f5f5ff;
+        }
+        #jump_page .source:first-child {
+        }
+div.docs {
+  float: left;
+  max-width: 500px;
+  min-width: 500px;
+  min-height: 5px;
+  padding: 10px 25px 1px 50px;
+  vertical-align: top;
+  text-align: left;
+}
+  .docs pre {
+    margin: 15px 0 15px;
+    padding-left: 15px;
+    overflow-y: scroll;
+  }
+  .docs p tt, .docs p code {
+    background: #f8f8ff;
+    border: 1px solid #dedede;
+    font-size: 12px;
+    padding: 0 0.2em;
+  }
+  .octowrap {
+    position: relative;
+  }
+    .octothorpe {
+      font: 12px Arial;
+      text-decoration: none;
+      color: #454545;
+      position: absolute;
+      top: 3px; left: -20px;
+      padding: 1px 2px;
+      opacity: 0;
+      -webkit-transition: opacity 0.2s linear;
+    }
+      div.docs:hover .octothorpe {
+        opacity: 1;
+      }
+div.code {
+  margin-left: 580px;
+  padding: 14px 15px 16px 50px;
+  vertical-align: top;
+}
+  .code pre, .docs p code {
+    font-size: 12px;
+  }
+    pre, tt, code {
+      line-height: 18px;
+      font-family: Monaco, Consolas, "Lucida Console", monospace;
+      margin: 0; padding: 0;
+    }
+div.clearall {
+    clear: both;
+}
+
+
+/*---------------------- Syntax Highlighting -----------------------------*/
+td.linenos { background-color: #f0f0f0; padding-right: 10px; }
+span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
+body .hll { background-color: #ffffcc }
+body .c { color: #408080; font-style: italic }  /* Comment */
+body .err { border: 1px solid #FF0000 }         /* Error */
+body .k { color: #954121 }                      /* Keyword */
+body .o { color: #666666 }                      /* Operator */
+body .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+body .cp { color: #BC7A00 }                     /* Comment.Preproc */
+body .c1 { color: #408080; font-style: italic } /* Comment.Single */
+body .cs { color: #408080; font-style: italic } /* Comment.Special */
+body .gd { color: #A00000 }                     /* Generic.Deleted */
+body .ge { font-style: italic }                 /* Generic.Emph */
+body .gr { color: #FF0000 }                     /* Generic.Error */
+body .gh { color: #000080; font-weight: bold }  /* Generic.Heading */
+body .gi { color: #00A000 }                     /* Generic.Inserted */
+body .go { color: #808080 }                     /* Generic.Output */
+body .gp { color: #000080; font-weight: bold }  /* Generic.Prompt */
+body .gs { font-weight: bold }                  /* Generic.Strong */
+body .gu { color: #800080; font-weight: bold }  /* Generic.Subheading */
+body .gt { color: #0040D0 }                     /* Generic.Traceback */
+body .kc { color: #954121 }                     /* Keyword.Constant */
+body .kd { color: #954121; font-weight: bold }  /* Keyword.Declaration */
+body .kn { color: #954121; font-weight: bold }  /* Keyword.Namespace */
+body .kp { color: #954121 }                     /* Keyword.Pseudo */
+body .kr { color: #954121; font-weight: bold }  /* Keyword.Reserved */
+body .kt { color: #B00040 }                     /* Keyword.Type */
+body .m { color: #666666 }                      /* Literal.Number */
+body .s { color: #219161 }                      /* Literal.String */
+body .na { color: #7D9029 }                     /* Name.Attribute */
+body .nb { color: #954121 }                     /* Name.Builtin */
+body .nc { color: #0000FF; font-weight: bold }  /* Name.Class */
+body .no { color: #880000 }                     /* Name.Constant */
+body .nd { color: #AA22FF }                     /* Name.Decorator */
+body .ni { color: #999999; font-weight: bold }  /* Name.Entity */
+body .ne { color: #D2413A; font-weight: bold }  /* Name.Exception */
+body .nf { color: #0000FF }                     /* Name.Function */
+body .nl { color: #A0A000 }                     /* Name.Label */
+body .nn { color: #0000FF; font-weight: bold }  /* Name.Namespace */
+body .nt { color: #954121; font-weight: bold }  /* Name.Tag */
+body .nv { color: #19469D }                     /* Name.Variable */
+body .ow { color: #AA22FF; font-weight: bold }  /* Operator.Word */
+body .w { color: #bbbbbb }                      /* Text.Whitespace */
+body .mf { color: #666666 }                     /* Literal.Number.Float */
+body .mh { color: #666666 }                     /* Literal.Number.Hex */
+body .mi { color: #666666 }                     /* Literal.Number.Integer */
+body .mo { color: #666666 }                     /* Literal.Number.Oct */
+body .sb { color: #219161 }                     /* Literal.String.Backtick */
+body .sc { color: #219161 }                     /* Literal.String.Char */
+body .sd { color: #219161; font-style: italic } /* Literal.String.Doc */
+body .s2 { color: #219161 }                     /* Literal.String.Double */
+body .se { color: #BB6622; font-weight: bold }  /* Literal.String.Escape */
+body .sh { color: #219161 }                     /* Literal.String.Heredoc */
+body .si { color: #BB6688; font-weight: bold }  /* Literal.String.Interpol */
+body .sx { color: #954121 }                     /* Literal.String.Other */
+body .sr { color: #BB6688 }                     /* Literal.String.Regex */
+body .s1 { color: #219161 }                     /* Literal.String.Single */
+body .ss { color: #19469D }                     /* Literal.String.Symbol */
+body .bp { color: #954121 }                     /* Name.Builtin.Pseudo */
+body .vc { color: #19469D }                     /* Name.Variable.Class */
+body .vg { color: #19469D }                     /* Name.Variable.Global */
+body .vi { color: #19469D }                     /* Name.Variable.Instance */
+body .il { color: #666666 }                     /* Literal.Number.Integer.Long */

=== modified file 'extras/__init__.py'
--- extras/__init__.py	2009-10-31 09:35:48 +0000
+++ extras/__init__.py	2020-07-16 14:28:25 +0000
@@ -18,13 +18,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from build_docs import build_docs
-from build_mo import build_mo
-from build_pot import build_pot
-from build_ui import build_ui
-from check_py24 import check_py24
-from check_utf8 import check_utf8
-from import_po import import_po
+from .build_docs import build_docs
+from .build_mo import build_mo
+from .build_pot import build_pot
+from .build_ui import build_ui
+from .check_py24 import check_py24
+from .check_utf8 import check_utf8
+from .import_po import import_po
 
 
 cmdclass = {

=== modified file 'extras/build_mo.py'
--- extras/build_mo.py	2010-08-03 13:39:49 +0000
+++ extras/build_mo.py	2020-07-16 14:28:25 +0000
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# RJLRJL: breezy converted
 
 """build_mo command for setup.py"""
 
@@ -28,7 +29,7 @@
 import os
 import re
 
-from en_po import regenerate_en
+from .en_po import regenerate_en
 
 
 class build_mo(Command):
@@ -44,8 +45,7 @@
                     ('output-base=', 'o', 'mo-files base name'),
                     ('source-dir=', None, 'Directory with sources po files'),
                     ('force', 'f', 'Force creation of mo files'),
-                    ('lang=', None, 'Comma-separated list of languages '
-                                    'to process'),
+                    ('lang=', None, 'Comma-separated list of languages to process'),
                    ]
 
     boolean_options = ['force']
@@ -89,14 +89,15 @@
             log.warn("Skip compiling po files.")
             return
 
-        if 'en' in self.lang:
-            if find_executable('msginit') is None:
-                log.warn("GNU gettext msginit utility not found!")
-                log.warn("Skip creating English PO file.")
-            else:
-                log.info('Creating English PO file...')
-                pot = (self.prj_name or 'messages') + '.pot'
-                regenerate_en(self.prj_name, self.source_dir, pot, self.spawn)
+        # RJLRJL: TODO: by-passed for now: we don't want to shred what we have
+        # if 'en' in self.lang:
+        #     if find_executable('msginit') is None:
+        #         log.warn("GNU gettext msginit utility not found!")
+        #         log.warn("Skip creating English PO file.")
+        #     else:
+        #         log.info('Creating English PO file...')
+        #         pot = (self.prj_name or 'messages') + '.pot'
+        #         regenerate_en(self.prj_name, self.source_dir, pot, self.spawn)
 
         basename = self.output_base
         if not basename.endswith('.mo'):

=== modified file 'extras/build_pot.py'
--- extras/build_pot.py	2011-08-03 06:03:19 +0000
+++ extras/build_pot.py	2020-07-16 14:28:25 +0000
@@ -25,7 +25,7 @@
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
-from en_po import regenerate_en
+from .en_po import regenerate_en
 
 
 class build_pot(Command):
@@ -39,8 +39,7 @@
     #   - help string.
     user_options = [('build-dir=', 'd', 'Directory to put POT file'),
                     ('output=', 'o', 'POT filename'),
-                    ('lang=', None, 'Comma-separated list of languages '
-                                    'to update po-files'),
+                    ('lang=', None, 'Comma-separated list of languages to update po-files'),
                     ('no-lang', 'N', "Don't update po-files"),
                     ('english', 'E', 'Regenerate English PO file'),
                    ]
@@ -57,12 +56,11 @@
         if self.build_dir is None:
             self.build_dir = 'po'
         if not self.output:
-            self.output = (self.distribution.get_name() or 'messages')+'.pot'
+            self.output = (self.distribution.get_name() or 'messages')+ '.pot'
         if self.lang is not None:
             self.lang = [i.strip() for i in self.lang.split(',') if i.strip()]
         if self.lang and self.no_lang:
-            raise DistutilsOptionError("You can't use options "
-                "--lang=XXX and --no-lang in the same time.")
+            raise DistutilsOptionError("You can't use options --lang=XXX and --no-lang in the same time.")
 
     def _force_LF(self, src, dst=None):
         f = open(src, 'rU')
@@ -93,27 +91,35 @@
         if not os.path.isdir(self.build_dir):
             log.info('Make directory: ' + self.build_dir)
             os.makedirs(self.build_dir)
-        self.spawn(['xgettext',
-                    '--keyword=N_',
-                    '-p', self.build_dir,
-                    '-o', self.output,
-                    '__init__.py',
-                    ]
-                    + glob.glob('lib/*.py')
-                    + glob.glob('lib/widgets/*.py')
-                    )
-        self._force_LF(fullname)
+
+
+        # RJLRJL: TODO: bypassed for now, to not shred what we have
+        # self.spawn(['xgettext',
+        #             '--keyword=N_',
+        #             '-p', self.build_dir,
+        #             '-o', self.output,
+        #             '__init__.py',
+        #             ] + glob.glob('lib/*.py') + glob.glob('lib/widgets/*.py')
+        #             )
+        # self._force_LF(fullname)
+
         # regenerate english PO
+        print('self.english is ', self.english, 'project is ', prj_name)
         if self.english:
             log.info('Regenerating English PO file...')
+            log.info(' project: {0}, build_dir {1}, output {2}'.format(prj_name, self.build_dir, self.output))
+            print('Regenerating English PO file...')
+            print(' project: {0}, build_dir {1}, output {2}'.format(prj_name, self.build_dir, self.output))
             regenerate_en(prj_name, self.build_dir, self.output, self.spawn)
         # search and update all po-files
         if self.no_lang:
+            print('No language: stopping')
             return
         for po in glob.glob(os.path.join(self.build_dir,'*.po')):
+            print('\tworking on ', po)
             if self.lang is not None:
                 po_lang = os.path.splitext(os.path.basename(po))[0]
-                if prj_name and po_lang.startswith(prj_name+'-'):
+                if prj_name and po_lang.startswith(prj_name + '-'):
                     po_lang = po_lang[5:]
                 if po_lang not in self.lang:
                     continue

=== modified file 'extras/build_ui.py'
--- extras/build_ui.py	2017-09-11 06:53:22 +0000
+++ extras/build_ui.py	2020-07-16 14:28:25 +0000
@@ -21,7 +21,7 @@
 from distutils import log
 from distutils.core import Command
 from distutils.dep_util import newer
-from StringIO import StringIO
+from io import StringIO
 import glob
 import os
 import re
@@ -65,6 +65,7 @@
                 source = source.replace("from PyQt4 import QtCore, QtGui",
                     "from PyQt4 import QtCore, QtGui\n"
                     "from breezy.plugins.%s.lib.i18n import gettext\n" % prj_name)
-                f = open(pyfile, "wb")
+                # f = open(pyfile, "wb")
+                f = open(pyfile, "w")
                 f.write(source)
                 f.close()

=== modified file 'extras/check_py24.py'
--- extras/check_py24.py	2009-02-27 12:42:38 +0000
+++ extras/check_py24.py	2020-07-16 14:28:25 +0000
@@ -58,7 +58,7 @@
                         f.close()
                         try:
                             compile(content, fullname, 'exec')
-                        except SyntaxError, e:
+                        except SyntaxError as e:
                             log.error(str(e))
                             if self.verbose:
                                 traceback.print_exc(0)

=== modified file 'extras/check_utf8.py'
--- extras/check_utf8.py	2009-02-02 03:09:46 +0000
+++ extras/check_utf8.py	2020-07-16 14:28:25 +0000
@@ -54,7 +54,7 @@
                         f.close()
                         try:
                             content.decode('utf-8')
-                        except UnicodeDecodeError, e:
+                        except UnicodeDecodeError as e:
                             log.error(fullname + ': ' + str(e))
             # skip some directories
             for dname in dirs[:]:

=== modified file 'extras/en_po.py'
--- extras/en_po.py	2010-08-03 13:39:49 +0000
+++ extras/en_po.py	2020-07-16 14:28:25 +0000
@@ -28,12 +28,7 @@
     else:
         en_po = 'en.po'
     en_po_path = os.path.join(po_dir, en_po)
-    spawn(['msginit',
-        '--no-translator',
-        '-l', 'en',
-        '-i', os.path.join(po_dir, pot_file),
-        '-o', en_po_path,
-        ])
+    spawn(['msginit', '--no-translator', '-l', 'en', '-i', os.path.join(po_dir, pot_file), '-o', en_po_path, ])
     # normalize line-endings in en.po file (to LF)
     f = open(en_po_path, 'rU')
     s = f.read()

=== modified file 'extras/import_po.py'
--- extras/import_po.py	2010-08-03 13:39:49 +0000
+++ extras/import_po.py	2020-07-16 14:28:25 +0000
@@ -23,7 +23,7 @@
 from distutils.core import Command
 from distutils.spawn import find_executable
 
-from en_po import regenerate_en
+from .en_po import regenerate_en
 
 
 class import_po(Command):

=== renamed file 'installer/qbzr-setup.iss' => 'installer/qbrz-setup.iss'
--- installer/qbzr-setup.iss	2013-10-15 10:11:40 +0000
+++ installer/qbrz-setup.iss	2020-07-16 14:28:25 +0000
@@ -5,17 +5,17 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId=QBzr
+AppId=QBrz
 
-AppName=                 QBzr
-AppVerName=              QBzr 0.23.2
-OutputBaseFilename=qbzr-setup-0.23.2
+AppName=                 QBrz
+AppVerName=              QBrz 0.3.1
+OutputBaseFilename=qbrz-setup-0.3.1
 
 SourceDir="..\"
 OutputDir="."
-OutputManifestFile=qbzr-setup-iss.log
+OutputManifestFile=qbrz-setup-iss.log
 
-AppPublisher=QBzr Developers
+AppPublisher=QBrz Developers
 AppPublisherURL=http://launchpad.net/qbzr
 AppSupportURL=http://groups.google.com/group/qbzr
 AppUpdatesURL=http://launchpad.net/qbzr/+download
@@ -70,26 +70,26 @@
 Type: files; Name: {app}\lib\widgets\*.pyo
 
 [Registry]
-Root: HKLM; Subkey: "Software\QBzr"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "Software\QBzr"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
+Root: HKLM; Subkey: "Software\QBrz"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\QBrz"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
 
 [Code]
-{Function detects system-wide installation of bzr: either bzr.exe or python-based}
-function GetBzrPath(): String;
+{Function detects system-wide installation of brz: either brz.exe or python-based}
+function GetBrzPath(): String;
 var
-  BzrPath: String;
+  BrzPath: String;
   PythonVersions: TArrayOfString;
   Ix: Integer;
   PythonKey: String;
   PythonPath: String;
-  BzrlibPath: String;
+  BrzlibPath: String;
   Path: String;
 begin
-  {Check bzr.exe presence}
-  if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Bazaar', 'InstallPath', BzrPath) then begin
-    Result := BzrPath;
+  {Check brz.exe presence}
+  if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Breezy', 'InstallPath', BrzPath) then begin
+    Result := BrzPath;
   end else begin
-    BzrlibPath := '';
+    BrzlibPath := '';
     {Get list of all installed python versions}
     if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'Software\Python\PythonCore', PythonVersions) then begin
       {Iterate over installed pythons and check if there is installed bzrlib}
@@ -98,39 +98,39 @@
         if RegQueryStringValue(HKEY_LOCAL_MACHINE, PythonKey, '', PythonPath) then begin
           Path := AddBackslash(PythonPath) + 'Lib\site-packages\bzrlib'
           if DirExists(Path) then begin
-            BzrlibPath := Path;
+            BrzlibPath := Path;
             break;
           end;
         end;
       end;
     end;
-    Result := BzrlibPath;
+    Result := BrzlibPath;
   end;
 end;
 
-{Function determines best possible PATH to install QBzr.
-  At first it tries to find system-wide installation (either bzr.exe or python-based)
-  then checks BZR_PLUGIN_PATH,
-  if all above fails then it suggests install to %APPDATA%\bazaar\2.0
+{Function determines best possible PATH to install QBrz.
+  At first it tries to find system-wide installation (either brz.exe or python-based)
+  then checks BRZ_PLUGIN_PATH,
+  if all above fails then it suggests install to %APPDATA%\Breezy\2.0
 }
 function GetDirName(Param: String): String;
 var
   Path: String;
-  BzrPath: String;
-  EnvBzrPluginPath: String;
+  BrzPath: String;
+  EnvBrzPluginPath: String;
   Ix: Integer;
 begin
-  Path := ExpandConstant('{userappdata}\bazaar\2.0\plugins\qbzr');
-  BzrPath := GetBzrPath();
-  if BzrPath <> '' then begin
-     Path := AddBackslash(BzrPath) + 'plugins\qbzr';
+  Path := ExpandConstant('{userappdata}\Breezy\2.0\plugins\qbzr');
+  BrzPath := GetBrzPath();
+  if BrzPath <> '' then begin
+     Path := AddBackslash(BrzPath) + 'plugins\qbzr';
   end else begin
-      EnvBzrPluginPath := GetEnv('BZR_PLUGIN_PATH')
-      Ix := Pos(';', EnvBzrPluginPath)
+      EnvBrzPluginPath := GetEnv('BRZ_PLUGIN_PATH')
+      Ix := Pos(';', EnvBrzPluginPath)
       if Ix > 0 then
-        EnvBzrPluginPath := Copy(EnvBzrPluginPath, 1, Ix-1)
-      if EnvBzrPluginPath <> '' then
-        Path := AddBackslash(EnvBzrPluginPath) + 'qbzr';
+        EnvBrzPluginPath := Copy(EnvBrzPluginPath, 1, Ix-1)
+      if EnvBrzPluginPath <> '' then
+        Path := AddBackslash(EnvBrzPluginPath) + 'qbzr';
   end;
   Result := Path;
 end;

=== added file 'iscc'
--- iscc	1970-01-01 00:00:00 +0000
+++ iscc	2020-07-16 14:28:25 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh  
+unset DISPLAY  
+scriptname=$1  
+[ -f "$scriptname" ] && scriptname=$(winepath -w "$scriptname")  
+wine "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" "$scriptname" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"

=== modified file 'lib/__init__.py'
--- lib/__init__.py	2012-02-19 23:50:27 +0000
+++ lib/__init__.py	2020-07-16 14:28:25 +0000
@@ -1,4 +1,6 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/python3 -bb
+# # -*- coding: utf-8 -*-
+
 #
 # QBzr - Qt frontend to Bazaar commands
 # Copyright (C) 2006-2008 Lukáš Lalinský <[e-mail]>
@@ -34,9 +36,9 @@
                 return True
         return False
 
-    import __builtin__
-    __builtin__.all = _all_2_4_compat
-    __builtin__.any = _any_2_4_compat
+    import builtins
+    builtins.all = _all_2_4_compat
+    builtins.any = _any_2_4_compat
 
 # Special constant
 MS_WINDOWS = (sys.platform == 'win32')

=== modified file 'lib/add.py'
--- lib/add.py	2017-09-11 06:53:22 +0000
+++ lib/add.py	2020-07-16 14:28:25 +0000
@@ -40,79 +40,71 @@
     def __init__(self, tree, selected_list, dialog=True, ui_mode=True, parent=None, local=None, message=None):
         self.tree = tree
         self.initial_selected_list = selected_list
-        
+        # print('*^*^*^^ tree is', self.tree, 'initial_selected', selected_list)
+
         super(AddWindow, self).__init__(
-                                  gettext("Add"),
-                                  name = "add",
-                                  default_size = (400, 400),
-                                  ui_mode = ui_mode,
-                                  dialog = dialog,
-                                  parent = parent,
-                                  hide_progress=True,
-                                  )
-    
+            gettext("Add"),
+            name = "add",
+            default_size = (400, 400),
+            ui_mode = ui_mode,
+            dialog = dialog,
+            parent = parent,
+            hide_progress=True,
+            )
+
         self.throbber = ThrobberWidget(self)
 
         # Display the list of unversioned files
         groupbox = QtGui.QGroupBox(gettext("Unversioned Files"), self)
         vbox = QtGui.QVBoxLayout(groupbox)
 
-        self.filelist = TreeWidget(groupbox)
-        self.filelist.throbber = self.throbber
-        self.filelist.tree_model.is_item_in_select_all = lambda item: (
+        self.filelist_widget = TreeWidget(groupbox)
+        self.filelist_widget.throbber = self.throbber
+
+        self.filelist_widget.tree_model.is_item_in_select_all = lambda item: (
             # Is in select all. - Not versioned, and not Ignored
-            item.change is not None and
-            item.change.is_ignored() is None and
-            not item.change.is_versioned(), 
-            
+            item.change is not None and item.change.is_ignored() is None and not item.change.is_versioned(),
             # look at children. - Not ignored
-            item.change is not None and item.change.is_ignored() is None or
-            item.change is None
+            item.change is not None and item.change.is_ignored() is None or item.change is None
             )
-        
+
         def filter_context_menu():
-            items = self.filelist.get_selection_items()
+            items = self.filelist_widget.get_selection_items()
             selection_len = len(items)
             single_file = (selection_len == 1 and items[0].item.kind == "file")
-            single_item_in_tree = (selection_len == 1 and
-                (items[0].change is None or items[0].change[6][1] is not None))
-            
-            self.filelist.action_open_file.setEnabled(True)
-            self.filelist.action_open_file.setVisible(True)
-            self.filelist.action_show_file.setEnabled(single_file)
-            self.filelist.action_show_file.setVisible(True)
-            self.filelist.action_show_annotate.setVisible(False)
-            self.filelist.action_show_log.setVisible(False)
-            self.filelist.action_show_diff.setVisible(False)
-            self.filelist.action_add.setVisible(False)
-            self.filelist.action_revert.setVisible(False)
-            self.filelist.action_merge.setVisible(False)
-            self.filelist.action_resolve.setVisible(False)
-            self.filelist.action_rename.setVisible(True)
-            self.filelist.action_rename.setEnabled(single_item_in_tree)
-            self.filelist.action_remove.setVisible(False)
-            self.filelist.action_mark_move.setVisible(False)
-        
-        self.filelist.filter_context_menu = filter_context_menu
-        
-        vbox.addWidget(self.filelist)
-        
-        selectall_checkbox = SelectAllCheckBox(self.filelist, groupbox)
+            single_item_in_tree = (selection_len == 1 and (items[0].change is None or items[0].change[6][1] is not None))
+
+            self.filelist_widget.action_open_file.setEnabled(True)
+            self.filelist_widget.action_open_file.setVisible(True)
+            self.filelist_widget.action_show_file.setEnabled(single_file)
+            self.filelist_widget.action_show_file.setVisible(True)
+            self.filelist_widget.action_show_annotate.setVisible(False)
+            self.filelist_widget.action_show_log.setVisible(False)
+            self.filelist_widget.action_show_diff.setVisible(False)
+            self.filelist_widget.action_add.setVisible(False)
+            self.filelist_widget.action_revert.setVisible(False)
+            self.filelist_widget.action_merge.setVisible(False)
+            self.filelist_widget.action_resolve.setVisible(False)
+            self.filelist_widget.action_rename.setVisible(True)
+            self.filelist_widget.action_rename.setEnabled(single_item_in_tree)
+            self.filelist_widget.action_remove.setVisible(False)
+            self.filelist_widget.action_mark_move.setVisible(False)
+
+        self.filelist_widget.filter_context_menu = filter_context_menu
+
+        vbox.addWidget(self.filelist_widget)
+
+        selectall_checkbox = SelectAllCheckBox(self.filelist_widget, groupbox)
         vbox.addWidget(selectall_checkbox)
         selectall_checkbox.setCheckState(QtCore.Qt.Checked)
         selectall_checkbox.setEnabled(True)
 
-        self.show_ignored_checkbox = QtGui.QCheckBox(
-            gettext("Show ignored files"),
-            groupbox)
+        self.show_ignored_checkbox = QtGui.QCheckBox(gettext("Show ignored files"), groupbox)
         vbox.addWidget(self.show_ignored_checkbox)
         self.connect(self.show_ignored_checkbox, QtCore.SIGNAL("toggled(bool)"), self.show_ignored)
-        
+
         # groupbox gets disabled as we are executing.
-        QtCore.QObject.connect(self,
-                               QtCore.SIGNAL("disableUi(bool)"),
-                               groupbox,
-                               QtCore.SLOT("setDisabled(bool)"))
+        QtCore.QObject.connect(self, QtCore.SIGNAL("disableUi(bool)"), groupbox, QtCore.SLOT("setDisabled(bool)"))
 
         self.splitter = QtGui.QSplitter(QtCore.Qt.Vertical)
         self.splitter.addWidget(groupbox)
@@ -134,17 +126,21 @@
     @ui_current_widget
     @reports_exception()
     def initial_load(self):
-        self.filelist.tree_model.checkable = True
-        fmodel = self.filelist.tree_filter_model
+        # print('*** initial_load called')
+        self.filelist_widget.tree_model.checkable = True
+        fmodel = self.filelist_widget.tree_filter_model
         fmodel.setFilter(fmodel.CHANGED, False)
         fmodel.setFilter(fmodel.UNCHANGED, False)
-        self.filelist.set_tree(self.tree, changes_mode = True,
+        self.filelist_widget.set_tree(self.tree, changes_mode = True,
             initial_checked_paths=self.initial_selected_list,
             change_load_filter=lambda c:not c.is_versioned())
         self.throbber.hide()
+        # print('leaving initial_load ***')
 
     def _get_files_to_add(self):
-        return [ref.path for ref in self.filelist.tree_model.iter_checked()]
+        # print('==== getting files ====')
+        # OK pressed
+        return [ref.path for ref in self.filelist_widget.tree_model.iter_checked()]
 
     def validate(self):
         if not self._get_files_to_add():
@@ -154,15 +150,16 @@
 
     def do_start(self):
         """Add the files."""
+        # print('\tdo_start entry')
         files = self._get_files_to_add()
-        self.process_widget.do_start(self.tree.basedir, "add", "--no-recurse",
-            *files)
+        self.process_widget.do_start(self.tree.basedir, "add", "--no-recurse", *files)
+        # print('\tdo_start EXIT')
 
     def show_ignored(self, state):
         """Show/hide ignored files."""
-        fmodel = self.filelist.tree_filter_model
+        fmodel = self.filelist_widget.tree_filter_model
         fmodel.setFilter(fmodel.IGNORED, state)
-        #self.filelist.update_selectall_state(None, None)
+        # self.filelist_widget.update_selectall_state(None, None)
 
     def _saveSize(self, config):
         SubProcessDialog._saveSize(self, config)

=== modified file 'lib/annotate.py'
--- lib/annotate.py	2017-11-13 23:31:28 +0000
+++ lib/annotate.py	2020-07-16 14:28:25 +0000
@@ -64,23 +64,23 @@
 from breezy.plugins.qbrz.lib.revtreeview import paint_revno, get_text_color
 from breezy.plugins.qbrz.lib import logmodel
 from breezy.plugins.qbrz.lib.loggraphviz import BranchInfo
-from breezy.patiencediff import PatienceSequenceMatcher as SequenceMatcher
+from patiencediff import PatienceSequenceMatcher as SequenceMatcher
 ''')
 
 class AnnotateBar(AnnotateBarBase):
-    
+
     def __init__(self, edit, parent, get_revno):
         super(AnnotateBar, self).__init__(edit, parent)
-        
+
         self.get_revno = get_revno
         self.annotate = None
         self.rev_colors = {}
         self._highlight_revids = set()
         self.highlight_lines = []
-        
+
         self.splitter = None
         self.adjustWidth(1, 999)
-        
+
         self.connect(edit,
             QtCore.SIGNAL("cursorPositionChanged()"),
             self.edit_cursorPositionChanged)
@@ -118,22 +118,22 @@
         fm = self.fontMetrics()
         text_margin = self.style().pixelMetric(
             QtGui.QStyle.PM_FocusFrameHMargin, None, self) + 1
-        
-        self.line_number_width = fm.width(unicode(lines))
+
+        self.line_number_width = fm.width(str(lines))
         self.line_number_width += (text_margin * 2)
-        
-        self.revno_width = fm.width(unicode(max_revno)+".8.88")
-        self.max_mainline_digits = len(unicode(max_revno))
+
+        self.revno_width = fm.width(str(max_revno)+".8.88")
+        self.max_mainline_digits = len(str(max_revno))
         self.revno_width += (text_margin * 2)
-        
+
         if self.splitter:
             if 0: self.splitter = QtGui.QSplitter
             width = (self.line_number_width + self.revno_width +
                      fm.width("Joe I have a Long Name"))
             self.splitter.setSizes([width, 1000])
-        
+
         self.setMinimumWidth(self.line_number_width + self.revno_width)
-    
+
     def paint_line(self, painter, rect, line_number, is_current):
         fm = self.fontMetrics()
         painter.save()
@@ -146,26 +146,26 @@
             painter.fillRect(rect, QtGui.QBrush(option.palette.highlight()))
             style.drawPrimitive(QtGui.QStyle.PE_PanelItemViewItem,
                                        option, painter, self)
-            
+
             painter.setPen(get_text_color(option, style))
         elif self.annotate and line_number-1 < len(self.annotate):
             revid, is_top = self.annotate[line_number - 1]
             if revid in self.rev_colors:
                 painter.fillRect(rect, self.rev_colors[revid])
-        
+
         text_margin = self.style().pixelMetric(
             QtGui.QStyle.PM_FocusFrameHMargin, None, self) + 1
-        
+
         if 0: rect = QtCore.QRect
         line_number_rect = QtCore.QRect(
             rect.left() + text_margin,
             rect.top(),
             self.line_number_width - (2 * text_margin),
             rect.height())
-        
+
         painter.drawText(line_number_rect, QtCore.Qt.AlignRight,
-                         unicode(line_number))
-        
+                         str(line_number))
+
         if self.annotate and line_number-1 < len(self.annotate):
             revid, is_top = self.annotate[line_number - 1]
             if is_top:
@@ -173,16 +173,16 @@
                     font = painter.font()
                     font.setBold(True)
                     painter.setFont(font)
-                
+
                 revno_rect = QtCore.QRect(
                     rect.left() + self.line_number_width + text_margin,
                     rect.top(),
                     self.revno_width - (2 * text_margin),
                     rect.height())
                 paint_revno(painter, revno_rect,
-                            QtCore.QString(self.get_revno(revid)),
+                            str(self.get_revno(revid)),
                             self.max_mainline_digits)
-                
+
                 if revid in cached_revisions:
                     rev = cached_revisions[revid]
                     author_rect = QtCore.QRect(
@@ -191,10 +191,10 @@
                         rect.top(),
                         rect.right() - revno_rect.right() - (2 * text_margin),
                         rect.height())
-                    author = QtCore.QString(get_apparent_author_name(rev))
+                    author = get_apparent_author_name(rev)
                     if fm.width(author) > author_rect.width():
                         author= fm.elidedText(author, QtCore.Qt.ElideRight,
-                                              author_rect.width())                    
+                                              author_rect.width())
                     painter.drawText(author_rect, 0, author)
         painter.restore()
 
@@ -208,7 +208,7 @@
             block = self.firstVisibleBlock()
             painter = QtGui.QPainter(self.viewport())
             painter.setClipRect(event.rect())
-            
+
             line_count = block.blockNumber()
             # Iterate over all visible text blocks in the document.
             while block.isValid():
@@ -217,21 +217,21 @@
                 # area.
                 rect = self.blockBoundingGeometry(block)
                 rect = rect.translated(self.contentOffset())
-                
+
                 if not block.isVisible() or rect.top() >= event.rect().bottom():
                     break
-                
+
                 if line_count - 1 >= len(self.annotate):
                     break
-                
+
                 revid, is_top = self.annotate[line_count - 1]
                 if revid in self.rev_colors:
                     painter.fillRect(rect, self.rev_colors[revid])
-                
+
                 block = block.next()
             del painter
         QtGui.QPlainTextEdit.paintEvent(self, event)
-    
+
     def get_positions(self):
         """Returns the charator positons for the selection start,
         selection end, center of the viewport, an the number of lines from
@@ -240,11 +240,11 @@
         old_center = self.cursorForPosition(QtCore.QPoint(0, self.height() / 2))
         lines_to_center = (old_center.block().blockNumber() -
                            self.verticalScrollBar().value())
-        
+
         return (old_cursor.selectionStart(),
                 old_cursor.selectionEnd(),
                 old_center.position()) , lines_to_center
-    
+
     def set_positions(self, new_positions, lines_to_center):
         new_start, new_end, new_center = new_positions
         if new_center:
@@ -252,7 +252,7 @@
             new_center_cursor.setPosition(new_center)
             new_scroll = new_center_cursor.block().blockNumber() - lines_to_center
             self.verticalScrollBar().setValue(new_scroll)
-        
+
         new_selection_cursor = QtGui.QTextCursor(self.document())
         new_selection_cursor.movePosition(QtGui.QTextCursor.Right,
                                           QtGui.QTextCursor.MoveAnchor,
@@ -260,7 +260,7 @@
         new_selection_cursor.movePosition(QtGui.QTextCursor.Right,
                                           QtGui.QTextCursor.KeepAnchor,
                                           new_end - new_start)
-        self.setTextCursor(new_selection_cursor)        
+        self.setTextCursor(new_selection_cursor)
 
 
 class AnnotateWindow(QBzrWindow):
@@ -280,13 +280,13 @@
         self.branch = branch
         self.annotate_tree = annotate_tree
         self.working_tree = working_tree
-        if (self.working_tree is None and 
+        if (self.working_tree is None and
             isinstance(annotate_tree, WorkingTree)):
             self.working_tree = annotate_tree
-        
+
         self.no_graph = no_graph
         self.old_lines = None
-        
+
         self.fileId = fileId
         self.path = path
         self.encoding = encoding
@@ -294,7 +294,7 @@
         self.loader_args = loader_args
 
         self.throbber = ToolBarThrobberWidget(self)
-        
+
         self.text_edit_frame = AnnotateEditerFrameBase(self)
         self.text_edit = AnnotatedTextEdit(self)
         self.text_edit.setFrameStyle(QtGui.QFrame.NoFrame)
@@ -302,7 +302,7 @@
             QtCore.Qt.TextSelectableByMouse|
             QtCore.Qt.TextSelectableByKeyboard)
         self.text_edit.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap)
-        
+
         self.text_edit.document().setDefaultFont(get_monospace_font())
 
         self.guidebar_panel = GuideBarPanel(self.text_edit, parent=self)
@@ -313,26 +313,26 @@
         annotate_spliter.addWidget(self.guidebar_panel)
         self.annotate_bar.splitter = annotate_spliter
         self.text_edit_frame.hbox.addWidget(annotate_spliter)
-        
+
         self.connect(self.text_edit,
                      QtCore.SIGNAL("cursorPositionChanged()"),
-                     self.edit_cursorPositionChanged)        
+                     self.edit_cursorPositionChanged)
         self.connect(self.annotate_bar,
                      QtCore.SIGNAL("cursorPositionChanged()"),
                      self.edit_cursorPositionChanged)
         self.connect(self.text_edit,
                      QtCore.SIGNAL("documentChangeFinished()"),
                      self.edit_documentChangeFinished)
-        
+
         self.log_list = AnnotateLogList(self.processEvents, self.throbber, self)
         self.log_list.header().hideSection(logmodel.COL_DATE)
         self.log_list.parent_annotate_window = self
         self.log_branch_loaded = False
-        
+
         self.connect(self.log_list.selectionModel(),
                      QtCore.SIGNAL("selectionChanged(QItemSelection, QItemSelection)"),
                      self.log_list_selectionChanged)
-        
+
         self.message = LogListRevisionMessageBrowser(self.log_list, self)
 
         self.encoding_selector = EncodingMenuSelector(self.encoding,
@@ -361,15 +361,15 @@
         self.show_find = QtGui.QAction(get_icon("edit-find"), gettext("Find"), self)
         self.show_find.setShortcuts(QtGui.QKeySequence.Find)
         self.show_find.setCheckable(True)
-        
+
         self.show_goto_line = QtGui.QAction(get_icon("go-jump"), gettext("Goto Line"), self)
         self.show_goto_line.setShortcuts((QtCore.Qt.CTRL + QtCore.Qt.Key_L,))
         self.show_goto_line.setCheckable(True)
-        
+
         show_view_menu = QtGui.QAction(get_icon("document-properties"), gettext("&View Options"), self)
         view_menu = QtGui.QMenu(gettext('View Options'), self)
         show_view_menu.setMenu(view_menu)
-        
+
         word_wrap = QtGui.QAction(gettext("Word Wrap"), self)
         word_wrap.setCheckable(True)
         self.connect(word_wrap,
@@ -382,28 +382,28 @@
         self.tab_width_selector = TabWidthMenuSelector(get_set_tab_width_chars(branch=branch),
                 gettext("Tab Width"),
                 setTabStopWidth)
-        
+
         view_menu.addMenu(self.tab_width_selector)
         view_menu.addMenu(self.encoding_selector)
         view_menu.addAction(word_wrap)
-        
+
         toolbar = self.addToolBar(gettext("Annotate"))
         toolbar.setMovable (False)
         toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
-        
+
         #self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
         toolbar.addAction(self.show_find)
         toolbar.addAction(self.show_goto_line)
         toolbar.addAction(show_view_menu)
         toolbar.widgetForAction(show_view_menu).setPopupMode(QtGui.QToolButton.InstantPopup)
-        
+
         spacer = QtGui.QWidget()
         spacer.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        toolbar.addWidget(spacer) 
+        toolbar.addWidget(spacer)
         toolbar.addWidget(self.throbber)
-        
+
         self.addToolBarBreak()
-        
+
         self.find_toolbar = FindToolbar(self, self.text_edit, self.show_find)
         self.find_toolbar.hide()
         self.addToolBar(self.find_toolbar)
@@ -411,11 +411,11 @@
                      QtCore.SIGNAL("toggled (bool)"),
                      self.show_find_toggle)
         setup_guidebar_for_find(self.guidebar_panel, self.find_toolbar, index=1)
-        
+
         self.goto_line_toolbar = GotoLineToolbar(self, self.show_goto_line)
         self.goto_line_toolbar.hide()
         self.addToolBar(self.goto_line_toolbar)
-        
+
         self.connect(self.show_goto_line,
                      QtCore.SIGNAL("toggled (bool)"),
                      self.show_goto_line_toggle )
@@ -479,7 +479,7 @@
                 self.set_title_and_icon([gettext("Annotate"), self.path,
                                          gettext("Revision %s") % revno])
                 return
-        
+
         self.set_title_and_icon([gettext("Annotate"), self.path])
 
     def get_revno(self, revid):
@@ -488,7 +488,7 @@
             revid in gv.revid_rev):
             return gv.revid_rev[revid].revno_str
         return ""
-    
+
     def annotate(self, annotate_tree, fileId, path):
         self.now = time.time()
         self.rev_indexes = {}
@@ -498,40 +498,40 @@
         ordered_revids = []
 
         self.processEvents()
-        for revid, text in annotate_tree.annotate_iter(path, file_id=fileId):
+        for revid, text in annotate_tree.annotate_iter(path):
             if revid == CURRENT_REVISION:
-                revid = CURRENT_REVISION + annotate_tree.basedir
-            
+                revid = CURRENT_REVISION + annotate_tree.basedir.encode("utf-8")
+
             text = text.decode(self.encoding, 'replace')
-            
+
             lines.append(text)
-            
+
             text = text.rstrip()
             if revid not in self.rev_indexes:
                 self.rev_indexes[revid]=[]
                 ordered_revids.append(revid)
             self.rev_indexes[revid].append(len(annotate))
-            
+
             is_top = last_revid != revid
             last_revid = revid
-            
+
             annotate.append((revid, is_top))
             if len(annotate) % 100 == 0:
                 self.processEvents()
         annotate.append((None, False))  # because the view has one more line
-        
+
         new_positions = None
         if self.old_lines:
             # Try keep the scroll, and selection stable.
             old_positions, lines_to_center = self.text_edit.get_positions()
             new_positions = self.translate_positions(
                                     self.old_lines, lines, old_positions)
-            
+
         self.text_edit.annotate = None
         self.text_edit.setPlainText("".join(lines))
         if new_positions:
             self.text_edit.set_positions(new_positions, lines_to_center)
-        
+
         self.old_lines = lines
         self.annotate_bar.adjustWidth(len(lines), 999)
         self.annotate_bar.annotate = annotate
@@ -539,9 +539,9 @@
         self.annotate_bar.show_current_line = False
 
         self.text_edit.emit(QtCore.SIGNAL("documentChangeFinished()"))
-        
+
         self.processEvents()
-        
+
         just_loaded_log = False
         if not self.log_branch_loaded:
             self.log_branch_loaded = True
@@ -549,22 +549,22 @@
             self.log_list.load(
                 (bi,), bi, [self.fileId], self.no_graph,
                 logmodel.WithWorkingTreeGraphVizLoader)
-            
+
             gv = self.log_list.log_model.graph_viz
             self.annotate_bar.adjustWidth(len(lines),
                                           gv.revisions[0].revno_sequence[0])
-            
+
             just_loaded_log = True
-            
+
             # Show the revisions the we know about from the annotate.
             filter = self.log_list.log_model.file_id_filter
             changed_revs = []
-            for revid in self.rev_indexes.keys():
+            for revid in list(self.rev_indexes.keys()):
                 rev = gv.revid_rev[revid]
                 filter.filter_file_id[rev.index] = True
                 changed_revs.append(rev)
             filter.filter_changed_callback(changed_revs, last_call=True)
-        
+
         self.processEvents()
         highlight_document(self.text_edit, path)
         self.processEvents()
@@ -572,15 +572,15 @@
                        revisions_loaded = self.revisions_loaded,
                        pass_prev_loaded_rev = True)
         self.processEvents()
-        
+
         if just_loaded_log:
             # Check for any other revisions we don't know about
-            
+
             filter = self.log_list.log_model.file_id_filter
             revids = [rev.revid for rev in gv.revisions
                       if rev.revid not in self.rev_indexes]
             filter.load(revids)
-    
+
     def translate_positions(self, old_lines, new_lines, old_positions):
         sm = SequenceMatcher(None, old_lines, new_lines)
         opcodes = sm.get_opcodes()
@@ -614,13 +614,13 @@
         return new_positions
 
     def revisions_loaded(self, revisions, last_call):
-        for rev in revisions.itervalues():
+        for rev in revisions.values():
             authors = rev.get_apparent_authors()
-            emails = map(self._maybe_extract_email, authors)
+            emails = list(map(self._maybe_extract_email, authors))
             author_id = ';'.join(emails)
 
             if rev.timestamp is None:
-                days = sys.maxint
+                days = sys.maxsize
             elif self.now < rev.timestamp:
                 days = 0
             else:
@@ -628,7 +628,7 @@
 
             alpha = 0.5/((days/50) + 1)
             h_sh = self._get_hash(author_id)
-            hue =  1-float(h_sh) / sys.maxint
+            hue =  1-float(h_sh) / sys.maxsize
             color = QtGui.QColor.fromHsvF(hue, 1, 1, alpha)
             brush = QtGui.QBrush(color)
 
@@ -679,7 +679,7 @@
         try:
             self.branch.lock_read()
             try:
-                revid = str(self.log_list.currentIndex().data(logmodel.RevIdRole).toString())
+                revid = self.log_list.currentIndex().data(logmodel.RevIdRole)
                 if revid.startswith(CURRENT_REVISION):
                     rev = cached_revisions[revid]
                     self.annotate_tree = self.working_tree
@@ -707,13 +707,13 @@
                 self.branch.unlock()
         finally:
             self.throbber.hide()
-    
+
     def log_list_selectionChanged(self, selected, deselected):
         revids = self.log_list.get_selection_and_merged_revids()
         self.annotate_bar.highlight_revids = revids
         self.guidebar_panel.update_data(annotate=self.annotate_bar.highlight_lines)
         self.annotate_bar.update()
-    
+
     def show_find_toggle(self, state):
         if state:
             self.show_goto_line.setChecked(False)
@@ -725,7 +725,7 @@
             self.show_find.setChecked(False)
         else:
             self.goto_line_toolbar.line_edit.setText('')
-    
+
     def word_wrap_toggle(self, state):
         if state:
             self.text_edit.setLineWrapMode(QtGui.QPlainTextEdit.WidgetWidth)
@@ -741,14 +741,17 @@
 
 
 # QIntValidator did not work on vila's setup, so this is a workaround.
+# RJLRJL QIntValidator seems to be working in 2020, whereas this isn't
+# so ignored for now.
 class IntValidator(QtGui.QValidator):
     def validate (self, input, pos):
         if input == '':
             return (QtGui.QValidator.Intermediate, pos)
-        try: 
+        try:
             i = int(input)
         except ValueError:
             return (QtGui.QValidator.Invalid, pos)
+
         if i > 0:
             return (QtGui.QValidator.Acceptable, pos)
         else:
@@ -756,50 +759,46 @@
 
 
 class GotoLineToolbar(QtGui.QToolBar):
-    
+
     def __init__(self, anotate_window, show_action):
         QtGui.QToolBar.__init__(self, gettext("Goto Line"), anotate_window)
         self.anotate_window = anotate_window
         if 0: self.anotate_window = AnnotateWindow()
         self.show_action = show_action
-        
+
         self.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
         self.setMovable (False)
-        
+
         label = QtGui.QLabel(gettext("Goto Line: "), self)
         self.addWidget(label)
-        
+
         self.line_edit = QtGui.QLineEdit(self)
-        self.line_edit.setValidator(IntValidator(self.line_edit))
+        # QIntValidator is working in python3, so we'll use that
+        # self.line_edit.setValidator(IntValidator(self.line_edit))
+        self.line_edit.setValidator(QtGui.QIntValidator())
         self.addWidget(self.line_edit)
         label.setBuddy(self.line_edit)
-        
+
         go = self.addAction(get_icon("go-next"), gettext("Go"))
-        
+
         spacer = QtGui.QWidget()
-        spacer.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        spacer.setSizePolicy(QtGui.QSizePolicy.Expanding,
+                             QtGui.QSizePolicy.Expanding)
         self.addWidget(spacer)
-        
+
         close = QtGui.QAction(self)
-        close.setIcon(self.style().standardIcon(
-                                        QtGui.QStyle.SP_DialogCloseButton))
+        close.setIcon(self.style().standardIcon(QtGui.QStyle.SP_DialogCloseButton))
         self.addAction(close)
         close.setShortcut((QtCore.Qt.Key_Escape))
         close.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         close.setStatusTip(gettext("Close Goto Line"))
-        self.connect(close,
-                     QtCore.SIGNAL("triggered(bool)"),
-                     self.close_triggered)
-        self.connect(go,
-                     QtCore.SIGNAL("triggered(bool)"),
-                     self.go_triggered)
-        self.connect(self.line_edit,
-                     QtCore.SIGNAL("returnPressed()"),
-                     self.go_triggered)
-    
+        self.connect(close, QtCore.SIGNAL("triggered(bool)"), self.close_triggered)
+        self.connect(go, QtCore.SIGNAL("triggered(bool)"), self.go_triggered)
+        self.connect(self.line_edit, QtCore.SIGNAL("returnPressed()"), self.go_triggered)
+
     def close_triggered(self, state):
         self.show_action.setChecked(False)
-    
+
     def go_triggered(self, state=True):
         try:
             line = int(str(self.line_edit.text()))
@@ -811,19 +810,15 @@
 
 
 class AnnotateLogList(LogList):
-    
+
     parent_annotate_window = None
-    
+
     def create_context_menu(self):
         LogList.create_context_menu(self, diff_is_default_action=False)
-        set_rev_action = QtGui.QAction(gettext("&Annotate this revision"),
-                                       self.context_menu)
-        self.connect(set_rev_action, QtCore.SIGNAL('triggered()'),
-                     self.parent_annotate_window.set_annotate_revision)
-        self.context_menu.insertAction(
-            self.context_menu.actions()[0],
-            set_rev_action)
+        set_rev_action = QtGui.QAction(gettext("&Annotate this revision"), self.context_menu)
+        self.connect(set_rev_action, QtCore.SIGNAL('triggered()'), self.parent_annotate_window.set_annotate_revision)
+        self.context_menu.insertAction(self.context_menu.actions()[0], set_rev_action)
         self.context_menu.setDefaultAction(set_rev_action)
-    
+
     def default_action(self, index=None):
         self.parent_annotate_window.set_annotate_revision()

=== modified file 'lib/autocomplete.py'
--- lib/autocomplete.py	2008-11-04 15:15:48 +0000
+++ lib/autocomplete.py	2020-07-16 14:28:25 +0000
@@ -68,7 +68,7 @@
 
     def compile_regexes(self):
         if self.compiled_regexes is None:
-            self.compiled_regexes = map(re.compile, self.regexes)
+            self.compiled_regexes = list(map(re.compile, self.regexes))
 
     def iter_words(self, file):
         self.compile_regexes()
@@ -77,7 +77,7 @@
                 for result in regex.findall(line):
                     if not isinstance(result, tuple):
                         result = (result,)
-                    for word in filter(None, result):
+                    for word in [_f for _f in result if _f]:
                         yield word
 
 

=== modified file 'lib/bind.py'
--- lib/bind.py	2017-09-11 06:53:22 +0000
+++ lib/bind.py	2020-07-16 14:28:25 +0000
@@ -113,7 +113,7 @@
             self.branch_combo.setCurrentIndex(0)
 
     def _get_location(self):
-        return unicode(self.branch_combo.currentText())
+        return str(self.branch_combo.currentText())
 
     def validate(self):
         if not self._get_location():

=== modified file 'lib/branch.py'
--- lib/branch.py	2017-09-11 06:53:22 +0000
+++ lib/branch.py	2020-07-16 14:28:25 +0000
@@ -49,7 +49,7 @@
         # Unless instructed otherwise, use the current directory as
         # the parent directory.
         if parent_dir is None:
-            parent_dir = os.getcwdu()
+            parent_dir = os.getcwd()
         self.parent_dir = parent_dir
 
         # Layout the form, adding the subprocess widgets
@@ -68,7 +68,7 @@
 
         # Initialise the fields
         fill_combo_with(self.ui.from_location,
-                        u'',
+                        '',
                         iter_saved_pull_locations())
         if from_location:
             self.ui.from_location.setEditText(from_location)
@@ -96,7 +96,7 @@
             self.ui.from_location.setFocus()
 
     def from_changed(self, from_location):
-        to_location = self._default_to_location(unicode(from_location))
+        to_location = self._default_to_location(str(from_location))
         if to_location is not None:
             self.ui.to_location.setEditText(to_location)
 
@@ -129,7 +129,7 @@
     def get_to_location(self):
         """The path the branch was created in."""
         # This is used by explorer to find the location to open on completion
-        return unicode(self.ui.to_location.currentText())
+        return str(self.ui.to_location.currentText())
 
     def do_start(self):
         args = []
@@ -139,7 +139,7 @@
         if revision:
             args.append('--revision')
             args.append(revision)
-        from_location = unicode(self.ui.from_location.currentText())
+        from_location = str(self.ui.from_location.currentText())
         to_location = self.get_to_location()
         if 'use-existing-dir' in self.cmd_branch_options:
             # always use this options because it should be mostly harmless

=== modified file 'lib/browse.py'
--- lib/browse.py	2017-09-11 06:53:22 +0000
+++ lib/browse.py	2020-07-16 14:28:25 +0000
@@ -214,7 +214,7 @@
 
     @ui_current_widget
     def reload_tree(self):
-        revstr = unicode(self.revision_edit.text())
+        revstr = str(self.revision_edit.text())
         if not revstr:
             if self.workingtree is not None:
                 self.revision_spec = "wt:"
@@ -231,7 +231,7 @@
             else:
                 try:
                     revspec = RevisionSpec.from_string(revstr)
-                except errors.NoSuchRevisionSpec, e:
+                except errors.NoSuchRevisionSpec as e:
                     QtGui.QMessageBox.warning(self,
                         gettext("Browse"), str(e),
                         QtGui.QMessageBox.Ok)

=== modified file 'lib/bugs.py'
--- lib/bugs.py	2017-09-11 06:53:22 +0000
+++ lib/bugs.py	2020-07-16 14:28:25 +0000
@@ -91,7 +91,7 @@
     else:
         branch = FakeBranchForBugs()
     # try to convert bug urls to tag:id values
-    for k,n in urls_dict.iteritems():
+    for k,n in urls_dict.items():
         for tag in bug_tags:
             url = bugtracker.get_bug_url(tag, branch, n)
             if url == k:
@@ -124,7 +124,7 @@
 def get_global_bug_tags():
     """Return bug tags collected from global config bazaar.conf"""
     cfg = config.GlobalConfig()
-    keys = cfg._get_parser().get('DEFAULT', {}).keys()
+    keys = list(cfg._get_parser().get('DEFAULT', {}).keys())
     return get_user_bug_trackers_tags(keys)
 
 def get_branch_bug_tags(branch):

=== modified file 'lib/cat.py'
--- lib/cat.py	2017-11-13 23:31:28 +0000
+++ lib/cat.py	2020-07-16 14:28:25 +0000
@@ -69,7 +69,7 @@
                  tree=None, file_id=None, encoding=None,
                  parent=None):
         """Create qcat window."""
-        
+
         self.filename = filename
         self.revision = revision
         self.tree = tree
@@ -112,7 +112,7 @@
         # we show the bare form as soon as possible.
         QBzrWindow.show(self)
         QtCore.QTimer.singleShot(0, self.load)
-    
+
     @runs_in_loading_queue
     @ui_current_widget
     @reports_exception()
@@ -131,24 +131,24 @@
                 else:
                     revision_id = self.revision[0].in_branch(branch).rev_id
                     self.tree = branch.repository.revision_tree(revision_id)
-                
+
                 self.file_id = self.tree.path2id(relpath)
-            
+
             if not self.file_id:
                 self.file_id = self.tree.path2id(self.filename)
-                
+
             if not self.file_id:
                 raise errors.BzrCommandError(
                     "%r is not present in revision %s" % (
                         self.filename, self.tree.get_revision_id()))
-            
+
             self.tree.lock_read()
             try:
-                kind = self.tree.kind(self.filename, self.file_id)
+                kind = self.tree.kind(self.filename)
                 if kind == 'file':
-                    text = self.tree.get_file_text(self.filename, self.file_id)
+                    text = self.tree.get_file_text(self.filename)
                 elif kind == 'symlink':
-                    text = self.tree.get_symlink_target(self.filename, self.file_id)
+                    text = self.tree.get_symlink_target(self.filename)
                 else:
                     text = ''
             finally:
@@ -184,7 +184,7 @@
         Supported file types: text, image, binary
         """
         if kind == 'file':
-            if not '\0' in text:
+            if not b'\0' in text:
                 return 'text file', self._create_text_view
             else:
                 ext = file_extension(relpath).lower()
@@ -331,6 +331,7 @@
     # make temp file
     import os
     import tempfile
+    # RJLRJL Check this QBzr reference
     qdir = os.path.join(tempfile.gettempdir(), 'QBzr', 'qcat')
     if not os.path.isdir(qdir):
         os.makedirs(qdir)

=== added file 'lib/cleanup.py'
--- lib/cleanup.py	1970-01-01 00:00:00 +0000
+++ lib/cleanup.py	2020-07-16 14:28:25 +0000
@@ -0,0 +1,184 @@
+# Copyright (C) 2009, 2010 Canonical Ltd
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Helpers for managing cleanup functions and the errors they might raise.
+
+The usual way to run cleanup code in Python is::
+
+    try:
+        do_something()
+    finally:
+        cleanup_something()
+
+However if both `do_something` and `cleanup_something` raise an exception
+Python will forget the original exception and propagate the one from
+cleanup_something.  Unfortunately, this is almost always much less useful than
+the original exception.
+
+If you want to be certain that the first, and only the first, error is raised,
+then use::
+
+    operation = OperationWithCleanups(do_something)
+    operation.add_cleanup(cleanup_something)
+    operation.run_simple()
+
+This is more inconvenient (because you need to make every try block a
+function), but will ensure that the first error encountered is the one raised,
+while also ensuring all cleanups are run.  See OperationWithCleanups for more
+details.
+"""
+
+from __future__ import absolute_import
+
+from collections import deque
+# import sys
+# from . import (
+#     debug,
+#     trace,
+#     )
+
+from breezy import (
+    debug,
+    trace,
+    )
+
+
+def _log_cleanup_error(exc):
+    trace.mutter('Cleanup failed:')
+    trace.log_exception_quietly()
+    if 'cleanup' in debug.debug_flags:
+        trace.warning('brz: warning: Cleanup failed: %s', exc)
+
+
+def _run_cleanup(func, *args, **kwargs):
+    """Run func(*args, **kwargs), logging but not propagating any error it
+    raises.
+
+    :returns: True if func raised no errors, else False.
+    """
+    try:
+        func(*args, **kwargs)
+    except KeyboardInterrupt:
+        raise
+    except Exception as exc:
+        _log_cleanup_error(exc)
+        return False
+    return True
+
+
+def _run_cleanups(funcs):
+    """Run a series of cleanup functions."""
+    for func, args, kwargs in funcs:
+        _run_cleanup(func, *args, **kwargs)
+
+
+class ObjectWithCleanups(object):
+    """A mixin for objects that hold a cleanup list.
+
+    Subclass or client code can call add_cleanup and then later `cleanup_now`.
+    """
+    def __init__(self):
+        self.cleanups = deque()
+
+    def add_cleanup(self, cleanup_func, *args, **kwargs):
+        """Add a cleanup to run.
+
+        Cleanups may be added at any time.
+        Cleanups will be executed in LIFO order.
+        """
+        self.cleanups.appendleft((cleanup_func, args, kwargs))
+
+    def cleanup_now(self):
+        _run_cleanups(self.cleanups)
+        self.cleanups.clear()
+
+
+class OperationWithCleanups(ObjectWithCleanups):
+    """A way to run some code with a dynamic cleanup list.
+
+    This provides a way to add cleanups while the function-with-cleanups is
+    running.
+
+    Typical use::
+
+        operation = OperationWithCleanups(some_func)
+        operation.run(args...)
+
+    where `some_func` is::
+
+        def some_func(operation, args, ...):
+            do_something()
+            operation.add_cleanup(something)
+            # etc
+
+    Note that the first argument passed to `some_func` will be the
+    OperationWithCleanups object.  To invoke `some_func` without that, use
+    `run_simple` instead of `run`.
+    """
+
+    def __init__(self, func):
+        super(OperationWithCleanups, self).__init__()
+        self.func = func
+
+    def run(self, *args, **kwargs):
+        return _do_with_cleanups(self.cleanups, self.func, self, *args, **kwargs)
+
+    def run_simple(self, *args, **kwargs):
+        return _do_with_cleanups(self.cleanups, self.func, *args, **kwargs)
+
+
+def _do_with_cleanups(cleanup_funcs, func, *args, **kwargs):
+    """Run `func`, then call all the cleanup_funcs.
+
+    All the cleanup_funcs are guaranteed to be run.  The first exception raised
+    by func or any of the cleanup_funcs is the one that will be propagted by
+    this function (subsequent errors are caught and logged).
+
+    Conceptually similar to::
+
+        try:
+            return func(*args, **kwargs)
+        finally:
+            for cleanup, cargs, ckwargs in cleanup_funcs:
+                cleanup(*cargs, **ckwargs)
+
+    It avoids several problems with using try/finally directly:
+     * an exception from func will not be obscured by a subsequent exception
+       from a cleanup.
+     * an exception from a cleanup will not prevent other cleanups from
+       running (but the first exception encountered is still the one
+       propagated).
+
+    Unike `_run_cleanup`, `_do_with_cleanups` can propagate an exception from a
+    cleanup, but only if there is no exception from func.
+    """
+    try:
+        result = func(*args, **kwargs)
+    except:
+        # We have an exception from func already, so suppress cleanup errors.
+        _run_cleanups(cleanup_funcs)
+        raise
+    # No exception from func, so allow first cleanup error to propgate.
+    pending_cleanups = iter(cleanup_funcs)
+    try:
+        for cleanup, c_args, c_kwargs in pending_cleanups:
+            cleanup(*c_args, **c_kwargs)
+    except:
+        # Still run the remaining cleanups but suppress any further errors.
+        _run_cleanups(pending_cleanups)
+        raise
+    # No error, so we can return the result
+    return result

=== modified file 'lib/commands.py'
--- lib/commands.py	2017-09-11 06:53:22 +0000
+++ lib/commands.py	2020-07-16 14:28:25 +0000
@@ -19,6 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import signal
+import contextlib
 
 from breezy import errors
 from breezy.commands import Command
@@ -40,6 +41,7 @@
 from breezy.branch import Branch
 from breezy.controldir import ControlDir
 from breezy.workingtree import WorkingTree
+from breezy.diff import get_trees_and_branches_to_diff_locked
 
 from breezy.plugins.qbrz.lib import i18n
 from breezy.plugins.qbrz.lib.add import AddWindow
@@ -85,7 +87,7 @@
 
 from breezy.plugins.qbrz.lib.diff_arg import DiffArgProvider
 
-CUR_DIR=u'.'
+CUR_DIR='.'
 
 class InvalidEncodingOption(errors.BzrError):
 
@@ -96,8 +98,7 @@
         errors.BzrError.__init__(self)
         self.encoding = encoding
         import encodings
-        self.valid = ', '.join(sorted(list(
-            set(encodings.aliases.aliases.values())))).replace('_','-')
+        self.valid = ', '.join(sorted(list(set(encodings.aliases.aliases.values())))).replace('_','-')
 
 
 def check_encoding(encoding):
@@ -108,8 +109,7 @@
 
 class PyQt4NotInstalled(errors.BzrError):
 
-    _fmt = ('QBzr require at least PyQt 4.4 and '
-            'Qt 4.4 to run. Please check your install')
+    _fmt = ('QBrz requires at least PyQt 4.4 and Qt 4.4 to run. Please check your install')
 
 
 def report_missing_pyqt(unbound):
@@ -120,7 +120,7 @@
     def run(self, *args, **kwargs):
         try:
             return unbound(self, *args, **kwargs)
-        except ImportError, e:
+        except ImportError as e:
             if str(e).endswith('PyQt4'):
                 raise PyQt4NotInstalled
             raise
@@ -163,10 +163,10 @@
         std_ui_factory = ui.ui_factory
         try:
             ui.ui_factory = QUIFactory()
-            
+
             # Handle interupt signal correctly.
             signal.signal(signal.SIGINT, signal.SIG_DFL)
-            
+
             # Set up global exception handling.
             from breezy.plugins.qbrz.lib.trace import excepthook
             sys.excepthook = excepthook
@@ -195,11 +195,9 @@
             ui.ui_factory = std_ui_factory
 
 
-ui_mode_option = Option("ui-mode",
-    help="Causes dialogs to wait after the operation is complete.")
+ui_mode_option = Option("ui-mode", help="Causes dialogs to wait after the operation is complete.")
 execute_option = Option("execute", short_name='e',
-    help="Causes dialogs to start the underlying action immediately without "
-         "waiting for user input.")
+    help="Causes dialogs to start the underlying action immediately without waiting for user input.")
 
 # A special option so 'revision' can be passed as a simple string, when we do
 # *not* want breezy's feature of parsing the revision string before passing it.
@@ -209,23 +207,23 @@
 # 'revision' as normal.
 simple_revision_option = Option("revision",
                              short_name='r',
-                             type=unicode,
+                             type=str,
                              help='See "help revisionspec" for details.')
 
 
-def bzr_option(cmd_name, opt_name):
-    """Helper so we can 'borrow' options from bzr itself without needing to
+def brz_option(cmd_name, opt_name):
+    """Helper so we can 'borrow' options from brz itself without needing to
     duplicate the help text etc.  Pass the builtin bzr command name and an
     option name.
 
     eg:
-      takes_options = [bzr_option("push", "create-prefix")]
+      takes_options = [brz_option("push", "create-prefix")]
 
     would give a command the exact same '--create-prefix' option as bzr's
     push command has, including help text, parsing, etc.
     """
     from breezy.commands import get_cmd_object
-    cmd=get_cmd_object(cmd_name, False)
+    cmd = get_cmd_object(cmd_name, False)
     return cmd.options()[opt_name]
 
 
@@ -233,13 +231,10 @@
     """Show the origin of each line in a file."""
     takes_args = ['filename']
     takes_options = ['revision',
-                     Option('encoding', type=check_encoding,
-                         help='Encoding of files content (default: utf-8).'),
+                     Option('encoding', type=check_encoding, help='Encoding of files content (default: utf-8).'),
                      ui_mode_option,
                      Option('no-graph', help="Shows the log with no graph."),
-                     Option('line', short_name='L', type=int, argname='N',
-                        param_name='activate_line',
-                        help='Activate line N on start.'),
+                     Option('line', short_name='L', type=int, argname='N', param_name='activate_line', help='Activate line N on start.'),
                     ]
     aliases = ['qann', 'qblame']
 
@@ -248,8 +243,7 @@
         back to this function to process the command-line args and convert
         them into the branch and tree etc needed by the UI.
         """
-        wt, branch, relpath = \
-            ControlDir.open_containing_tree_or_branch(filename)
+        wt, branch, relpath = ControlDir.open_containing_tree_or_branch(filename)
         if wt is not None:
             wt.lock_read()
         else:
@@ -259,23 +253,18 @@
                 if wt is not None:
                     tree = wt
                 else:
-                    tree = branch.repository.revision_tree(
-                                                    branch.last_revision())
+                    tree = branch.repository.revision_tree(branch.last_revision())
             elif len(revision) != 1:
-                raise errors.BzrCommandError(
-                    'bzr qannotate --revision takes exactly 1 argument')
+                raise errors.BzrCommandError('brz qannotate --revision takes exactly 1 argument')
             else:
-                tree = branch.repository.revision_tree(
-                        revision_id = revision[0].in_history(branch).rev_id)
+                tree = branch.repository.revision_tree(revision_id = revision[0].in_history(branch).rev_id)
 
             file_id = tree.path2id(relpath)
             if file_id is None:
                 raise errors.NotVersionedError(filename)
-            [(path, entry)] = list(tree.iter_entries_by_dir(
-                specific_file_ids=[file_id]))
+            [(path, entry)] = list(tree.iter_entries_by_dir(specific_files=[filename]))
             if entry.kind != 'file':
-                raise errors.BzrCommandError(
-                        'bzr qannotate only works for files (got %r)' % entry.kind)
+                raise errors.BzrCommandError('brz qannotate only works for files (got %r)' % entry.kind)
             #repo = branch.repository
             #w = repo.weave_store.get_weave(file_id, repo.get_transaction())
             #content = list(w.annotate_iter(entry.revision))
@@ -307,7 +296,10 @@
     takes_options = [ui_mode_option]
 
     def _qbrz_run(self, selected_list=None, ui_mode=False):
+        # print('\n:: cmd_add was passed ', selected_list)
         tree, selected_list = WorkingTree.open_containing_paths(selected_list)
+        # print('\n::: cmd_add started', tree, selected_list)
+
         if selected_list == ['']:
             selected_list = None
         self.main_window = AddWindow(tree, selected_list, dialog=False, ui_mode=ui_mode)
@@ -318,7 +310,7 @@
 class cmd_qrevert(QBzrCommand):
     """Revert changes files."""
     takes_args = ['selected*']
-    takes_options = [ui_mode_option, bzr_option('revert', 'no-backup')]
+    takes_options = [ui_mode_option, brz_option('revert', 'no-backup')]
 
     def _qbrz_run(self, selected_list=None, ui_mode=False, no_backup=False):
         tree, selected_list = WorkingTree.open_containing_paths(selected_list)
@@ -351,7 +343,7 @@
     aliases = ['qbw']
 
     def _qbrz_run(self, revision=None, location=None):
-        Branch.open_containing(location or u'.')  # if there is no branch we want NotBranchError raised
+        Branch.open_containing(location or '.')  # if there is no branch we want NotBranchError raised
         if revision is None:
             win = BrowseWindow(location = location)
         else:
@@ -364,9 +356,9 @@
     """GUI for committing revisions."""
     takes_args = ['selected*']
     takes_options = [
-            bzr_option('commit', 'message'),
-            bzr_option('commit', 'local'),
-            bzr_option('commit', 'file'),
+            brz_option('commit', 'message'),
+            brz_option('commit', 'local'),
+            brz_option('commit', 'file'),
             Option('file-encoding', type=check_encoding,
                help='Encoding of commit message file content.'),
             ui_mode_option,
@@ -407,31 +399,25 @@
         Option('renamed', short_name='R', help='Show diff for renamed files.'),
         Option('ignore-whitespace', short_name='w',
                help="Ignore whitespace when finding differences"),
-        bzr_option('diff', 'old'),
-        bzr_option('diff', 'new'),
+        brz_option('diff', 'old'),
+        brz_option('diff', 'new'),
         ]
     if 'change' in Option.OPTIONS:
         takes_options.append('change')
     aliases = ['qdi']
 
     def get_diff_window_args(self, processEvents, add_cleanup):
+        # RJL if you get a ``AttributeError: 'function' object has no attribute 'enter_context'``
+        # error, or something similar, use something like:
+        #
+        #  exit_stack = contextlib.ExitStack()
+        #
+        # and pass that as add_cleanup
+        #
         args = {}
-        try:
-            from breezy.diff import get_trees_and_branches_to_diff_locked
-        except ImportError:
-            from breezy.diff import get_trees_and_branches_to_diff
-            (args["old_tree"], args["new_tree"],
-             args["old_branch"], args["new_branch"],
-             args["specific_files"], _) = \
-                get_trees_and_branches_to_diff(
-                    self.file_list, self.revision, self.old, self.new)
-        else:
-            (args["old_tree"], args["new_tree"],
-             args["old_branch"], args["new_branch"],
-             args["specific_files"], _) = \
-                get_trees_and_branches_to_diff_locked(
-                    self.file_list, self.revision, self.old, self.new,
-                    add_cleanup)
+        (args["old_tree"], args["new_tree"],
+            args["old_branch"], args["new_branch"],
+            args["specific_files"], _) = get_trees_and_branches_to_diff_locked(self.file_list, self.revision, self.old, self.new, add_cleanup)
         args["ignore_whitespace"] = self.ignore_whitespace
         return args
 
@@ -459,8 +445,7 @@
             old=None, new=None, ui_mode=False):
 
         if revision and len(revision) > 2:
-            raise errors.BzrCommandError('bzr qdiff --revision takes exactly'
-                                         ' one or two revision specifiers')
+            raise errors.BzrCommandError('brz qdiff --revision takes exactly one or two revision specifiers')
         # changes filter
         filter_options = FilterOptions(added=added, deleted=deleted,
             modified=modified, renamed=renamed)
@@ -474,11 +459,7 @@
         self.new = new
         self.ignore_whitespace = ignore_whitespace
 
-        window = DiffWindow(self,
-                            complete=complete,
-                            encoding=encoding,
-                            filter_options=filter_options,
-                            ui_mode=ui_mode)
+        window = DiffWindow(self, complete=complete, encoding=encoding, filter_options=filter_options, ui_mode=ui_mode)
         window.show()
         self._application.exec_()
 
@@ -508,14 +489,11 @@
     takes_options = [
         ui_mode_option,
         Option('no-graph', help="Shows the log with no graph."),
-        Option('show-trees', help="Show working trees that have changes "
-                                  "as nodes in the graph"),
+        Option('show-trees', help="Show working trees that have changes as nodes in the graph"),
         ]
 
-    def _qbrz_run(self, locations_list=None, ui_mode=False, no_graph=False,
-                  show_trees=False):
-        window = LogWindow(locations_list, None, None, ui_mode=ui_mode,
-                           no_graph=no_graph, show_trees=show_trees)
+    def _qbrz_run(self, locations_list=None, ui_mode=False, no_graph=False, show_trees=False):
+        window = LogWindow(locations_list, None, None, ui_mode=ui_mode, no_graph=no_graph, show_trees=show_trees)
         window.show()
         self._application.exec_()
 
@@ -541,17 +519,14 @@
 
     takes_options = [
         'revision',
-        Option('encoding', type=check_encoding,
-               help='Encoding of files content (default: utf-8).'),
-        Option('native',
-               help='Show file with native application.'),
+        Option('encoding', type=check_encoding, help='Encoding of files content (default: utf-8).'),
+        Option('native', help='Show file with native application.'),
         ]
     takes_args = ['filename']
 
     def _qbrz_run(self, filename, revision=None, encoding=None, native=None):
         if revision is not None and len(revision) != 1:
-            raise errors.BzrCommandError("bzr qcat --revision takes exactly"
-                                         " one revision specifier")
+            raise errors.BzrCommandError("brz qcat --revision takes exactly one revision specifier")
 
         if native:
             branch, relpath = Branch.open_containing(filename)
@@ -563,9 +538,7 @@
             result = cat_to_native_app(tree, relpath)
             return int(not result)
 
-
-        window = QBzrCatWindow(filename = filename, revision = revision,
-                               encoding = encoding)
+        window = QBzrCatWindow(filename = filename, revision = revision, encoding = encoding)
         window.show()
         self._application.exec_()
 
@@ -576,7 +549,7 @@
     takes_options = [
         'remember', 'overwrite',
         simple_revision_option,
-        bzr_option('pull', 'directory'),
+        brz_option('pull', 'directory'),
         ui_mode_option,
         ]
     takes_args = ['location?']
@@ -605,9 +578,9 @@
 
     takes_options = [ui_mode_option,
                      simple_revision_option,
-                     bzr_option('merge', 'directory'),
-                     bzr_option('merge', 'force'),
-                     bzr_option('merge', 'uncommitted'),
+                     brz_option('merge', 'directory'),
+                     brz_option('merge', 'force'),
+                     brz_option('merge', 'uncommitted'),
                      'remember']
     takes_args = ['location?']
 
@@ -632,9 +605,9 @@
     """Update a mirror of this branch."""
 
     takes_options = ['remember', 'overwrite',
-                     bzr_option("push", "create-prefix"),
-                     bzr_option("push", "use-existing-dir"),
-                     bzr_option("push", "directory"),
+                     brz_option("push", "create-prefix"),
+                     brz_option("push", "use-existing-dir"),
+                     brz_option("push", "directory"),
                      ui_mode_option]
     takes_args = ['location?']
 
@@ -669,7 +642,7 @@
     takes_options = [simple_revision_option,
                      ui_mode_option]
     try:
-        takes_options.append(bzr_option("branch", "bind"))
+        takes_options.append(brz_option("branch", "bind"))
     except KeyError:
         # older version of bzr that doesn't support the option
         pass
@@ -704,19 +677,17 @@
                         ' acceptable for verification.',
                    short_name='k',
                    type=str,),
-            'revision', 
+            'revision',
           ]
     takes_args = ['location?']
 
     def _qbrz_run(self, acceptable_keys=None, revision=None, location=CUR_DIR):
         if gpg.GPGStrategy.verify_signatures_available():
-            window = QBzrVerifySignaturesWindow(acceptable_keys, revision,
-                                                                    location)
+            window = QBzrVerifySignaturesWindow(acceptable_keys, revision, location)
             window.show()
             self._application.exec_()
         else:
-            raise errors.DependencyNotPresent("python-gpgme", 
-                                        "python-gpgme not installed")
+            raise errors.DependencyNotPresent("python-gpgme", "python-gpgme not installed")
 
 class cmd_qinit(QBzrCommand):
     """Initializes a new branch or shared repository."""
@@ -734,11 +705,8 @@
     __doc__ = breezy.builtins.cmd_merge.__doc__
 
     takes_options = breezy.builtins.cmd_merge.takes_options + [
-            Option('qpreview', help='Instead of merging, '
-                'show a diff of the merge in a GUI window.'),
-            Option('encoding', type=check_encoding,
-                   help='Encoding of files content, used with --qpreview '
-                        '(default: utf-8).'),
+            Option('qpreview', help='Instead of merging, show a diff of the merge in a GUI window.'),
+            Option('encoding', type=check_encoding, help='Encoding of files content, used with --qpreview (default: utf-8).'),
             ]
 
     def run(self, *args, **kw):
@@ -865,7 +833,6 @@
         self.main_window.show()
         self._application.exec_()
 
-
 class cmd_qhelp(QBzrCommand):
     """Shows a help window"""
 
@@ -885,9 +852,9 @@
     takes_args = ['tag_name?']
     takes_options = [
         ui_mode_option,
-        bzr_option('tag', 'delete'),
-        bzr_option('tag', 'directory'),
-        bzr_option('tag', 'force'),
+        brz_option('tag', 'delete'),
+        brz_option('tag', 'directory'),
+        brz_option('tag', 'force'),
         'revision',
         ]
 
@@ -997,7 +964,7 @@
         from breezy.plugins.qbrz.lib.switch import QBzrSwitchWindow
 
         branch = Branch.open_containing(CUR_DIR)[0]
-        contrldir = ControlDir.open_containing(CUR_DIR)[0]
+        controldir = ControlDir.open_containing(CUR_DIR)[0]
         self.main_window = QBzrSwitchWindow(branch, controldir, location, ui_mode)
         self.main_window.show()
         self._application.exec_()
@@ -1078,11 +1045,11 @@
         Option('directory',
             help='Working directory.',
             short_name='d',
-            type=unicode,
+            type=str,
             ),
         Option('category',
             help='Initial category selection.',
-            type=unicode,
+            type=str,
             ),
         execute_option,
         ]
@@ -1106,15 +1073,15 @@
             execute=execute)
         window.show()
         self._application.exec_()
-        
+
 class cmd_qshelve(QBzrCommand):
     """Shelve selected changes away."""
     takes_args = ['file*']
     takes_options = [
         ui_mode_option,
-        bzr_option('shelve', 'list'),
-        bzr_option('shelve', 'directory'),
-        bzr_option('shelve', 'message'),
+        brz_option('shelve', 'list'),
+        brz_option('shelve', 'directory'),
+        brz_option('shelve', 'message'),
         Option('all', help='Select all changes.'),
         Option('complete', help='Show complete files.'),
         Option('ignore-whitespace', short_name='w',
@@ -1123,7 +1090,7 @@
                help='Encoding of files content (default: utf-8).'),
         ]
 
-    def _qbrz_run(self, file_list=None, list=False, directory=None, ui_mode=False, 
+    def _qbrz_run(self, file_list=None, list=False, directory=None, ui_mode=False,
                             complete=False, ignore_whitespace=False, encoding=None,
                             all=False, message=None):
         if list:
@@ -1131,7 +1098,7 @@
         else:
             initial_tab = 0
         self.main_window = ShelveWindow(file_list=file_list, directory=directory, ui_mode=ui_mode,
-                                initial_tab=initial_tab, complete=complete, 
+                                initial_tab=initial_tab, complete=complete,
                                 ignore_whitespace=ignore_whitespace, encoding=encoding,
                                 select_all=all, message=message)
         self.main_window.show()
@@ -1141,7 +1108,7 @@
     """Restore shalved changes."""
     takes_options = [
         ui_mode_option,
-        bzr_option('unshelve', 'directory'),
+        brz_option('unshelve', 'directory'),
         Option('complete', help='Show complete files.'),
         Option('ignore-whitespace', short_name='w',
                help="Ignore whitespace when finding differences.(Only work when --list specified)"),
@@ -1149,10 +1116,10 @@
                help='Encoding of files content (default: utf-8).'),
         ]
 
-    def _qbrz_run(self, directory=None, ui_mode=False, 
+    def _qbrz_run(self, directory=None, ui_mode=False,
                         complete=False, ignore_whitespace=False, encoding=None):
         self.main_window = ShelveWindow(directory=directory, ui_mode=ui_mode,
-                                initial_tab=1, complete=complete, 
+                                initial_tab=1, complete=complete,
                                 ignore_whitespace=ignore_whitespace, encoding=encoding)
         self.main_window.show()
         self._application.exec_()
@@ -1163,7 +1130,7 @@
     takes_args = []
     takes_options = [
         ui_mode_option,
-        bzr_option('ignore', 'directory'),
+        brz_option('ignore', 'directory'),
         ]
     aliases = []
 

=== modified file 'lib/commit.py'
--- lib/commit.py	2017-09-11 06:53:22 +0000
+++ lib/commit.py	2020-07-16 14:28:25 +0000
@@ -69,9 +69,11 @@
 
     def __init__(self, spell_checker, parent=None, main_window=None):
         QtGui.QTextEdit.__init__(self, parent)
+        # RJL The completer, I think, is to provide suggestions for anything typed
         self.completer = None
         self.spell_checker = spell_checker
-        self.eow = QtCore.QString("~!@#$%^&*()_+{}|:\"<>?,./;'[]\\-=")
+        # RJL eow = 'end of word'?
+        self.eow = "~!@#$%^&*()_+{}|:\"<>?,./;'[]\\-="
         self.main_window = main_window
 
     def inputMethodEvent(self, e):
@@ -98,15 +100,25 @@
             QtGui.QTextEdit.keyPressEvent(self, e)
 
         ctrlOrShift = e.modifiers() & (QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier)
-        if ctrlOrShift and e.text().isEmpty():
+        # if ctrlOrShift and e.text().isEmpty():
+        if ctrlOrShift and not e.text():
             return
 
         hasModifier = (e.modifiers() != QtCore.Qt.NoModifier) and not ctrlOrShift
         completionPrefix = self.textUnderCursor()
 
-        if not isShortcut and (hasModifier or e.text().isEmpty()
-                               or completionPrefix.length() < 2
-                               or self.eow.contains(e.text().right(1))):
+        # RJL I *think* this is trying to find out whether to hide or display a list
+        # of possible completions. right() is a QString method that:
+        #
+        #  Returns a substring that contains the n rightmost characters of the string.
+        #  The entire string is returned if n is greater than size() or less than zero.
+        #  QString x = "Pineapple";
+        #  QString y = x.right(5);      // y == "apple"
+        #
+        # or simply x[-5:] in the land of Python, .right(1) is the last letter
+        # which is e.text()[-1:]
+
+        if not isShortcut and (hasModifier or not e.text() or len(completionPrefix) < 2 or e.text()[-1:] in self.eow):
             c.popup().hide()
             return
 
@@ -115,8 +127,7 @@
             c.popup().setCurrentIndex(c.completionModel().index(0, 0))
 
         cr = self.cursorRect()
-        cr.setWidth(c.popup().sizeHintForColumn(0) +
-                    c.popup().verticalScrollBar().sizeHint().width())
+        cr.setWidth(c.popup().sizeHintForColumn(0) + c.popup().verticalScrollBar().sizeHint().width())
         c.complete(cr);
 
     def textUnderCursor(self):
@@ -126,41 +137,40 @@
 
     def insertCompletion(self, completion):
         tc = self.textCursor()
-        extra = completion.length() - self.completer.completionPrefix().length()
+        extra = len(completion) - len(self.completer.completionPrefix())
         tc.movePosition(QtGui.QTextCursor.Left)
         tc.movePosition(QtGui.QTextCursor.EndOfWord)
-        tc.insertText(completion.right(extra))
+        # We want the right-most 'extra' letters
+        # tc.insertText(completion.right(extra))
+        tc.insertText(completion[-extra:])
         self.setTextCursor(tc)
 
     def setCompleter(self, completer):
         self.completer = completer
         completer.setWidget(self)
         completer.setCaseSensitivity(QtCore.Qt.CaseSensitive)
-        self.connect(completer, QtCore.SIGNAL("activated(QString)"),
-                     self.insertCompletion)
+        self.connect(completer, QtCore.SIGNAL("activated(QString)"), self.insertCompletion)
 
     def contextMenuEvent(self, event):
         menu = self.createStandardContextMenu(event.globalPos())
-        
+
         self.context_tc = self.cursorForPosition(event.pos())
         self.context_tc.movePosition(QtGui.QTextCursor.StartOfWord)
-        self.context_tc.movePosition(QtGui.QTextCursor.EndOfWord,
-                                     QtGui.QTextCursor.KeepAnchor)
-        text = unicode(self.context_tc.selectedText())
+        self.context_tc.movePosition(QtGui.QTextCursor.EndOfWord, QtGui.QTextCursor.KeepAnchor)
+        text = str(self.context_tc.selectedText())
         if list(self.spell_checker.check(text)):
             suggestions = self.spell_checker.suggest(text)
             first_action = menu.actions()[0]
             for suggestion in suggestions:
                 action = QtGui.QAction(suggestion, self)
-                self.connect(action, QtCore.SIGNAL("triggered(bool)"),
-                             self.suggestion_selected(suggestion))
+                self.connect(action, QtCore.SIGNAL("triggered(bool)"), self.suggestion_selected(suggestion))
                 menu.insertAction(first_action, action)
             if suggestions:
                 menu.insertSeparator(first_action)
-        
+
         menu.exec_(event.globalPos())
         event.accept()
-    
+
     def suggestion_selected(self, text):
         def _suggestion_selected(b):
             self.context_tc.insertText(text);
@@ -175,12 +185,12 @@
         # that is going to make this much slower.
         self.header().hideSection(0)
         self.log_model.last_rev_is_placeholder = True
-    
+
     def load_tree(self, tree):
         bi = BranchInfo('', tree, tree.branch)
         self.log_model.load(
             (bi,), bi, None, False, logmodel.PendingMergesGraphVizLoader)
-    
+
     def create_context_menu(self, file_ids):
         super(PendingMergesList, self).create_context_menu(file_ids)
         showinfo = QtGui.QAction("Show &information...", self)
@@ -196,19 +206,19 @@
 
     def default_action(self, index=None):
         """Show information of a single revision from a index."""
-        
+
         if index is None:
             index = self.currentIndex()
-        
+
         # XXX We should make this show all selected revisions...
-        
-        revid = str(index.data(logmodel.RevIdRole).toString())
+
+        revid = index.data(logmodel.RevIdRole)
         branch = self.log_model.graph_viz.get_revid_branch(revid)
         parent_window = self.window()
         window = RevisionView(revid, branch, parent=parent_window)
         window.show()
         parent_window.windows.append(window)
-    
+
 
 class CommitWindow(SubProcessDialog):
 
@@ -230,10 +240,10 @@
 
         self.is_bound = bool(tree.branch.get_bound_location())
         self.has_pending_merges = len(tree.get_parent_ids())>1
-        
+
         if self.has_pending_merges and selected_list:
             raise errors.CannotCommitSelectedFileMerge(selected_list)
-        
+
         self.windows = []
         self.initial_selected_list = selected_list
 
@@ -274,7 +284,7 @@
             if local:
                 self.local_checkbox.setChecked(True)
             self.update_branch_groupbox()
-        
+
         self.not_uptodate_errors = {
             'BoundBranchOutOfDate': gettext(
                 'Local branch is out of date with master branch.\n'
@@ -285,25 +295,25 @@
             }
         self.not_uptodate_info = InfoWidget(branch_groupbox)
         not_uptodate_layout = QtGui.QHBoxLayout(self.not_uptodate_info)
-        
+
         # XXX this is to big. Resize
         not_uptodate_icon = QtGui.QLabel()
         not_uptodate_icon.setPixmap(self.style().standardPixmap(
             QtGui.QStyle.SP_MessageBoxWarning))
         not_uptodate_layout.addWidget(not_uptodate_icon)
-        
+
         self.not_uptodate_label = QtGui.QLabel('error message goes here')
         not_uptodate_layout.addWidget(self.not_uptodate_label, 2)
-        
+
         update_button = QtGui.QPushButton(gettext('Update'))
         self.connect(update_button, QtCore.SIGNAL("clicked(bool)"),
                      self.open_update_win)
 
         not_uptodate_layout.addWidget(update_button)
-        
+
         self.not_uptodate_info.hide()
         branch_layout.addWidget(self.not_uptodate_info, 3, 0, 1, 2)
-        
+
         splitter = QtGui.QSplitter(QtCore.Qt.Vertical, self)
 
         message_groupbox = QtGui.QGroupBox(gettext("Message"), splitter)
@@ -323,24 +333,24 @@
         else:
             self.show_nonversioned_checkbox.setChecked(QtCore.Qt.Unchecked)
 
-        self.filelist = TreeWidget(self)
-        self.filelist.throbber = self.throbber
+        self.filelist_widget = TreeWidget(self)
+        self.filelist_widget.throbber = self.throbber
         if show_nonversioned:
-            self.filelist.tree_model.set_select_all_kind('all')
+            self.filelist_widget.tree_model.set_select_all_kind('all')
         else:
-            self.filelist.tree_model.set_select_all_kind('versioned')
-        
+            self.filelist_widget.tree_model.set_select_all_kind('versioned')
+
         self.file_words = {}
-        self.connect(self.filelist.tree_model,
+        self.connect(self.filelist_widget.tree_model,
                      QtCore.SIGNAL("dataChanged(QModelIndex, QModelIndex)"),
                      self.on_filelist_data_changed)
-        
-        self.selectall_checkbox = SelectAllCheckBox(self.filelist, self)
+
+        self.selectall_checkbox = SelectAllCheckBox(self.filelist_widget, self)
         self.selectall_checkbox.setCheckState(QtCore.Qt.Checked)
 
         language = get_global_config().get_user_option('spellcheck_language') or 'en'
         spell_checker = SpellChecker(language)
-        
+
         # Equivalent for 'bzr commit --message'
         self.message = TextEdit(spell_checker, message_groupbox, main_window=self)
         self.message.setToolTip(gettext("Enter the commit message"))
@@ -393,10 +403,10 @@
         self.tabWidget.addTab(files_tab, gettext("Changes"))
 
         vbox = QtGui.QVBoxLayout(files_tab)
-        vbox.addWidget(self.filelist)
+        vbox.addWidget(self.filelist_widget)
         self.connect(self.show_nonversioned_checkbox, QtCore.SIGNAL("toggled(bool)"), self.show_nonversioned)
         vbox.addWidget(self.show_nonversioned_checkbox)
-    
+
         vbox.addWidget(self.selectall_checkbox)
 
         # Display a list of pending merges
@@ -405,11 +415,11 @@
             self.selectall_checkbox.setEnabled(False)
             self.pending_merges_list = PendingMergesList(
                 self.processEvents, self.throbber, self)
-            
+
             self.tabWidget.addTab(self.pending_merges_list,
                                   gettext("Pending Merges"))
             self.tabWidget.setCurrentWidget(self.pending_merges_list)
-            
+
             # Pending-merge widget gets disabled as we are executing.
             QtCore.QObject.connect(self,
                                    QtCore.SIGNAL("disableUi(bool)"),
@@ -460,7 +470,7 @@
 
         # Try to be smart: if there is no saved message
         # then set focus on Edit Area; otherwise on OK button.
-        if unicode(self.message.toPlainText()).strip():
+        if str(self.message.toPlainText()).strip():
             self.buttonbox.setFocus()
         else:
             self.message.setFocus()
@@ -490,15 +500,15 @@
                     # loading the file list.
                     self.pending_merges_list._load_visible_revisions()
                     self.processEvents()
-                
-                self.filelist.tree_model.checkable = not self.pending_merges_list
+
+                self.filelist_widget.tree_model.checkable = not self.pending_merges_list
                 self.is_loading = True
                 # XXX Would be nice if we could only load the files when the
                 # user clicks on the changes tab, but that would mean that
                 # we can't load the words list.
                 if not refresh:
-                    fmodel = self.filelist.tree_filter_model
-                    
+                    fmodel = self.filelist_widget.tree_filter_model
+
                     want_unversioned = self.show_nonversioned_checkbox.isChecked()
                     fmodel.setFilter(fmodel.UNVERSIONED, want_unversioned)
                     if not want_unversioned and self.initial_selected_list:
@@ -508,8 +518,8 @@
                             if not self.tree.path2id(path):
                                 want_unversioned = True
                                 break
-                    
-                    self.filelist.set_tree(
+
+                    self.filelist_widget.set_tree(
                         self.tree,
                         branch=self.tree.branch,
                         changes_mode=True,
@@ -517,7 +527,7 @@
                         initial_checked_paths=self.initial_selected_list,
                         change_load_filter=lambda c:not c.is_ignored())
                 else:
-                    self.filelist.refresh()
+                    self.filelist_widget.refresh()
                 self.is_loading = False
                 self.processEvents()
                 self.update_compleater_words()
@@ -526,28 +536,28 @@
         finally:
             self.throbber.hide()
             self.refresh_button.setDisabled(False)
-    
+
     def refresh(self):
         self.load(True)
 
     def on_filelist_data_changed(self, start_index, end_index):
         self.update_compleater_words()
-    
+
     def update_compleater_words(self):
         if self.is_loading:
             return
-        
+
         num_files_loaded = 0
-        
+
         words = set()
-        for ref in self.filelist.tree_model.iter_checked():
+        for ref in self.filelist_widget.tree_model.iter_checked():
             path = ref.path
             if path not in self.file_words:
                 file_words = set()
                 if num_files_loaded < MAX_AUTOCOMPLETE_FILES:
                     file_words.add(path)
                     file_words.add(os.path.split(path)[-1])
-                    change = self.filelist.tree_model.inventory_data_by_path[
+                    change = self.filelist_widget.tree_model.inventory_data_by_path[
                                                                ref.path].change
                     if change and change.is_renamed():
                         file_words.add(change.oldpath())
@@ -571,7 +581,7 @@
         words = list(words)
         words.sort(key=lambda x: x.lower())
         self.completer_model.setStringList(words)
-    
+
     def enableBugs(self, state):
         if state == QtCore.Qt.Checked:
             self.bugs.setEnabled(True)
@@ -608,12 +618,12 @@
             return
         # collect data
         ci_data = QBzrCommitData(tree=self.tree)
-        message = unicode(self.message.toPlainText()).strip()
+        message = str(self.message.toPlainText()).strip()
         if message:
             ci_data['message'] = message
         bug_str = ''
         if self.bugsCheckBox.isChecked():
-            bug_str = unicode(self.bugs.text()).strip()
+            bug_str = str(self.bugs.text()).strip()
         if bug_str:
             ci_data['bugs'] = bug_str
         # save only if data different
@@ -630,7 +640,7 @@
         self.ci_data.wipe()
 
     def _get_message(self):
-        return unicode(self.message.toPlainText()).strip()
+        return str(self.message.toPlainText()).strip()
 
     def _get_selected_files(self):
         """Return (has_files_to_commit[bool], files_to_commit[list], files_to_add[list])"""
@@ -639,7 +649,7 @@
 
         files_to_commit = []
         files_to_add = []
-        for ref in self.filelist.tree_model.iter_checked():
+        for ref in self.filelist_widget.tree_model.iter_checked():
             if ref.file_id is None:
                 files_to_add.append(ref.path)
             files_to_commit.append(ref.path)
@@ -679,15 +689,15 @@
             args.extend(files_to_commit)
 
         if self.bugsCheckBox.isChecked():
-            for s in unicode(self.bugs.text()).split():
+            for s in str(self.bugs.text()).split():
                 args.append(("--fixes=%s" % s))
-        
+
         if self.authorCheckBox.isChecked():
-            args.append(("--author=%s" % unicode(self.author.text())))
-        
+            args.append(("--author=%s" % str(self.author.text())))
+
         if self.is_bound and self.local_checkbox.isChecked():
             args.append("--local")
-        
+
         dir = self.tree.basedir
         commands = []
         if files_to_add:
@@ -699,19 +709,19 @@
 
     def show_nonversioned(self, state):
         """Show/hide non-versioned files."""
-        if state and not self.filelist.want_unversioned:
-            state = self.filelist.get_state()
-            self.filelist.set_tree(
+        if state and not self.filelist_widget.want_unversioned:
+            state = self.filelist_widget.get_state()
+            self.filelist_widget.set_tree(
                 self.tree, changes_mode=True, want_unversioned=True,
                 change_load_filter=lambda c:not c.is_ignored())
-            self.filelist.restore_state(state)
-        
+            self.filelist_widget.restore_state(state)
+
         if state:
-            self.filelist.tree_model.set_select_all_kind('all')
+            self.filelist_widget.tree_model.set_select_all_kind('all')
         else:
-            self.filelist.tree_model.set_select_all_kind('versioned')
-        
-        fmodel = self.filelist.tree_filter_model
+            self.filelist_widget.tree_model.set_select_all_kind('versioned')
+
+        fmodel = self.filelist_widget.tree_filter_model
         fmodel.setFilter(fmodel.UNVERSIONED, state)
 
     def _save_or_wipe_commit_data(self):
@@ -756,47 +766,43 @@
         @param  dialog_action:  purpose of parent window (main action)
         """
         # XXX make this function universal for both qcommit and qrevert (?)
-        if self.filelist.tree_model.checkable:
+        if self.filelist_widget.tree_model.checkable:
             checked = []        # checked versioned
             unversioned = []    # checked unversioned (supposed to be added)
-            for ref in self.filelist.tree_model.iter_checked():
+            for ref in self.filelist_widget.tree_model.iter_checked():
                 if ref.file_id:
                     checked.append(ref.path)
                 else:
                     unversioned.append(ref.path)
-    
+
             if checked:
                 arg_provider = InternalWTDiffArgProvider(
                     self.tree.basis_tree().get_revision_id(), self.tree,
                     self.tree.branch, self.tree.branch,
                     specific_files=checked)
-                
-                show_diff(arg_provider, ext_diff=ext_diff, parent_window=self,
-                          context=self.filelist.diff_context)
+
+                show_diff(arg_provider, ext_diff=ext_diff, parent_window=self, context=self.filelist_widget.diff_context)
             else:
                 msg = "No changes selected to " + dialog_action
-                QtGui.QMessageBox.warning(self,
-                    "QBzr - " + gettext("Diff"),
-                    gettext(msg),
-                    QtGui.QMessageBox.Ok)
-    
+                QtGui.QMessageBox.warning(self, "QBrz - " + gettext("Diff"), gettext(msg), QtGui.QMessageBox.Ok)
+
             if unversioned:
                 # XXX show infobox with message that not all files shown in diff
                 pass
         else:
             arg_provider = InternalWTDiffArgProvider(
                 self.tree.basis_tree().get_revision_id(), self.tree,
-                self.tree.branch, self.tree.branch)            
+                self.tree.branch, self.tree.branch)
             show_diff(arg_provider, ext_diff=ext_diff, parent_window=self,
-                      context=self.filelist.diff_context)
-    
+                      context=self.filelist_widget.diff_context)
+
     def on_failed(self, error):
         SubProcessDialog.on_failed(self, error)
         error = str(error)
         if error in self.not_uptodate_errors:
             self.not_uptodate_label.setText(self.not_uptodate_errors[error])
             self.not_uptodate_info.show()
-    
+
     def open_update_win(self, b):
         update_window = QBzrUpdateWindow(self.tree)
         self.windows.append(update_window)
@@ -804,4 +810,4 @@
         QtCore.QObject.connect(update_window,
                                QtCore.SIGNAL("subprocessFinished(bool)"),
                                self.not_uptodate_info,
-                               QtCore.SLOT("setHidden(bool)"))        
+                               QtCore.SLOT("setHidden(bool)"))

=== modified file 'lib/commit_data.py'
--- lib/commit_data.py	2017-09-11 06:53:22 +0000
+++ lib/commit_data.py	2020-07-16 14:28:25 +0000
@@ -64,12 +64,12 @@
         string or None).
         """
         d = {}
-        for k,v in self._data.iteritems():
+        for k,v in self._data.items():
             if v not in (None, ''):
                 d[k] = v
         return d
 
-    def __nonzero__(self):
+    def __bool__(self):
         """Check if there is some data actually.
         @return: True if data dictionary is not empty.
         """
@@ -92,7 +92,7 @@
 
     def keys(self):
         """Return keys of internal dict."""
-        return self._data.keys()
+        return list(self._data.keys())
 
     def as_dict(self):
         return self._data.copy()
@@ -104,7 +104,7 @@
         """
         if data:
             self._data.update(data)
-        for key, value in kw.iteritems():
+        for key, value in kw.items():
             self._data[key] = value
 
     def set_data_on_uncommit(self, old_revid, new_revid):
@@ -137,7 +137,7 @@
             instance.
         """
         try:
-            for k,v in self._data.iteritems():
+            for k,v in self._data.items():
                 if v != other[k]:
                     return False
         except KeyError:

=== modified file 'lib/conditional_dataview.py'
--- lib/conditional_dataview.py	2009-08-18 14:27:46 +0000
+++ lib/conditional_dataview.py	2020-07-16 14:28:25 +0000
@@ -16,7 +16,7 @@
 
 
 from PyQt4 import QtGui
-from PyQt4.QtCore import Qt, QVariant
+from PyQt4.QtCore import Qt
 
 
 class QBzrConditionalDataView(QtGui.QFrame):
@@ -113,11 +113,11 @@
                 icon = decoration_provider(row, record)
                 if icon:
                     index = model.index(row, 0)
-                    model.setData(index, QVariant(icon), Qt.DecorationRole)
+                    model.setData(index, icon, Qt.DecorationRole)
             for col, value in enumerate(record):
                 #print "putting %s into %d,%d" % (value, row, col)
                 index = model.index(row, col)
-                model.setData(index, QVariant(value or ''), cell_role)
+                model.setData(index, value or '', cell_role)
 
         # Update the view & label
         self._view.setVisible(row_count > 0)

=== modified file 'lib/config.py'
--- lib/config.py	2017-09-11 06:53:22 +0000
+++ lib/config.py	2020-07-16 14:28:25 +0000
@@ -20,10 +20,8 @@
 import re
 import os.path
 from PyQt4 import QtCore, QtGui
-from breezy.config import (
-    ensure_config_dir_exists,
-    extract_email_address,
-    )
+from breezy.config import extract_email_address
+from breezy.bedding import ensure_config_dir_exists
 from breezy import cmdline, errors, trace
 
 from breezy.plugins.qbrz.lib import ui_merge_config
@@ -59,18 +57,17 @@
 # XXX use special function from bugs.py instead
 _bug_tracker_re = re.compile('bugtracker_(.+?)_url')
 
+
 class QRadioCheckItemDelegate(QtGui.QItemDelegate):
-    
-    def drawCheck (self, painter, option, rect, state):
+
+    def drawCheck(self, painter, option, rect, state):
         style = self.parent().style()
         radioOption = QtGui.QStyleOptionButton()
         radioOption.rect = option.rect
         radioOption.state = option.state
         if state:
             radioOption.state = radioOption.state | QtGui.QStyle.State_On
-        style.drawControl(QtGui.QStyle.CE_RadioButton,
-                          radioOption,
-                          painter)
+        style.drawControl(QtGui.QStyle.CE_RadioButton, radioOption, painter)
 
 
 class QBzrConfigWindow(QBzrDialog):
@@ -112,7 +109,7 @@
 
         self.emailClientCombo = QtGui.QComboBox()
         for name, label in _mail_clients:
-            self.emailClientCombo.addItem(gettext(label), QtCore.QVariant(name))
+            self.emailClientCombo.addItem(gettext(label), name)
         label = QtGui.QLabel(gettext("E-mail &client:"))
         label.setBuddy(self.emailClientCombo)
         generalGrid.addWidget(label, 3, 0)
@@ -173,11 +170,11 @@
         bugTrackersVBox = QtGui.QVBoxLayout(bugTrackersWidget)
         bugTrackersVBox.addWidget(self.bugTrackersList)
         bugTrackersVBox.addLayout(bugTrackersHBox)
-        
+
         diffWidget = QtGui.QWidget()
 
         self.diffShowIntergroupColors = QtGui.QCheckBox(gettext("Show inter-group inserts and deletes in green and red"), diffWidget)
-        
+
         label = QtGui.QLabel(gettext("External Diff Apps:"))
         self.extDiffList = QtGui.QTreeWidget(diffWidget)
         self.extDiffList.setRootIsDecorated(False)
@@ -186,7 +183,7 @@
         self.extDiffList.setItemDelegateForColumn(0,
             QRadioCheckItemDelegate(self.extDiffList))
         self.connect(self.extDiffList, QtCore.SIGNAL("itemChanged (QTreeWidgetItem *,int)"),
-                     self.extDiffListItemChanged)        
+                     self.extDiffListItemChanged)
 
         addExtDiffButton = QtGui.QPushButton(gettext("Add"), diffWidget)
         self.connect(addExtDiffButton, QtCore.SIGNAL("clicked()"),
@@ -205,7 +202,7 @@
         diffLayout.addWidget(label)
         diffLayout.addWidget(self.extDiffList)
         diffLayout.addLayout(extDiffButtonsLayout)
-        
+
         if mergetools is not None:
             mergeWidget = QtGui.QWidget()
             self.merge_ui = ui_merge_config.Ui_MergeConfig()
@@ -213,18 +210,18 @@
             self.merge_ui.tools.sortByColumn(0, QtCore.Qt.AscendingOrder)
             self.merge_ui.remove.setEnabled(False)
             self.merge_ui.set_default.setEnabled(False)
-            
+
             self.merge_tools_model = MergeToolsTableModel()
             self.merge_ui.tools.setModel(self.merge_tools_model)
-            
+
             self.connect(self.merge_tools_model,
                          QtCore.SIGNAL("dataChanged(QModelIndex,QModelIndex)"),
                          self.merge_tools_data_changed)
-    
+
             self.connect(self.merge_ui.tools.selectionModel(),
                          QtCore.SIGNAL("selectionChanged(QItemSelection,QItemSelection)"),
                          self.merge_tools_selectionChanged)
-            
+
             self.connect(self.merge_ui.add,
                          QtCore.SIGNAL("clicked()"),
                          self.merge_tools_add_clicked)
@@ -237,7 +234,7 @@
         else:
             mergeWidget = QtGui.QLabel(gettext("Bazaar 2.4 or newer is required to configure mergetools."))
             mergeWidget.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
-        
+
         self.tabwidget.addTab(generalWidget, gettext("General"))
         self.tabwidget.addTab(aliasesWidget, gettext("Aliases"))
         self.tabwidget.addTab(bugTrackersWidget, gettext("Bug Trackers"))
@@ -265,7 +262,7 @@
         self.spellcheck_language_combo = QtGui.QComboBox()
         languages = sorted(SpellChecker.list_languages())
         for name in languages:
-            self.spellcheck_language_combo.addItem(gettext(name), QtCore.QVariant(name))
+            self.spellcheck_language_combo.addItem(gettext(name), name)
         if not languages:
             self.spellcheck_language_combo.setEnabled(False)
         label = QtGui.QLabel(gettext("Spell check &language:"))
@@ -287,7 +284,7 @@
         label.setBuddy(self.branchsourceBasedirEdit)
         grid.addWidget(label, 1, 0)
         grid.addLayout(branchsourceBasedirHBox, 1, 1)
-        
+
         self.checkoutBasedirEdit = QtGui.QLineEdit()
         self.checkoutBasedirEdit.setToolTip(gettext("This directory will be automatically filled in your checkout destination input field"))
         btnCheckoutBasedirBrowse = QtGui.QPushButton(gettext('Browse...'))
@@ -308,7 +305,7 @@
         """Load the configuration."""
         config = get_global_config()
         parser = config._get_parser()
-        
+
         qconfig = get_qbrz_config()
 
         # Name & e-mail
@@ -322,10 +319,10 @@
                     email = ''
             except errors.NoWhoami:
                 name, email = get_user_id_from_os()
-        except Exception, e:
+        except Exception as e:
             trace.mutter("qconfig: load name/email error: %s", str(e))
             name, email = '', ''
-        
+
         self.nameEdit.setText(name)
         self.emailEdit.setText(email)
 
@@ -337,8 +334,7 @@
         # E-mail client
         mailClient = config.get_user_option('mail_client')
         if mailClient:
-            index = self.emailClientCombo.findData(
-                QtCore.QVariant(mailClient))
+            index = self.emailClientCombo.findData(mailClient)
             if index >= 0:
                 self.emailClientCombo.setCurrentIndex(index)
 
@@ -348,8 +344,7 @@
         # Spellcheck language
         spellcheck_language = config.get_user_option('spellcheck_language') or 'en'
         if spellcheck_language:
-            index = self.spellcheck_language_combo.findData(
-                QtCore.QVariant(spellcheck_language))
+            index = self.spellcheck_language_combo.findData(spellcheck_language)
             if index >= 0:
                 self.spellcheck_language_combo.setCurrentIndex(index)
 
@@ -365,7 +360,7 @@
 
         # Aliases
         aliases = parser.get('ALIASES', {})
-        for alias, command in aliases.items():
+        for alias, command in list(aliases.items()):
             item = QtGui.QTreeWidgetItem(self.aliasesList)
             item.setFlags(QtCore.Qt.ItemIsSelectable |
                           QtCore.Qt.ItemIsEditable |
@@ -375,7 +370,7 @@
 
         # Bug trackers
         # XXX use special function from bugs.py
-        for name, value in parser.get('DEFAULT', {}).items():
+        for name, value in list(parser.get('DEFAULT', {}).items()):
             m = _bug_tracker_re.match(name)
             if not m:
                 continue
@@ -386,7 +381,7 @@
                           QtCore.Qt.ItemIsEnabled)
             item.setText(0, abbreviation)
             item.setText(1, value)
-        
+
         # Diff
         self.diffShowIntergroupColors.setChecked(qconfig.get_option("diff_show_intergroup_colors") in ("True", "1"))
         defaultDiff = qconfig.get_option("default_diff")
@@ -404,31 +399,32 @@
                 item.setCheckState(0, QtCore.Qt.Checked)
             else:
                 item.setCheckState(0, QtCore.Qt.Unchecked)
-            
+
             item.setText(0, name)
             item.setText(1, command)
             return item
-            
+
         builtin = create_ext_diff_item(gettext("Builtin Diff"),"")
         builtin.setFlags(QtCore.Qt.ItemIsSelectable |
                       QtCore.Qt.ItemIsEnabled |
-                      QtCore.Qt.ItemIsUserCheckable)        
-        
+                      QtCore.Qt.ItemIsUserCheckable)
+
         extDiffs = qconfig.get_section('EXTDIFF')
-        for name, command in extDiffs.items():
+        for name, command in list(extDiffs.items()):
             create_ext_diff_item(name, command)
         self.extDiffListIgnore = False
 
         # Merge
         if mergetools is not None:
             user_merge_tools = config.get_merge_tools()
+            # RJLRJL: check this - might need to be 'brz.default_mergetool'
             default_merge_tool = config.get_user_option('bzr.default_mergetool')
             if len(user_merge_tools) == 0:
                 self.import_external_merge(user_merge_tools, config, qconfig)
             self.merge_tools_model.set_merge_tools(user_merge_tools,
                 mergetools.known_merge_tools, default_merge_tool)
             self.merge_tools_model.sort(0, QtCore.Qt.AscendingOrder)
-    
+
     def import_external_merge(self, user_merge_tools, config, qconfig):
         # don't ask to import if we already asked before
         if qconfig.get_option_as_bool('imported_external_merge'):
@@ -453,7 +449,7 @@
             user_merge_tools[name] = new_cmdline
         # set a flag to indicate that we've already asked about this
         qconfig.set_option('imported_external_merge', True)
-    
+
     def convert_external_merge(self, external_merge):
         args = cmdline.split(external_merge)
         # %b %t %o -o %r
@@ -483,9 +479,9 @@
                     pass
 
         # Name & e-mail
-        _name = unicode(self.nameEdit.text()).strip()
-        _email = unicode(self.emailEdit.text()).strip()
-        username = u''
+        _name = str(self.nameEdit.text()).strip()
+        _email = str(self.emailEdit.text()).strip()
+        username = ''
         if _name:
             username = _name
         if _email:
@@ -493,12 +489,12 @@
         set_or_delete_option(parser, 'email', username)
 
         # Editor
-        editor = unicode(self.editorEdit.text())
+        editor = str(self.editorEdit.text())
         set_or_delete_option(parser, 'editor', editor)
 
         # E-mail client
         index = self.emailClientCombo.currentIndex()
-        mail_client = unicode(self.emailClientCombo.itemData(index).toString())
+        mail_client = self.emailClientCombo.itemData(index)
         set_or_delete_option(parser, 'mail_client', mail_client)
 
         tabWidth = self.tabWidthSpinner.value()
@@ -506,36 +502,36 @@
 
         # Spellcheck language
         index = self.spellcheck_language_combo.currentIndex()
-        spellcheck_language = unicode(self.spellcheck_language_combo.itemData(index).toString())
+        spellcheck_language = self.spellcheck_language_combo.itemData(index)
         set_or_delete_option(parser, 'spellcheck_language', spellcheck_language)
 
         # Branch source basedir
-        branchsource_basedir = unicode(self.branchsourceBasedirEdit.text())
+        branchsource_basedir = str(self.branchsourceBasedirEdit.text())
         qconfig.set_option('branchsource_basedir', branchsource_basedir)
 
         # Checkout basedir
-        checkout_basedir = unicode(self.checkoutBasedirEdit.text())
+        checkout_basedir = str(self.checkoutBasedirEdit.text())
         qconfig.set_option('checkout_basedir', checkout_basedir)
 
         # Aliases
         parser['ALIASES'] = {}
         for index in range(self.aliasesList.topLevelItemCount()):
             item = self.aliasesList.topLevelItem(index)
-            alias = unicode(item.text(0))
-            command = unicode(item.text(1))
+            alias = str(item.text(0))
+            command = str(item.text(1))
             if alias and command:
                 parser['ALIASES'][alias] = command
 
         # Bug trackers
-        for name, value in parser.get('DEFAULT', {}).items():
+        for name, value in list(parser.get('DEFAULT', {}).items()):
             m = _bug_tracker_re.match(name)
             if m:
                 abbrev = m.group(1)
                 del parser['DEFAULT']['bugtracker_%s_url' % abbrev]
         for index in range(self.bugTrackersList.topLevelItemCount()):
             item = self.bugTrackersList.topLevelItem(index)
-            abbrev = unicode(item.text(0))
-            url = unicode(item.text(1))
+            abbrev = str(item.text(0))
+            url = str(item.text(1))
             # FIXME add URL validation (must contain {id})
             if abbrev and url:
                 parser['DEFAULT']['bugtracker_%s_url' % abbrev] = url
@@ -543,13 +539,13 @@
         # Diff
         qconfig.set_option('diff_show_intergroup_colors',
                            self.diffShowIntergroupColors.isChecked())
-        
+
         defaultDiff = None
         ext_diffs = {}
         for index in range(1, self.extDiffList.topLevelItemCount()):
             item = self.extDiffList.topLevelItem(index)
-            name = unicode(item.text(0))
-            command = unicode(item.text(1))
+            name = str(item.text(0))
+            command = str(item.text(1))
             if item.checkState(0) == QtCore.Qt.Checked:
                 defaultDiff = command
             if name and command:
@@ -557,8 +553,8 @@
         qconfig.set_section('EXTDIFF', ext_diffs)
         qconfig.set_option('default_diff',
                            defaultDiff)
-        
-        
+
+
         if hasattr(config, 'file_name'):
             file_name = config.file_name
         else:
@@ -567,7 +563,7 @@
         f = open(file_name, 'wb')
         parser.write(f)
         f.close()
-        
+
         qconfig.save()
 
         # Merge
@@ -577,7 +573,7 @@
                 if config.get_user_option(option, expand=False) is not None:
                     config.remove_user_option(option)
             user_merge_tools = self.merge_tools_model.get_user_merge_tools()
-            for name, cmdline in user_merge_tools.iteritems():
+            for name, cmdline in user_merge_tools.items():
                 orig_cmdline = config.find_merge_tool(name)
                 if orig_cmdline is None or orig_cmdline != cmdline:
                     config.set_user_option('bzr.mergetool.%s' % name, cmdline)
@@ -600,8 +596,8 @@
         """Check the inputs and return False if there is something wrong
         and save should be prohibited."""
         # check whoami
-        _name = unicode(self.nameEdit.text()).strip()
-        _email = unicode(self.emailEdit.text()).strip()
+        _name = str(self.nameEdit.text()).strip()
+        _email = str(self.emailEdit.text()).strip()
         if (_name, _email) == ('', ''):
             if QtGui.QMessageBox.warning(self, "Configuration",
                 "Name and E-mail settings should not be empty",
@@ -656,7 +652,7 @@
             index = self.extDiffList.indexOfTopLevelItem(item)
             if index >= 1: # You can't remove the builtin diff
                 self.extDiffList.takeTopLevelItem(index)
-    
+
     def extDiffListItemChanged(self, changed_item, col):
         if col == 0 and not self.extDiffListIgnore:
             checked_count = 0
@@ -664,7 +660,7 @@
                 item = self.extDiffList.topLevelItem(index)
                 if item.checkState(0) == QtCore.Qt.Checked:
                     checked_count += 1
-            
+
             if checked_count == 0:
                 self.extDiffListIgnore = True
                 changed_item.setCheckState(0, QtCore.Qt.Checked)
@@ -677,24 +673,24 @@
                         item.setCheckState(0, QtCore.Qt.Unchecked)
                 changed_item.setCheckState(0, QtCore.Qt.Checked)
                 self.extDiffListIgnore = False
-    
+
     def get_selected_merge_tool(self):
         sel_model = self.merge_ui.tools.selectionModel()
         if len(sel_model.selectedRows()) == 0:
             return None
         row = sel_model.selectedRows()[0].row()
         return self.merge_tools_model.get_merge_tool_name(row)
-        
+
     def update_buttons(self):
         selected = self.get_selected_merge_tool()
         self.merge_ui.remove.setEnabled(selected is not None and
             self.merge_tools_model.is_user_merge_tool(selected))
         self.merge_ui.set_default.setEnabled(selected is not None and
             self.merge_tools_model.get_default() != selected)
-        
+
     def merge_tools_data_changed(self, top_left, bottom_right):
         self.update_buttons()
-        
+
     def merge_tools_selectionChanged(self, selected, deselected):
         self.update_buttons()
 
@@ -703,31 +699,31 @@
         sel_model = self.merge_ui.tools.selectionModel()
         sel_model.select(index, QtGui.QItemSelectionModel.ClearAndSelect)
         self.merge_ui.tools.edit(index)
-        
+
     def merge_tools_remove_clicked(self):
         sel_model = self.merge_ui.tools.selectionModel()
         assert len(sel_model.selectedRows()) > 0
         for index in sel_model.selectedRows():
             self.merge_tools_model.remove_merge_tool(index.row())
-    
+
     def merge_tools_set_default_clicked(self):
         sel_model = self.merge_ui.tools.selectionModel()
         self.merge_tools_model.set_default(self.get_selected_merge_tool())
-        
+
     def browseEditor(self):
         filename = QtGui.QFileDialog.getOpenFileName(self,
             gettext('Select editor executable'),
             '/')
         if filename:
             self.editorEdit.setText(filename)
-            
+
     def browseCheckoutBasedir(self):
         filename = QtGui.QFileDialog.getExistingDirectory(self,
             gettext('Select base directory for checkouts'),
             '/')
         if filename:
             self.checkoutBasedirEdit.setText(filename)
-            
+
     def browseBranchsourceBasedir(self):
         filename = QtGui.QFileDialog.getExistingDirectory(self,
             gettext('Select default directory for branch sources'),
@@ -747,10 +743,10 @@
     be very slow on machines where DNS is broken.  So now we simply
     use the hostname.
     """
-    
+
     # This use to live in breezy.config._auto_user_id, but got removed, so
     # we have a copy.
-    
+
     import sys
     if sys.platform == 'win32':
         from breezy import win32utils
@@ -758,7 +754,7 @@
         if name is None:
             raise errors.BzrError("Cannot autodetect user name.\n"
                                   "Please, set your name with command like:\n"
-                                  'bzr whoami "Your Name <[e-mail]>"')
+                                  'brz whoami "Your Name <[e-mail]>"')
         host = win32utils.get_host_name_unicode()
         if host is None:
             host = socket.gethostname()
@@ -770,8 +766,7 @@
         try:
             w = pwd.getpwuid(uid)
         except KeyError:
-            raise errors.BzrCommandError('Unable to determine your name.  '
-                'Please use "bzr whoami" to set it.')
+            raise errors.BzrCommandError('Unable to determine your name.  Please use "brz whoami" to set it.')
 
         # we try utf-8 first, because on many variants (like Linux),
         # /etc/passwd "should" be in utf-8, and because it's unlikely to give
@@ -785,13 +780,11 @@
                 encoding = osutils.get_user_encoding()
                 gecos = w.pw_gecos.decode(encoding)
             except UnicodeError:
-                raise errors.BzrCommandError('Unable to determine your name.  '
-                   'Use "bzr whoami" to set it.')
+                raise errors.BzrCommandError('Unable to determine your name. Use brz whoami" to set it.')
         try:
             username = w.pw_name.decode(encoding)
         except UnicodeError:
-            raise errors.BzrCommandError('Unable to determine your name.  '
-                'Use "bzr whoami" to set it.')
+            raise errors.BzrCommandError('Unable to determine your name. Use "brz whoami" to set it.')
 
         comma = gecos.find(',')
         if comma == -1:
@@ -807,8 +800,7 @@
             user_encoding = osutils.get_user_encoding()
             realname = username = getpass.getuser().decode(user_encoding)
         except UnicodeDecodeError:
-            raise errors.BzrError("Can't decode username as %s." % \
-                    user_encoding)
+            raise errors.BzrError("Can't decode username as %s." % user_encoding)
 
     import socket
     return realname, (username + '@' + socket.gethostname())
@@ -818,7 +810,7 @@
     COL_NAME = 0
     COL_COMMANDLINE = 1
     COL_COUNT = 2
-    
+
     def __init__(self):
         super(MergeToolsTableModel, self).__init__()
         self._order = []
@@ -826,21 +818,21 @@
         self._known = {}
         self._default = None
         self._removed = []
-        
+
     def get_user_merge_tools(self):
         return self._user
-    
+
     def set_merge_tools(self, user, known, default):
         self.beginResetModel()
         self._user = user
         self._known = known
-        self._order = user.keys() + known.keys()
+        self._order = list(user.keys()) + list(known.keys())
         self._default = default
         self.endResetModel()
 
     def get_default(self):
         return self._default
-        
+
     def set_default(self, new_default):
         old_row = None
         if self._default is not None:
@@ -859,20 +851,20 @@
             self.emit(QtCore.SIGNAL("dataChanged(QModelIndex,QModelIndex)"),
                       self.index(new_row, self.COL_NAME),
                       self.index(new_row, self.COL_NAME))
-    
+
     def get_removed_merge_tools(self):
         return self._removed
-    
+
     def get_merge_tool_name(self, row):
         return self._order[row]
-        
+
     def get_merge_tool_command_line(self, row):
         name = self._order[row]
         return self._user.get(name, self._known.get(name, None))
-        
+
     def is_user_merge_tool(self, name):
         return name in self._user
-        
+
     def new_merge_tool(self):
         index = self.createIndex(len(self._order), 0)
         self.beginInsertRows(QtCore.QModelIndex(), index.row(), index.row())
@@ -880,7 +872,7 @@
         self._user[''] = ''
         self.endInsertRows()
         return index
-        
+
     def remove_merge_tool(self, row):
         name = self._order[row]
         if name not in self._user:
@@ -892,26 +884,26 @@
         del self._order[row]
         del self._user[name]
         self.endRemoveRows()
-        
+
     def rowCount(self, parent):
         return len(self._order)
-        
+
     def columnCount(self, parent):
         return self.COL_COUNT
-    
+
     def data(self, index, role):
         name = self._order[index.row()]
         cmdline = self.get_merge_tool_command_line(index.row())
         if role == QtCore.Qt.DisplayRole:
             if index.column() == self.COL_NAME:
-                return QtCore.QVariant(name)
+                return name
             elif index.column() == self.COL_COMMANDLINE:
-                return QtCore.QVariant(cmdline)
+                return cmdline
         elif role == QtCore.Qt.EditRole:
             if index.column() == self.COL_NAME:
-                return QtCore.QVariant(name)
+                return name
             elif index.column() == self.COL_COMMANDLINE:
-                return QtCore.QVariant(cmdline)
+                return cmdline
         elif role == QtCore.Qt.CheckStateRole:
             if index.column() == self.COL_NAME:
                 return self._default == name and QtCore.Qt.Checked or QtCore.Qt.Unchecked
@@ -919,8 +911,8 @@
             if name in self._known:
                 palette = QtGui.QApplication.palette()
                 return palette.alternateBase()
-        return QtCore.QVariant()
-        
+        return None
+
     def setData(self, index, value, role):
         name = self._order[index.row()]
         if role == QtCore.Qt.EditRole:
@@ -932,7 +924,7 @@
                     self._removed.append(name)
                 del self._order[index.row()]
                 del self._user[name]
-                new_name = unicode(value.toString())
+                new_name = str(value)
                 self._order.insert(index.row(), new_name)
                 self._user[new_name] = cmdline
                 if self._default == name:
@@ -942,57 +934,60 @@
                 self.sort(self.COL_NAME, QtCore.Qt.AscendingOrder)
                 return True
             elif index.column() == self.COL_COMMANDLINE:
-                self._user[name] = unicode(value.toString())
+                self._user[name] = str(value)
                 self.emit(QtCore.SIGNAL("dataChanged(QModelIndex,QModelIndex)"),
                           index, index)
                 return True
         elif role == QtCore.Qt.CheckStateRole:
             if index.column() == self.COL_NAME:
-                if value.toInt() == (QtCore.Qt.Checked, True):
+                if int(value) == (QtCore.Qt.Checked, True):
                     self.set_default(name)
-                elif (value.toInt() == (QtCore.Qt.Unchecked, True) and
-                      self._default == name):
+                elif (int(value) == (QtCore.Qt.Unchecked, True) and self._default == name):
                     self.set_default(None)
+
+                # if value.toInt() == (QtCore.Qt.Checked, True):
+                #     self.set_default(name)
+                # elif (value.toInt() == (QtCore.Qt.Unchecked, True) and self._default == name):
+                #     self.set_default(None)
         return False
-        
+
     def flags(self, index):
-        f = super(MergeToolsTableModel, self).flags(index)
+        f = super().flags(index)
         name = self._order[index.row()]
         if name not in self._known:
             f = f | QtCore.Qt.ItemIsEditable
         if index.column() == self.COL_NAME:
             f = f | QtCore.Qt.ItemIsUserCheckable
         return f
-    
+
     def headerData(self, section, orientation, role):
         if orientation == QtCore.Qt.Horizontal:
             if section == self.COL_NAME:
                 if role == QtCore.Qt.DisplayRole:
-                    return QtCore.QVariant(gettext("Name"))
+                    return gettext("Name")
             elif section == self.COL_COMMANDLINE:
                 if role == QtCore.Qt.DisplayRole:
-                    return QtCore.QVariant(gettext("Command Line"))
-        return QtCore.QVariant()
+                    return gettext("Command Line")
+        return None
 
     def sort(self, column, sortOrder):
         self.emit(QtCore.SIGNAL("layoutAboutToBeChanged()"))
-        index_map = self._order[:] # copy
+        index_map = self._order[:]  # copy
+
         def tool_cmp(a, b):
             if column == self.COL_NAME:
                 return cmp(a, b)
             elif column == self.COL_COMMANDLINE:
-                return cmp(self.get_merge_tool_command_line(a),
-                           self.get_merge_tool_command_line(b))
+                return cmp(self.get_merge_tool_command_line(a), self.get_merge_tool_command_line(b))
             return 0
-        self._order.sort(cmp=tool_cmp,
-                         reverse=sortOrder==QtCore.Qt.DescendingOrder)
+
+        # self._order.sort(cmp=tool_cmp, reverse=sortOrder==QtCore.Qt.DescendingOrder)
         for i in range(0, len(index_map)):
             index_map[i] = self._order.index(index_map[i])
         from_list = []
         to_list = []
         for col in range(0, self.columnCount(None)):
             from_list.extend([self.index(i, col) for i in index_map])
-            to_list.extend([self.index(i, col)
-                            for i in range(0, len(index_map))])
+            to_list.extend([self.index(i, col) for i in range(0, len(index_map))])
         self.changePersistentIndexList(from_list, to_list)
         self.emit(QtCore.SIGNAL("layoutChanged()"))

=== modified file 'lib/conflicts.py'
--- lib/conflicts.py	2017-09-11 06:53:22 +0000
+++ lib/conflicts.py	2020-07-16 14:28:25 +0000
@@ -88,9 +88,9 @@
         self.connect(self.merge_tools_combo,
                      QtCore.SIGNAL("currentIndexChanged(int)"),
                      self.update_merge_tool_ui)
-        
+
         self.merge_tool_error = QtGui.QLabel('', self)
-        
+
         self.program_launch_button = QtGui.QPushButton(gettext("&Launch..."), self)
         self.program_launch_button.setEnabled(False)
         self.connect(
@@ -121,15 +121,15 @@
         hbox.addWidget(autobutton)
         hbox.addWidget(buttonbox)
         vbox.addLayout(hbox)
-        self.initialize_ui()        
+        self.initialize_ui()
 
     def initialize_ui(self):
         config = GlobalConfig()
         if mergetools is not None:
             # get user-defined merge tools
-            defined_tools = config.get_merge_tools().keys()
+            defined_tools = list(config.get_merge_tools().keys())
             # get predefined merge tools
-            defined_tools += mergetools.known_merge_tools.keys()
+            defined_tools += list(mergetools.known_merge_tools.keys())
             # sort them nicely
             defined_tools.sort()
             for merge_tool in defined_tools:
@@ -174,8 +174,8 @@
             item = QtGui.QTreeWidgetItem()
             item.setText(0, conflict.path)
             item.setText(1, gettext(conflict.typestring))
-            item.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(conflict.file_id or ''))  # file_id is None for non-versioned items, so we force it to be empty string to avoid Qt error
-            item.setData(1, QtCore.Qt.UserRole, QtCore.QVariant(conflict.typestring))
+            item.setData(0, QtCore.Qt.UserRole, conflict.file_id or '')  # file_id is None for non-versioned items, so we force it to be empty string to avoid Qt error
+            item.setData(1, QtCore.Qt.UserRole, conflict.typestring)
             items.append(item)
 
         if len(items) == 0 and self.conflicts_list.topLevelItemCount() > 0:
@@ -213,8 +213,8 @@
         if not enabled:
             return
         config = GlobalConfig()
-        cmdline = config.find_merge_tool(unicode(self.merge_tools_combo.currentText()))
-        file_id = str(items[0].data(0, QtCore.Qt.UserRole).toString())
+        cmdline = config.find_merge_tool(str(self.merge_tools_combo.currentText()))
+        file_id = items[0].data(0, QtCore.Qt.UserRole)
         if not file_id:
             # bug https://bugs.launchpad.net/qbrz/+bug/655451
             return
@@ -251,9 +251,9 @@
             # XXX why we need to use file_id -> path conversion if we already have filename???
             # this conversion fails in the case when user removed file or directory
             # which marked as conflicted (e.g. in missing parent conflict case).
-            #~file_id = str(item.data(0, QtCore.Qt.UserRole).toString())
-            #~file_names.append(self.wt.id2path(file_id))
-            file_names.append(unicode(item.text(0)))
+            # ~file_id = str(item.data(0, QtCore.Qt.UserRole).toString())
+            # ~file_names.append(self.wt.id2path(file_id))
+            file_names.append(str(item.text(0)))
         resolve(self.wt, file_names, action=action)
         self.refresh()
 
@@ -266,10 +266,10 @@
         items = self.conflicts_list.selectedItems()
         error_msg = ""
         enabled = True
-        if len(items) != 1 or items[0].data(1, QtCore.Qt.UserRole).toString() != "text conflict":
+        if len(items) != 1 or items[0].data(1, QtCore.Qt.UserRole) != "text conflict":
             enabled = False
         config = GlobalConfig()
-        tool = unicode(self.merge_tools_combo.currentText())
+        tool = str(self.merge_tools_combo.currentText())
         cmdline = config.find_merge_tool(tool)
         if cmdline is None:
             error_msg = gettext("Set up external_merge app in qconfig under the Merge tab")

=== modified file 'lib/decorators.py'
--- lib/decorators.py	2017-09-11 06:53:22 +0000
+++ lib/decorators.py	2020-07-16 14:28:25 +0000
@@ -29,12 +29,12 @@
     def _run(*args, **kwargs):
         from breezy.trace import mutter
         a = ','.join(repr(i) for i in args)
-        b = ','.join('%s=%r' % (i,j) for (i,j) in kwargs.iteritems())
+        b = ','.join('%s=%r' % (i,j) for (i,j) in kwargs.items())
         if a and b:
             a = a + ',' + b
         else:
             a = a or b
-        func_name = unbound.func_name
+        func_name = unbound.__name__
         mutter('Called %s(%s)' % (func_name, a))
         result = unbound(*args, **kwargs)
         mutter('%s returned %r' % (func_name, result))

=== modified file 'lib/diff.py'
--- lib/diff.py	2018-01-31 22:46:16 +0000
+++ lib/diff.py	2020-07-16 14:28:25 +0000
@@ -24,9 +24,9 @@
 from breezy.plugins.qbrz.lib.diff_arg import *   # import DiffArgProvider classes
 from breezy.plugins.qbrz.lib.i18n import gettext
 from breezy.plugins.qbrz.lib.subprocess import SimpleSubProcessDialog
-from breezy.plugins.qbrz.lib.util import ( 
+from breezy.plugins.qbrz.lib.util import (
     get_qbrz_config,
-    is_binary_content,
+    content_seems_to_be_binary,
     )
 
 from breezy.lazy_import import lazy_import
@@ -37,7 +37,7 @@
 import sys
 import os
 import glob
-from breezy.patiencediff import PatienceSequenceMatcher as SequenceMatcher
+from patiencediff import PatienceSequenceMatcher as SequenceMatcher
 from breezy.plugins.qbrz.lib.i18n import gettext, ngettext, N_
 from breezy import trace, osutils, cmdline
 from breezy.workingtree import WorkingTree
@@ -51,21 +51,21 @@
 if default_diff is None:
     default_diff = ""
 ext_diffs = {gettext("Builtin Diff"):""}
-for name, command in qconfig.get_section('EXTDIFF').items():
+for name, command in list(qconfig.get_section('EXTDIFF').items()):
     ext_diffs[name] = command
 
 
 def show_diff(arg_provider, ext_diff=None, parent_window=None, context=None):
-    
+
     if ext_diff is None:
         ext_diff = default_diff
-    
+
     if ext_diff == "":
-        
+
         # We can't import this globaly becuse it ties to import us,
         # which causes and Import Error.
         from breezy.plugins.qbrz.lib.diffwindow import DiffWindow
-        
+
         window = DiffWindow(arg_provider, parent=parent_window)
         window.show()
         if parent_window:
@@ -112,24 +112,24 @@
 
 
 class ExtDiffMenu(QtGui.QMenu):
-    
+
     def __init__ (self, parent=None, include_builtin=True, set_default=True):
         QtGui.QMenu.__init__(self, gettext("Show &differences"), parent)
-        
-        for name, command in ext_diffs.items():
+
+        for name, command in list(ext_diffs.items()):
             if command == "" and include_builtin or not command == "":
                 action = QtGui.QAction(name, self)
-                action.setData(QtCore.QVariant (command))
+                action.setData(command)
                 if command == default_diff and set_default:
                     self.setDefaultAction(action)
                 self.addAction(action)
-        
+
         self.connect(self, QtCore.SIGNAL("triggered(QAction *)"),
                      self.triggered)
-    
+
     def triggered(self, action):
-        ext_diff = unicode(action.data().toString())
-        self.emit(QtCore.SIGNAL("triggered(QString)"), QtCore.QString(ext_diff))
+        ext_diff = str(action.data())
+        self.emit(QtCore.SIGNAL("triggered(QString)"), ext_diff)
 
 
 class DiffButtons(QtGui.QWidget):
@@ -164,7 +164,7 @@
 
     def triggered(self, ext_diff=None):
         if ext_diff is None:
-            ext_diff = QtCore.QString(default_diff)
+            ext_diff = default_diff
         self.emit(QtCore.SIGNAL("triggered(QString)"), ext_diff)
 
 
@@ -180,21 +180,20 @@
 
     @classmethod
     def iter_items(cls, trees, specific_files=None, filter=None, lock_trees=False):
+        """
+        RJLRJL: updated to call .iter_changes directly
+        """
         try:
             cleanup = []
             if lock_trees:
                 for t in trees:
                     cleanup.append(t.lock_read().unlock)
 
-            changes = trees[1].iter_changes(trees[0],
-                            specific_files=specific_files,
-                            require_versioned=True)
-
-            def changes_key(change):
-                return change[1][1] or change[1][0]
-
-            for (file_id, paths, changed_content, versioned, parent, name, kind,
-                 executable) in sorted(changes, key=changes_key):
+            # changes = trees[1].iter_changes(trees[0], specific_files=specific_files, require_versioned=True)
+
+            # def changes_key(change):
+            #     return change[1][1] or change[1][0]
+            for change in trees[1].iter_changes(trees[0], specific_files=specific_files, require_versioned=True):
                 # file_id         -> ascii string
                 # paths           -> 2-tuple (old, new) fullpaths unicode/None
                 # changed_content -> bool
@@ -205,8 +204,8 @@
                 # executable      -> 2-tuple (bool/None, bool/None)
                 # NOTE: None value used for non-existing entry in corresponding
                 #       tree, e.g. for added/deleted file
-                di = DiffItem.create(trees, file_id, paths, changed_content,
-                        versioned, parent, name, kind, executable,
+                di = DiffItem.create(trees, change.file_id, change.path, change.changed_content,
+                        change.versioned, change.parent_id, change.name, change.kind, change.executable,
                         filter = filter)
                 if not di:
                     continue
@@ -216,7 +215,7 @@
                 cleanup.pop()()
 
     @classmethod
-    def create(cls, trees, file_id, paths, changed_content, versioned, 
+    def create(cls, trees, file_id, paths, changed_content, versioned,
             parent, name, kind, executable, filter = None):
 
         if parent == (None, None): # filter out TREE_ROOT (?)
@@ -237,8 +236,8 @@
         for ix in range(2):
             if versioned[ix]:
                 try:
-                    dates[ix] = trees[ix].get_file_mtime(paths[ix], file_id)
-                except OSError, e:
+                    dates[ix] = trees[ix].get_file_mtime(paths[ix])
+                except OSError as e:
                     if not renamed or e.errno != errno.ENOENT:
                         raise
                     # If we get ENOENT error then probably we trigger
@@ -248,7 +247,7 @@
                     # ghosts around us (see Bug #513096)
                     dates[ix] = 0  # using 1970/1/1 instead
 
-        properties_changed = [] 
+        properties_changed = []
         if bool(executable[0]) != bool(executable[1]):
             descr = {True: "+x", False: "-x", None: None}
             properties_changed.append((descr[executable[0]],
@@ -268,7 +267,7 @@
         if filter and not filter(status):
             return None
 
-        return cls(trees, file_id, paths, changed_content, versioned, kind, 
+        return cls(trees, file_id, paths, changed_content, versioned, kind,
                         properties_changed, dates, status)
 
     def __init__(self, trees, file_id, paths, changed_content, versioned, kind,
@@ -294,16 +293,17 @@
             self._load_lines()
 
     def _load_lines(self):
-        if ((self.versioned[0] != self.versioned[1] or self.changed_content)
-            and (self.kind[0] == 'file' or self.kind[1] == 'file')):
+        if ((self.versioned[0] != self.versioned[1] or self.changed_content) and (self.kind[0] == 'file' or self.kind[1] == 'file')):
             lines = []
             binary = False
+            # print('\n_load_lines', self.file_id)
             for ix, tree in enumerate(self.trees):
                 content = ()
                 if self.versioned[ix] and self.kind[ix] == 'file':
                     content = tree.get_file_lines(tree.id2path(self.file_id))
+                    # print('\n\tcontent loaded for ', tree.id2path(self.file_id), self.file_id)
                 lines.append(content)
-                binary = binary or is_binary_content(content)
+                binary = binary or content_seems_to_be_binary(content)
             self._lines = lines
             self._binary = binary
         else:
@@ -344,11 +344,13 @@
         return groups
 
     def difference_groups(self, lines, complete, ignore_whitespace):
+        # RJL Changed strings to bytes for pattern-matching and coerced
+        # left and right to lists (instead of generators) in 'if...'
         left, right = lines
         if ignore_whitespace:
-            re_whitespaces = re.compile("\s+")
-            left  = (re_whitespaces.sub(" ", line) for line in left)
-            right = (re_whitespaces.sub(" ", line) for line in right)
+            re_whitespaces = re.compile(b"\s+")
+            left  = list((re_whitespaces.sub(b" ", line) for line in left))
+            right = list((re_whitespaces.sub(b" ", line) for line in right))
         matcher = SequenceMatcher(None, left, right)
         if complete:
             groups = list([matcher.get_opcodes()])
@@ -358,9 +360,9 @@
         return groups
 
     def get_unicode_lines(self, encodings):
-        """Return pair of unicode lines for each side of diff.
-        Parameter encodings is 2-list or 2-tuple with encoding names (str)
-        for each side of diff.
+        """
+        Return pair of unicode lines for each side of diff.
+        Parameter encodings is 2-list or 2-tuple with encoding names (str) for each side of diff.
         """
         lines = self.lines
         ulines = self._ulines
@@ -372,7 +374,7 @@
                 else:
                     try:
                         ulines[i] = [l.decode(encodings[i]) for l in lines[i]]
-                    except UnicodeDecodeError, e:
+                    except UnicodeDecodeError as e:
                         filename = self.paths[i]
                         trace.note("Some characters in file %s "
                                    "could not be properly decoded "
@@ -396,7 +398,7 @@
         parent = osutils.joinpath([osutils.tempfile.gettempdir(), 'qbrz'])
         if not os.path.isdir(parent):
             os.mkdir(parent)
-        self._root = osutils.mkdtemp(prefix='qbrz/bzr-diff-')
+        self._root = osutils.mkdtemp(prefix='qbrz/brz-diff-')
         self.prefixes = {}
         self._set_prefix()
 
@@ -414,9 +416,10 @@
         self.new_prefix = self.get_prefix(self.new_tree)
 
     def get_prefix(self, tree):
+
         def get_key(tree):
             if hasattr(tree, "get_revision_id"):
-                return tree.__class__.__name__ + ":" + tree.get_revision_id()
+                return tree.__class__.__name__ + ":" + tree.get_revision_id().decode('utf-8')
             elif hasattr(tree, "abspath"):
                 return tree.__class__.__name__ + ":" + tree.abspath("")
             else:
@@ -425,7 +428,7 @@
         if tree is None:
             return None
         key = get_key(tree)
-        if self.prefixes.has_key(key):
+        if key in self.prefixes:
             return self.prefixes[key]
         prefix = str(len(self.prefixes) + 1)
         self.prefixes[key] = prefix
@@ -466,31 +469,30 @@
             if os.path.isdir(path):
                 open(os.path.join(path, ".delete"), "w").close()
 
-    def _write_file(self, relpath, tree, prefix, force_temp=False,
-                    allow_write=False, file_id=None):
+    def _write_file(self, relpath, tree, prefix, force_temp=False, allow_write=False, file_id=None):
         if force_temp or not isinstance(tree, WorkingTree):
             full_path = self._safe_filename(prefix, relpath)
             if os.path.isfile(full_path):
                 return full_path
-        return DiffFromTool._write_file(self, relpath, tree, prefix,
-                                        force_temp, allow_write, file_id)
+        # return DiffFromTool._write_file(self, relpath, tree, prefix, force_temp, allow_write, file_id)
+        return DiffFromTool._write_file(self, relpath, tree, prefix, force_temp, allow_write)
 
-    def _prepare_files(self, old_path, new_path, force_temp=False,
-                       file_id=None, allow_write_new=False):
-        old_disk_path = self._write_file(old_path, self.old_tree,
-                                         self.old_prefix, force_temp,
-                                         file_id=file_id)
-        new_disk_path = self._write_file(new_path, self.new_tree,
-                                         self.new_prefix, force_temp,
-                                         allow_write=allow_write_new,
-                                         file_id=file_id)
-        return old_disk_path, new_disk_path
+    # def _prepare_files(self, old_path, new_path, force_temp=False,
+    #                    file_id=None, allow_write_new=False):
+    #     old_disk_path = self._write_file(old_path, self.old_tree,
+    #                                      self.old_prefix, force_temp,
+    #                                      file_id=file_id)
+    #     new_disk_path = self._write_file(new_path, self.new_tree,
+    #                                      self.new_prefix, force_temp,
+    #                                      allow_write=allow_write_new,
+    #                                      file_id=file_id)
+    #     return old_disk_path, new_disk_path
 
     def _execute(self, old_path, new_path):
         command = self._get_command(old_path, new_path)
         try:
             subprocess.Popen(command, cwd=self._root)
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.ENOENT:
                 raise ExecutableMissing(command[0])
             else:
@@ -500,12 +502,15 @@
     def diff(self, file_id):
         try:
             new_path = self.new_tree.id2path(file_id)
-            new_kind = self.new_tree.kind(new_path, file_id)
+            # new_kind = self.new_tree.kind(new_path, file_id)
+            new_kind = self.new_tree.kind(new_path)
             old_path = self.old_tree.id2path(file_id)
-            old_kind = self.old_tree.kind(old_path, file_id)
+            # old_kind = self.old_tree.kind(old_path, file_id)
+            old_kind = self.old_tree.kind(old_path)
         except NoSuchId:
             return DiffPath.CANNOT_DIFF
-        return DiffFromTool.diff(self, file_id, old_path, new_path, old_kind, new_kind)
+        # return DiffFromTool.diff(self, file_id, old_path, new_path, old_kind, new_kind)
+        return DiffFromTool.diff(self, old_path, new_path, old_kind, new_kind)
 
 class ExtDiffContext(QtCore.QObject):
     """
@@ -516,7 +521,7 @@
         """
         :parent:  parent widget. If specified, cache is deleted automatically
                   when parent is closed.
-        :to_file: stream to write output messages. If not specified, 
+        :to_file: stream to write output messages. If not specified,
                   stdout is used.
         :path_encoding: encoding of path
         """
@@ -562,8 +567,7 @@
         Set or change diff command and diffed trees.
         """
         if self._differ is None:
-            self._differ = _ExtDiffer(command_string, old_tree, new_tree,
-                                      self.to_file, self.path_encoding)
+            self._differ = _ExtDiffer(command_string, old_tree, new_tree, self.to_file, self.path_encoding)
         else:
             self._differ.set_trees(old_tree, new_tree)
             self._differ.set_command_string(command_string)
@@ -577,7 +581,7 @@
         """
         Show diffs of specified file_ids.
         NOTE: Directories cannot be specified.
-              Use diff_tree or diff_paths instead when specifing directory. 
+              Use diff_tree or diff_paths instead when specifing directory.
         """
         cleanup = []
         try:

=== modified file 'lib/diffview.py'
--- lib/diffview.py	2017-09-11 06:53:22 +0000
+++ lib/diffview.py	2020-07-16 14:28:25 +0000
@@ -21,7 +21,7 @@
 
 import re
 from breezy import timestamp
-from breezy.patiencediff import PatienceSequenceMatcher as SequenceMatcher
+from patiencediff import PatienceSequenceMatcher as SequenceMatcher
 from breezy.plugins.qbrz.lib.i18n import gettext
 from breezy.plugins.qbrz.lib.util import (
     file_extension,
@@ -66,18 +66,18 @@
 
 config = get_qbrz_config()
 component_dict = {0:'fill', 1:'bound'}
-for key in colors.iterkeys():
+for key in colors.keys():
     for comp in [0,1]:
         color = None
         try:
             color = config.get_color(key + '_' + component_dict[comp],
                                         'QDIFF COLORS')
-        except ValueError, msg:
+        except ValueError as msg:
             #error handling.
             mutter(str(msg))
         if None != color:
             colors[key][comp] = color
-            
+
 
 #Get a user-defined replacement text background
 try:
@@ -85,11 +85,11 @@
                                          'QDIFF COLORS')
     if None != new_interline_bg:
       interline_changes_background = new_interline_bg
-except ValueError, msg:
+except ValueError as msg:
     mutter(str(msg))
 
 brushes = {}
-for kind, cols in colors.items():
+for kind, cols in list(colors.items()):
     brushes[kind] = (QtGui.QBrush(cols[0]), QtGui.QBrush(cols[1]))
 
 
@@ -126,7 +126,7 @@
             if block_y > bot:
                 break
             painter.drawLine(0, block_y, w, block_y)
-        
+
         pen.setWidth(1)
         for y_top, y_bot, kind in self.changes:
             y_top -= y
@@ -140,7 +140,7 @@
             painter.drawLine(0, y_top, w, y_top)
             painter.drawLine(0, y_bot - 1, w, y_bot - 1)
         del painter
-        QtGui.QTextBrowser.paintEvent(self, event) 
+        QtGui.QTextBrowser.paintEvent(self, event)
 
     def wheelEvent(self, event):
         if event.orientation() == QtCore.Qt.Vertical and self.scrollbar:
@@ -155,7 +155,7 @@
         self.scrollbar = None
         self.view = parent
         self.clear()
-        
+
     def clear(self):
         self.changes = []
         self.infoBlocks = []
@@ -203,7 +203,7 @@
             ly_bot -= ly + 1
             ry_top -= ry
             ry_bot -= ry + 1
-            
+
             if ly_top < 0 and ly_bot < 0 and ry_top < 0 and ry_bot < 0:
                 continue
             if ly_top > h and ly_bot > h and ry_top > h and ry_bot > h:
@@ -221,7 +221,7 @@
 
             painter.fillPath(region, brushes[kind][0])
             painter.setPen(colors[kind][1])
-            for path, aa in zip((upper_line, lower_line), 
+            for path, aa in zip((upper_line, lower_line),
                                 (ly_top != ry_top, ly_bot != ry_bot)):
                 painter.setRenderHints(QtGui.QPainter.Antialiasing, aa)
                 painter.drawPath(path)
@@ -264,7 +264,7 @@
             b.scrollbar = self
 
         for i, scbar in enumerate([self] + [b.verticalScrollBar() for b in browsers]):
-            self.connect(scbar, QtCore.SIGNAL("valueChanged(int)"), 
+            self.connect(scbar, QtCore.SIGNAL("valueChanged(int)"),
                                         lambda value, target=i : self.scrolled(target))
 
         self.connect(browsers[0], QtCore.SIGNAL("resized()"), self.adjust_range)
@@ -398,19 +398,19 @@
         titleFont = QtGui.QFont(self.font())
         titleFont.setPointSize(titleFont.pointSize() * 140 / 100)
         titleFont.setBold(True)
-        
+
         self.monospacedFont = get_monospace_font()
         metadataFont = QtGui.QFont(self.font())
         metadataFont.setPointSize(titleFont.pointSize() * 70 / 100)
         metadataLabelFont = QtGui.QFont(metadataFont)
         metadataLabelFont.setBold(True)
-    
+
         self.monospacedFormat = QtGui.QTextCharFormat()
         self.monospacedFormat.setFont(self.monospacedFont)
         self.ttype_formater = CachedTTypeFormater(
                                 QtGui.QTextCharFormat(self.monospacedFormat))
         self.background = self.monospacedFormat.background()
-        
+
         self.titleFormat = QtGui.QTextCharFormat()
         self.titleFormat.setFont(titleFont)
         self.metadataFormat = QtGui.QTextCharFormat()
@@ -436,12 +436,12 @@
             b.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
 
         self.cursors = [QtGui.QTextCursor(doc) for doc in self.docs]
-        
+
         for i, (panel, doc, cursor) in enumerate(zip(self.guidebar_panels,
                                                      self.docs, self.cursors)):
             doc.setUndoRedoEnabled(False)
             doc.setDefaultFont(self.monospacedFont)
-            
+
             panel.edit.setDocument(doc)
             self.addWidget(panel)
             self.setCollapsible(i, False)
@@ -457,15 +457,15 @@
         self.connect(self.browsers[1].horizontalScrollBar(), QtCore.SIGNAL("valueChanged(int)"), self.syncHorizontalSlider2)
 
         self.rewinded = False
-        
+
         self.lastModifiedLabel = gettext('Last modified:')
         self.statusLabel = gettext('Status:')
         self.kindLabel = gettext('Kind:')
         self.propertiesLabel = gettext('Properties:')
-        
+
         self.image_exts = ['.'+str(i)
             for i in QtGui.QImageReader.supportedImageFormats()]
-        
+
         config = get_qbrz_config()
         self.show_intergroup_colors = config.get_option("diff_show_intergroup_colors") in ("True", "1")
 
@@ -522,16 +522,16 @@
             else:
                 cursor.insertText(" ", self.metadataFormat)
             cursor.insertBlock()
-        
+
         infoBlocks = (cursors[0].block().layout(),
                       cursors[1].block().layout())
         changes = []
-            
+
         if not binary:
             for cursor in cursors:
                 cursor.setCharFormat(self.monospacedFormat)
                 cursor.insertBlock()
-            
+
             def fix_last_line(lines):
                 """Fix last line if there is no new line.
 
@@ -544,7 +544,7 @@
                     if last and last[-1] not in ('\r', '\n'):
                         lines = lines[:-1] + [last+'\n']
                 return lines
-            
+
             lines = [fix_last_line(l) for l in lines]
             if have_pygments:
                 use_pygments = True
@@ -570,7 +570,7 @@
             else:
                 use_pygments = False
                 display_lines = lines
-            
+
             def insertLine(cursor, line):
                 if use_pygments:
                     for ttype, value in line:
@@ -579,12 +579,12 @@
                         cursor.insertText(value, format)
                 else:
                     cursor.insertText(line)
-            
+
             def insertIxs(ixs):
                 for cursor, line, ix in zip(cursors, display_lines, ixs):
                     for l in line[ix[0]:ix[1]]:
                         insertLine(cursor, l)
-            
+
             def modifyFormatForTag (format, tag):
                 if tag == "replace":
                     format.setBackground(interline_changes_background)
@@ -594,7 +594,7 @@
                     format.setBackground(brushes[tag][0])
                 else:
                     format.setBackground(interline_changes_background)
-            
+
             split_words = re.compile(r"\w+|\n\r|\r\n|\W")
             def insertIxsWithChangesHighlighted(ixs):
                 texts = ["".join(l[ix[0]:ix[1]]) for l, ix in zip(lines, ixs)]
@@ -602,9 +602,9 @@
                     # This is what the pygments lexer does, so we need to do the
                     # same incase we have \r\n line endings.
                     texts = ["\n".join(t.splitlines()) for t in texts]
-                
+
                 texts = [split_words.findall(t) for t in texts]
-                
+
                 if use_pygments:
                     groups = ([], [])
                     for tag, i0, i1, j0, j1 in SequenceMatcher(None,
@@ -639,14 +639,14 @@
                         format = QtGui.QTextCharFormat()
                         format.setFont(self.monospacedFont)
                         modifyFormatForTag(format, tag)
-                        
+
                         cursors[0].insertText("".join(texts[0][i0:i1]),format)
                         cursors[1].insertText("".join(texts[1][j0:j1]),format)
-                    
+
                     for cursor in cursors:
                         cursor.setCharFormat (self.monospacedFormat)
 
-            
+
             for i, group in enumerate(groups):
                 if i > 0:
                     y_top = [cursor.block().layout() for cursor in self.cursors]
@@ -711,8 +711,8 @@
                         heights[i] = image.height()
                         self.docs[i].addResource(QtGui.QTextDocument.ImageResource,
                                         QtCore.QUrl(file_id),
-                                        QtCore.QVariant(image))
-            
+                                        image)
+
             max_height = max(heights)
             for i, cursor in enumerate(self.cursors):
                 format = QtGui.QTextBlockFormat()
@@ -747,7 +747,7 @@
         self.browsers[0].infoBlocks.append(l_block)
         self.browsers[1].infoBlocks.append(r_block)
         self.handle(1).infoBlocks.append((l_block, r_block))
-