Merge lp:~cjwatson/difftacular/python-packaging into lp:difftacular

[Colin Watson]

Add a README and some basic Python packaging.

[Jürgen Gmach (jugmac00)]

review: Approve

[Colin Watson (cjwatson)]

05:22 <jelmer> cjwatson: that MR LGTM

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2022-08-05 23:26:34 +0000
@@ -0,0 +1,3 @@
+*.egg-info
+__pycache__
+dist/

=== added file 'README.rst'
--- README.rst	1970-01-01 00:00:00 +0000
+++ README.rst	2022-08-05 23:26:34 +0000
@@ -0,0 +1,23 @@
+difftacular: Extra diff-generation commands for Bazaar
+======================================================
+
+This `Breezy <https://breezy-vcs.org/>`_ plugin adds a few commands that
+perform variants on the basic ``brz diff`` command.
+
+``brz diff-mainline`` performs a diff between the specified revisions,
+reflecting only changes originated in the mainline: that is, it first
+applies any merges introduced between the old and new revisions to a
+temporary copy of the old tree, and then performs a diff between that
+temporary copy and the new tree.  For example, this can be used to see
+changes introduced while resolving conflicts during a manual merge.
+
+``brz diff-ignore-branches`` performs a diff between the specified
+revisions, but ignoring merges from the specified branches.
+
+``brz preview-diff`` performs a preview diff in the style used by Launchpad
+merge proposals: it shows the diff that would be introduced by merging the
+tip of the source branch into the target branch.  If a prerequisite branch
+is also given using the ``--prerequisite-branch`` option, then it will merge
+the tip of the prerequisite branch into a temporary copy of the target
+branch, and then show the diff that would be introduced by merging the tip
+of the source branch into that temporary copy.

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2022-08-05 23:26:34 +0000
@@ -0,0 +1,43 @@
+# Copyright (C) 2022 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
+
+[metadata]
+name = difftacular
+version = 0.1
+description = Extra diff-generation commands for Bazaar
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+url = https://launchpad.net/difftacular
+author = Aaron Bentley
+maintainer = The Launchpad developers
+maintainer_email = [e-mail]
+license = GPL-2.0
+classifiers =
+    Environment :: Plugins
+    License :: OSI Approved :: GNU General Public License v2 (GPLv2)
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 3
+    Topic :: Software Development :: Version Control
+
+[options]
+package_dir =
+    breezy.plugins.difftacular=.
+packages =
+    breezy.plugins.difftacular
+    breezy.plugins.difftacular.tests
+install_requires =
+    breezy

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2022-08-05 23:26:34 +0000
@@ -0,0 +1,21 @@
+#! /usr/bin/python3
+
+# Copyright (C) 2022 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
+
+from setuptools import setup
+
+setup()