[meld: 49/49] Merge branch 'pathlabel'

[Kai Willadsen <kaiw src gnome org>]

commit f3477348ef411309562a58407e7e97908f2c9208
Merge: 3ccca8c6 4ef740a7
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Oct 9 06:47:55 2021 +1000

    Merge branch 'pathlabel'

 meld/dirdiff.py                           |  81 +++---
 meld/filediff.py                          |  85 +++---
 meld/iohelpers.py                         | 121 ++++++++-
 meld/melddoc.py                           | 122 +++++----
 meld/meldwindow.py                        |  28 +-
 meld/recent.py                            |   9 +-
 meld/resources/icons/vc-pull-symbolic.svg | 417 ++++++++++++++++++++++++++++++
 meld/resources/icons/vc-push-symbolic.svg | 154 +++++++++++
 meld/resources/meld.css                   |  19 +-
 meld/resources/meld.gresource.xml         |   3 +
 meld/resources/ui/appwindow.ui            |   2 +-
 meld/resources/ui/dirdiff.ui              | 123 +++++----
 meld/resources/ui/filediff-menus.ui       |  11 +
 meld/resources/ui/filediff.ui             | 240 ++++++++---------
 meld/resources/ui/path-label.ui           | 114 ++++++++
 meld/resources/ui/vcview-menus.ui         |   6 +-
 meld/resources/ui/vcview.ui               | 203 ++++++++-------
 meld/ui/filebutton.py                     |  88 +++++++
 meld/ui/gladesupport.py                   |   2 +
 meld/ui/pathlabel.py                      | 233 +++++++++++++++++
 meld/vc/_vc.py                            |   4 +-
 meld/vc/cvs.py                            |  20 +-
 meld/vc/git.py                            |   5 +-
 meld/vcview.py                            |  17 +-
 po/POTFILES.in                            |   2 +
 setup.cfg                                 |   2 +
 setup_win32.py                            |   6 +-
 test/test_iohelpers.py                    |  86 ++++++
 28 files changed, 1754 insertions(+), 449 deletions(-)
---
diff --cc meld/dirdiff.py
index f4a6f805,ec1b9dea..9837658d
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@@ -25,7 -26,7 +26,7 @@@ import typin
  from collections import namedtuple
  from decimal import Decimal
  from mmap import ACCESS_COPY, mmap
- from typing import Tuple
 -from typing import List, Optional
++from typing import List, Optional, Tuple
  
  from gi.repository import Gdk, Gio, GLib, GObject, Gtk