--- a/debian/changelog Mon Nov 04 14:58:58 2019 -0800
+++ b/debian/changelog Thu Nov 07 10:29:03 2019 +0100
@@ -1,4 +1,13 @@
-mercurial-evolve (9.2.1-1) UNRELEASED; urgency=medium
+mercurial-evolve (9.2.1-1.1) UNRELEASED; urgency=medium
+
+ * build with pybuild and sphinxdoc
+ * update debhelper compat to 10
+ * build with Python 3, keeping Python 2 build until there exists a mercurial
+ package in Debian built with Python 3
+
+ -- Denis Laxalde <denis.laxalde@logilab.fr> Tue, 15 Oct 2019 11:41:40 +0200
+
+mercurial-evolve (9.2.1-1) unstable; urgency=medium
* new upstream release
--- a/debian/compat Mon Nov 04 14:58:58 2019 -0800
+++ b/debian/compat Thu Nov 07 10:29:03 2019 +0100
@@ -1,1 +1,1 @@
-8
+10
--- a/debian/control Mon Nov 04 14:58:58 2019 -0800
+++ b/debian/control Thu Nov 07 10:29:03 2019 +0100
@@ -9,20 +9,27 @@
Build-Depends:
mercurial (>= 4.5),
python,
- debhelper (>= 8),
+ python3,
+ debhelper (>= 10),
+ dh-python,
python-sphinx (>= 1.0.8),
imagemagick,
librsvg2-bin,
wget,
+ sphinx-common,
X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.6
Homepage: https://www.mercurial-scm.org/doc/evolution/
Package: mercurial-evolve
Architecture: all
Depends:
${python:Depends},
+ ${python3:Depends},
${misc:Depends},
+ ${sphinxdoc:Depends},
mercurial (>= 4.5),
+Built-Using: ${sphinxdoc:Built-Using}
Description: evolve extension for Mercurial
This package provides the experimental "evolve" extension for the Mercurial
DVCS.
--- a/debian/rules Mon Nov 04 14:58:58 2019 -0800
+++ b/debian/rules Thu Nov 07 10:29:03 2019 +0100
@@ -2,12 +2,14 @@
#export DH_VERBOSE=1
%:
- dh $@ --with python2 --buildsystem=python_distutils
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+ifeq (,$(filter nodoc, $(DEB_BUILD_OPTIONS)))
override_dh_auto_build:
dh_auto_build
# Workaround for Sphinx in Debian Buster defaulting to Python 3
SPHINXBUILD="python -m sphinx -bhtml" $(MAKE) -C docs
+endif
hgsrc_defined:
# Use "! -z" instead of "-n", because "-n" without arguments is true
@@ -23,6 +25,11 @@
find debian -path '*/hgext3rd/__init__.py' -delete
dh_python2
+override_dh_python3:
+ # avoid conflict with mercurial's own hgext3rd/__init__.py
+ find debian -path '*/hgext3rd/__init__.py' -delete
+ dh_python3
+
override_dh_auto_clean: clean-docs
dh_auto_clean
rm -f tests/*.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/options Thu Nov 07 10:29:03 2019 +0100
@@ -0,0 +1,1 @@
+extend-diff-ignore = "^(contrib/|.gitlab-ci.yml|.hg-format-source|MANIFEST|Makefile|docs/tutorial/.netlify|hgext3rd/evolve/hack/|tests/.testtimes)"
--- a/docs/figures/figure-ug07.svg Mon Nov 04 14:58:58 2019 -0800
+++ b/docs/figures/figure-ug07.svg Thu Nov 07 10:29:03 2019 +0100
@@ -236,7 +236,7 @@
id="tspan8594"
x="113.19138"
y="21.624107"
- style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
<g
id="g6372"
transform="translate(63.844068,-32.28608)">
--- a/docs/figures/figure-ug09.svg Mon Nov 04 14:58:58 2019 -0800
+++ b/docs/figures/figure-ug09.svg Thu Nov 07 10:29:03 2019 +0100
@@ -110,7 +110,7 @@
id="tspan8594"
x="132.17838"
y="-88.939552"
- style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
<g
id="g6372"
transform="translate(82.830913,-142.84994)">
--- a/docs/figures/figure-ug10.svg Mon Nov 04 14:58:58 2019 -0800
+++ b/docs/figures/figure-ug10.svg Thu Nov 07 10:29:03 2019 +0100
@@ -570,7 +570,7 @@
sodipodi:role="line"
x="79.694885"
y="806.03015"
- style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
<g
id="g6372-4-2"
transform="translate(32.179684,745.12164)">
--- a/docs/figures/figure-ug12.svg Mon Nov 04 14:58:58 2019 -0800
+++ b/docs/figures/figure-ug12.svg Thu Nov 07 10:29:03 2019 +0100
@@ -333,7 +333,7 @@
x="76.696045"
sodipodi:role="line"
id="tspan3322"
- style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve</tspan></text>
<g
transform="translate(29.180861,844.4619)"
id="g6372-4-2">
--- a/docs/sharing.rst Mon Nov 04 14:58:58 2019 -0800
+++ b/docs/sharing.rst Thu Nov 07 10:29:03 2019 +0100
@@ -693,7 +693,7 @@
As usual when there's trouble in your repository, the solution is to
evolve it::
- $ hg evolve --all
+ $ hg evolve
Figure 8 illustrates Bob's repository after evolving away the phase-divergent
changeset. Ignoring the obsolete changesets, Bob now has a nice,
--- a/docs/user-guide.rst Mon Nov 04 14:58:58 2019 -0800
+++ b/docs/user-guide.rst Thu Nov 07 10:29:03 2019 +0100
@@ -403,7 +403,7 @@
The fix is to *evolve* history::
- $ hg evolve --all
+ $ hg evolve
This is a separate step, not automatically part of ``hg amend``,
because there might be conflicts. If your amended changeset modifies a
@@ -418,7 +418,7 @@
.. figure:: figures/figure-ug07.svg
- Figure 7: evolve your repository (``hg evolve --all``) to take care
+ Figure 7: evolve your repository (``hg evolve``) to take care
of instability. Orphan changesets become obsolete, and are
replaced by successors just like the amended changeset was.
@@ -450,14 +450,14 @@
As before, the solution to orphan changesets is to evolve your
repository::
- $ hg evolve --all
+ $ hg evolve
This rebases revision 20 on top of 18 as the new revision 21, leaving
19 and 20 obsolete and hidden:
.. figure:: figures/figure-ug09.svg
- Figure 9: once again, ``hg evolve --all`` takes care of instability.
+ Figure 9: once again, ``hg evolve`` takes care of instability.
Example 9: Uncommit files from an older changeset (discard changes)
=======================================================================
@@ -491,7 +491,7 @@
hack, so we can discard it and immediately evolve the instability away::
$ hg revert file2.c
- $ hg evolve --all
+ $ hg evolve
move:[23] fix bug 67
atop:[24] fix bug 53
@@ -545,7 +545,7 @@
This is where things get tricky. As usual when a repository has
orphan changesets, we want to evolve it::
- $ hg evolve --all
+ $ hg evolve
The problem is that ``hg evolve`` rebases revision 27 onto revision
28, creating 30 (the successor of 27). This is entirely logical: 27
@@ -570,7 +570,7 @@
to normal state. For complicated implementation reasons, that command
doesn't exist. (If you have already pushed an obsolescence marker to
another repo, then Mercurial would need a way to revoke that remote
-obsolesence marker. That's a hard problem.)
+obsolescence marker. That's a hard problem.)
Instead, ``evolve`` provides a ``touch`` command to resurrect an
obsolete changeset. An unexpected quirk: you almost certainly need to
--- a/hgext3rd/evolve/cmdrewrite.py Mon Nov 04 14:58:58 2019 -0800
+++ b/hgext3rd/evolve/cmdrewrite.py Thu Nov 07 10:29:03 2019 +0100
@@ -455,7 +455,7 @@
(b'', b'revert', False, _(b'discard working directory changes after uncommit')),
(b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT')),
] + commands.walkopts + commitopts + commitopts2 + commitopts3,
- _(b'[OPTION]... [NAME]'),
+ _(b'[OPTION]... [FILE]...'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
def uncommit(ui, repo, *pats, **opts):
"""move changes from parent revision to working directory
@@ -691,7 +691,7 @@
(b'', b'from', None, _(b"fold revisions linearly to working copy parent")),
(b'n', b'note', b'', _(b'store a note on fold'), _(b'TEXT')),
] + commitopts + commitopts2 + commitopts3,
- _(b'hg fold [OPTION]... [-r] REV'),
+ _(b'hg fold [OPTION]... [-r] REV...'),
helpbasic=True,
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
def fold(ui, repo, *revs, **opts):
@@ -823,7 +823,7 @@
(b'', b'fold', None, _(b"also fold specified revisions into one")),
(b'n', b'note', b'', _(b'store a note on metaedit'), _(b'TEXT')),
] + commitopts + commitopts2 + commitopts3,
- _(b'hg metaedit [OPTION]... [-r] [REV]'),
+ _(b'hg metaedit [OPTION]... [[-r] REV]...'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
def metaedit(ui, repo, *revs, **opts):
"""edit commit information
@@ -981,7 +981,7 @@
_(b"record a split (one precursor, multiple successors)")),
(b'B', b'bookmark', [], _(b"remove revs only reachable from given"
b" bookmark"), _(b'BOOKMARK'))] + metadataopts,
- _(b'[OPTION] [-r] REV...'),
+ _(b'[OPTION]... [-r] REV...'),
helpbasic=True,
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
# XXX -U --noupdate option to prevent wc update and or bookmarks update ?
@@ -1176,7 +1176,7 @@
(b'r', b'rev', [], _(b"revision to split"), _(b'REV')),
(b'n', b'note', b'', _(b"store a note on split"), _(b'TEXT')),
] + commitopts + commitopts2 + commitopts3,
- _(b'hg split [OPTION] [-r REV] [FILES]'),
+ _(b'hg split [OPTION]... [-r REV] [FILE]...'),
helpbasic=True,
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
def cmdsplit(ui, repo, *pats, **opts):
@@ -1353,7 +1353,7 @@
b'mark the new revision as successor of the old one potentially creating '
b'divergence')],
# allow to choose the seed ?
- _(b'[-r] revs'),
+ _(b'[OPTION]... [-r] REV...'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
def touch(ui, repo, *revs, **opts):
"""create successors identical to their predecessors but the changeset ID
@@ -1455,7 +1455,7 @@
(b'c', b'continue', False, b'continue interrupted pick'),
(b'a', b'abort', False, b'abort interrupted pick'),
] + mergetoolopts,
- _(b'[-r] rev'),
+ _(b'[OPTION]... [-r] REV'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_MANAGEMENT'))
def cmdpick(ui, repo, *revs, **opts):
"""move a commit on the top of working directory parent and updates to it."""
--- a/hgext3rd/evolve/obshistory.py Mon Nov 04 14:58:58 2019 -0800
+++ b/hgext3rd/evolve/obshistory.py Thu Nov 07 10:29:03 2019 +0100
@@ -50,7 +50,7 @@
(b'p', b'patch', False, _(b'show the patch between two obs versions')),
(b'f', b'filternonlocal', False, _(b'filter out non local commits')),
] + commands.formatteropts,
- _(b'hg olog [OPTION]... [REV]'),
+ _(b'hg olog [OPTION]... [[-r] REV]...'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_NAVIGATION'))
def cmdobshistory(ui, repo, *revs, **opts):
"""show the obsolescence history of the specified revisions
--- a/hgext3rd/topic/__init__.py Mon Nov 04 14:58:58 2019 -0800
+++ b/hgext3rd/topic/__init__.py Thu Nov 07 10:29:03 2019 +0100
@@ -634,7 +634,7 @@
(b'', b'age', False, b'show when you last touched the topics'),
(b'', b'current', None, b'display the current topic only'),
] + commands.formatteropts,
- _(b'hg topics [TOPIC]'),
+ _(b'hg topics [OPTION]... [-r REV]... [TOPIC]'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_ORGANIZATION'))
def topics(ui, repo, topic=None, **opts):
"""View current topic, set current topic, change topic for a set of revisions, or see all topics.
--- a/tests/test-pick.t Mon Nov 04 14:58:58 2019 -0800
+++ b/tests/test-pick.t Thu Nov 07 10:29:03 2019 +0100
@@ -25,7 +25,7 @@
$ hg init repo
$ cd repo
$ hg help pick
- hg pick [-r] rev
+ hg pick [OPTION]... [-r] REV
aliases: grab
--- a/tests/test-topic.t Mon Nov 04 14:58:58 2019 -0800
+++ b/tests/test-topic.t Thu Nov 07 10:29:03 2019 +0100
@@ -133,7 +133,7 @@
(use 'hg help -v topic' to show built-in aliases and global options)
$ hg help topics
- hg topics [TOPIC]
+ hg topics [OPTION]... [-r REV]... [TOPIC]
View current topic, set current topic, change topic for a set of revisions, or
see all topics.
--- a/tests/test-tutorial.t Mon Nov 04 14:58:58 2019 -0800
+++ b/tests/test-tutorial.t Thu Nov 07 10:29:03 2019 +0100
@@ -913,7 +913,7 @@
of the `uncommit` command to splitting a change.
$ hg help uncommit
- hg uncommit [OPTION]... [NAME]
+ hg uncommit [OPTION]... [FILE]...
move changes from parent revision to working directory
@@ -958,7 +958,7 @@
The tutorial part is not written yet but can use `hg fold`:
$ hg help fold
- hg fold [OPTION]... [-r] REV
+ hg fold [OPTION]... [-r] REV...
aliases: squash