Index: setup.py
--- setup.py.orig	2008-06-02 14:14:41.000000000 +0200
+++ setup.py	2019-12-26 10:19:25.733479000 +0100
@@ -12,7 +12,7 @@
       author='Lele Gaifax',
       author_email='lele@nautilus.homeip.net',
       packages=[dirpath for dirpath, dirnames, filenames in walk('vcpx')
-                if dirpath <> 'vcpx/tests' and '__init__.py' in filenames],
+                if dirpath != 'vcpx/tests' and '__init__.py' in filenames],
       scripts=['tailor'],
       description='A tool to migrate changesets between various kinds of '
       'version control system.',
Index: tailor.1
--- tailor.1.orig	2019-12-26 10:18:25.251140000 +0100
+++ tailor.1	2019-12-26 10:18:25.251126000 +0100
@@ -0,0 +1,130 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH TAILOR "1" "June 2008" "tailor 0.9.34" "User Commands"
+.SH NAME
+tailor \- tool to keep in sync various kinds of repository
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+1. tailor [options] [project ...]
+2. tailor test [\-\-help] [...]
+.SH OPTIONS
+.TP
+\fB\-D\fR, \fB\-\-debug\fR
+Print each executed command. This also keeps temporary
+files with the upstream logs, that are otherwise
+removed after use.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Be verbose, echoing the changelog of each applied
+changeset to stdout.
+.TP
+\fB\-c\fR CONFNAME, \fB\-\-configfile\fR=\fICONFNAME\fR
+Centralized storage of projects info.  With this
+option and no other arguments tailor will update every
+project found in the config file.
+.TP
+\fB\-\-encoding\fR=\fICHARSET\fR
+Force the output encoding to given CHARSET, rather
+then using the user's default settings specified in
+the environment.
+.TP
+\fB\-\-version\fR
+show program's version number and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.IP
+Bootstrap options:
+.TP
+\fB\-s\fR VC\-KIND, \fB\-\-source\-kind\fR=\fIVC\-KIND\fR
+Select the backend for the upstream source version
+control VC\-KIND. Default is 'cvs'.
+.TP
+\fB\-t\fR VC\-KIND, \fB\-\-target\-kind\fR=\fIVC\-KIND\fR
+Select VC\-KIND as backend for the shadow repository,
+with 'darcs' as default.
+.TP
+\fB\-R\fR REPOS, \fB\-\-repository\fR=\fIREPOS\fR, \fB\-\-source\-repository\fR=\fIREPOS\fR
+Specify the upstream repository, from where bootstrap
+will checkout the module.  REPOS syntax depends on the
+source version control kind.
+.TP
+\fB\-m\fR MODULE, \fB\-\-module\fR=\fIMODULE\fR, \fB\-\-source\-module\fR=\fIMODULE\fR
+Specify the module to checkout at bootstrap time. This
+has different meanings under the various upstream
+systems: with CVS it indicates the module, while under
+SVN it's the prefix of the tree you want and must
+begin with a slash. Since it's used in the description
+of the target repository, you may want to give it a
+value with darcs too, even though it is otherwise
+ignored.
+.TP
+\fB\-r\fR REV, \fB\-\-revision\fR=\fIREV\fR, \fB\-\-start\-revision\fR=\fIREV\fR
+Specify the revision bootstrap should checkout.  REV
+must be a valid 'name' for a revision in the upstream
+version control kind. For CVS it may be either a
+branch name, a timestamp or both separated by a space,
+and timestamp may be 'INITIAL' to denote the beginning
+of time for the given branch. Under Darcs, INITIAL is
+a shortcut for the name of the first patch in the
+upstream repository, otherwise it is interpreted as
+the name of a tag. Under Subversion, 'INITIAL' is the
+first patch that touches given repos/module, otherwise
+it must be an integer revision number. 'HEAD' means
+the latest version in all backends.
+.TP
+\fB\-T\fR REPOS, \fB\-\-target\-repository\fR=\fIREPOS\fR
+Specify the target repository, the one that will
+receive the patches coming from the source one.
+.TP
+\fB\-M\fR MODULE, \fB\-\-target\-module\fR=\fIMODULE\fR
+Specify the module on the target repository that will
+actually contain the upstream source tree.
+.TP
+\fB\-\-subdir\fR=\fIDIR\fR
+Force the subdirectory where the checkout will happen,
+by default it's the tail part of the module name.
+.IP
+Update options:
+.TP
+\fB\-F\fR FORMAT, \fB\-\-patch\-name\-format\fR=\fIFORMAT\fR
+Specify the prototype that will be used to compute the
+patch name.  The prototype may contain %(keyword)s
+such as 'author', 'date', 'revision', 'firstlogline',
+\&'remaininglog'. It defaults to 'Tailorized
+"%(revision)s"'; setting it to the empty string means
+that tailor will simply use the original changelog.
+.TP
+\fB\-1\fR, \fB\-\-remove\-first\-log\-line\fR
+Remove the first line of the upstream changelog. This
+is intended to pair with \fB\-\-patch\-name\-format\fR, when
+using its 'firstlogline' variable to build the name of
+the patch.
+.TP
+\fB\-N\fR, \fB\-\-refill\-changelogs\fR
+Refill every changelog, useful when upstream logs are
+not uniform.
+.IP
+VC specific options:
+.TP
+\fB\-\-use\-propset\fR
+Use 'svn propset' to set the real date and author of
+each commit, instead of appending these information to
+the changelog. This requires some tweaks on the SVN
+repository to enable revision propchanges.
+.TP
+\fB\-\-ignore\-arch\-ids\fR
+Ignore .arch\-ids directories when using a tla source.
+.SH SEE ALSO
+The syntax for tailor's configuration file format
+and a good number of examples
+are in tailor's
+.I README
+file, which on Debian systems can be found in
+.IR /usr/share/doc/tailor/README.rst.gz
+.
+.SH AUTHOR
+tailor was written by Lele Gaifax <lele@nautilus.homeip.net>.
+.PP
+This manual page was written by Vincent Danjean <vdanjean@debian.org>,
+with the help of help2man for the Debian project (but may be used by others).
Index: vcpx/repository/hg.py
--- vcpx/repository/hg.py.orig	2008-06-02 14:14:41.000000000 +0200
+++ vcpx/repository/hg.py	2019-12-26 10:18:25.250991000 +0100
@@ -343,9 +343,12 @@
             if cmdutil.findcmd.func_code.co_argcount == 2:     # 0.9.4
                 def findcmd(cmd):
                     return cmdutil.findcmd(self._getUI(), cmd)
-            elif cmdutil.findcmd.func_code.co_argcount == 3:   # 0.9.5
+            elif cmdutil.findcmd.func_code.co_argcount == 3: #  >= 0.9.5
                 def findcmd(cmd):
-                    return cmdutil.findcmd(self._getUI(), cmd, commands.table)
+                    if cmdutil.findcmd.func_code.co_varnames[0] == "ui": # < 1.1.0
+                        return cmdutil.findcmd(self._getUI(), cmd, commands.table)
+                    else: # >= 1.1.0
+                        return cmdutil.findcmd(cmd, commands.table)
         elif hasattr(commands, 'findcmd'):         # < 0.9.4
             if commands.findcmd.func_code.co_argcount == 1:
                 findcmd = commands.findcmd