![[BACK]](/icons/back.gif){kind=icon}
Up to [cvs.NetBSD.org] / pkgsrc / devel / py-hg-evolve
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.36 / (download) - annotate - [select for diffs], Wed Mar 29 11:30:46 2023 UTC (8 weeks, 4 days ago) by wiz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.35: +2 -2
lines
Diff to previous 1.35 (colored)
py-hg-evolve: update to 11.0.1. Changes not documented.
Revision 1.35 / (download) - annotate - [select for diffs], Tue Mar 7 11:33:21 2023 UTC (2 months, 3 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2023Q1-base,
pkgsrc-2023Q1
Changes since 1.34: +2 -2
lines
Diff to previous 1.34 (colored)
py-hg-evolve: update to 11.0.0. Changes: not found.
Revision 1.34 / (download) - annotate - [select for diffs], Mon Jan 9 10:55:01 2023 UTC (4 months, 2 weeks ago) by wiz
Branch: MAIN
Changes since 1.33: +2 -2
lines
Diff to previous 1.33 (colored)
py-hg-evolve: update to 10.5.3. This is a bugfix release. In evolve extension, caches that use SQLite database will no longer prevent pushes from succeeding. In topic extension, topic cache is now invalidated when branch cache is invalidated, this fixes stale labels shown in TortoiseHg. And hg next now correctly evolves the destination in cases when there is a mix of stable and regular destinations for user to select. The extensions are also marked compatible with Mercurial 6.3 (no changes to code were required).
Revision 1.33 / (download) - annotate - [select for diffs], Wed Nov 9 13:14:09 2022 UTC (6 months, 2 weeks ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2022Q4-base,
pkgsrc-2022Q4
Changes since 1.32: +2 -2
lines
Diff to previous 1.32 (colored)
Reset MAINTAINER
Revision 1.32 / (download) - annotate - [select for diffs], Sun Jul 17 09:53:00 2022 UTC (10 months, 1 week ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2022Q3-base,
pkgsrc-2022Q3
Changes since 1.31: +4 -2
lines
Diff to previous 1.31 (colored)
py-hg-evolve: update to 10.5.2. Changes not found.
Revision 1.31 / (download) - annotate - [select for diffs], Sun Jul 3 17:50:52 2022 UTC (10 months, 3 weeks ago) by wiz
Branch: MAIN
Changes since 1.30: +2 -2
lines
Diff to previous 1.30 (colored)
py-hg-evolve: update URL in comment
Revision 1.30 / (download) - annotate - [select for diffs], Tue May 10 07:07:28 2022 UTC (12 months, 2 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2022Q2-base,
pkgsrc-2022Q2
Changes since 1.29: +2 -2
lines
Diff to previous 1.29 (colored)
py-hg-evolve: update to 10.5.1. This is a bugfix release. The most notable changes are: more work on fixup command that was introduced in the previous release, and a couple of bug fixes. Evolve is no longer confused when trying to select the latest successor in cases where a changeset was split and its child was pruned, see https://bz.mercurial-scm.org/show_bug.cgi?id=6648. Evolve with --dry-run flag used to update working directory in certain cases, see https://bz.mercurial-scm.org/show_bug.cgi?id=6669, this was fixed. There are also changes that should help Debian package maintainers; e.g. it's now possible to use system cbor instead of the one we vendor.
Revision 1.29 / (download) - annotate - [select for diffs], Tue Mar 8 11:06:36 2022 UTC (14 months, 2 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2022Q1-base,
pkgsrc-2022Q1
Changes since 1.28: +2 -3
lines
Diff to previous 1.28 (colored)
py-hg-evolve: update to 10.5.0. This is a feature release. The most notable changes are: a new command: fixup, which is used to add changes from the working directory to an arbitrary revision. An issue with histedit not preserving topics in certain situations was also fixed, see https://bz.mercurial-scm.org/show_bug.cgi?id=6550. Evolve is now compatible with the upcoming Mercurial 6.1, which includes head computation code that is obsolescence-aware (adapted from the evolve extension). With an up-to-date client and server you should expect hg push to take much less time. Also compatibility with Mercurial 4.7 was dropped in this release.
Revision 1.28 / (download) - annotate - [select for diffs], Sun Jan 9 11:58:14 2022 UTC (16 months, 2 weeks ago) by wiz
Branch: MAIN
Changes since 1.27: +1 -6
lines
Diff to previous 1.27 (colored)
egg.mk: remove --single-version-externally-managed setuptools has this as default when --root is used (since version 0.6a11).
Revision 1.27 / (download) - annotate - [select for diffs], Fri Jan 7 11:46:57 2022 UTC (16 months, 2 weeks ago) by tnn
Branch: MAIN
Changes since 1.26: +2 -2
lines
Diff to previous 1.26 (colored)
fix typo
Revision 1.26 / (download) - annotate - [select for diffs], Tue Jan 4 20:53:09 2022 UTC (16 months, 3 weeks ago) by wiz
Branch: MAIN
Changes since 1.25: +2 -2
lines
Diff to previous 1.25 (colored)
*: bump PKGREVISION for egg.mk users They now have a tool dependency on py-setuptools instead of a DEPENDS
Revision 1.25 / (download) - annotate - [select for diffs], Tue Jan 4 07:13:05 2022 UTC (16 months, 3 weeks ago) by wiz
Branch: MAIN
Changes since 1.24: +6 -1
lines
Diff to previous 1.24 (colored)
*: fix packaging with python 2.7
Revision 1.24 / (download) - annotate - [select for diffs], Sat Jan 1 11:26:34 2022 UTC (16 months, 3 weeks ago) by wiz
Branch: MAIN
Changes since 1.23: +3 -2
lines
Diff to previous 1.23 (colored)
py-hg-evolve: convert to egg.mk Bump PKGREVISION.
Revision 1.23 / (download) - annotate - [select for diffs], Sun Nov 28 10:37:19 2021 UTC (17 months, 4 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2021Q4-base,
pkgsrc-2021Q4
Changes since 1.22: +2 -2
lines
Diff to previous 1.22 (colored)
py-hg-evolve: update to 10.4.1. This is a maintenance release. It introduces compatibility with the upcoming Mercurial 6.0 and a couple of documentation improvements.
Revision 1.22 / (download) - annotate - [select for diffs], Thu Oct 28 11:47:55 2021 UTC (18 months, 4 weeks ago) by wiz
Branch: MAIN
Changes since 1.21: +2 -2
lines
Diff to previous 1.21 (colored)
py-hg-evolve: update to 10.4.0. This is a feature release. The most notable changes are: evolve will now produce the same result regardless of revision numbers when resolving content-divergence; an annoying topic bug that sometimes prevented various history-rewriting commands from completing with a KeyError was fixed. See https://bz.mercurial-scm.org/show_bug.cgi?id=6500 for details. Also compatibility with Mercurial 4.6 was dropped in this release.
Revision 1.21 / (download) - annotate - [select for diffs], Mon Aug 30 20:04:57 2021 UTC (20 months, 3 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2021Q3-base,
pkgsrc-2021Q3
Changes since 1.20: +2 -2
lines
Diff to previous 1.20 (colored)
py-hg-evolve: update to 10.3.3. This is a bugfix release. The most notable changes are: compatibility with Mercurial 5.9, and a bug that could lead to data loss when using evolve commands on a merge commit was fixed.
Revision 1.20 / (download) - annotate - [select for diffs], Thu Jul 15 12:40:38 2021 UTC (22 months, 1 week ago) by wiz
Branch: MAIN
Changes since 1.19: +2 -2
lines
Diff to previous 1.19 (colored)
py-hg-evolve: update to 10.3.2. This is a bugfix release. The most notable changes are: previously changing topic of a merge commit could lose some file changes, this has been now fixed, and `experimental.topic.publish-bare-branch` and `experimental.auto-publish` config options should now interact with each other correctly. To see more information about these experimental config options, try `hg help -e evolve` and `hg help -e topic`.
Revision 1.19 / (download) - annotate - [select for diffs], Thu May 20 09:34:46 2021 UTC (2 years ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2021Q2-base,
pkgsrc-2021Q2
Changes since 1.18: +4 -1
lines
Diff to previous 1.18 (colored)
py-hg-evolve: add link to mailing list for change logs
Revision 1.18 / (download) - annotate - [select for diffs], Thu May 20 09:33:51 2021 UTC (2 years ago) by wiz
Branch: MAIN
Changes since 1.17: +2 -2
lines
Diff to previous 1.17 (colored)
py-hg-evolve: update to 10.3.1. This is a bugfix release that addresses various issues and adds compatibility with the upcoming Mercurial 5.8. Check the changelog for details. The most notable changes are: cache reuse on different systems (such as using 64-bit and 32-bit Python to push/pull the same repo) should now be safe, and hg next now handles unstable changesets with topics more correctly.
Revision 1.17 / (download) - annotate - [select for diffs], Wed Mar 17 11:24:42 2021 UTC (2 years, 2 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2021Q1-base,
pkgsrc-2021Q1
Changes since 1.16: +2 -2
lines
Diff to previous 1.16 (colored)
py-hg-evolve: update to 10.3.0. This is a feature release that comes with a variety of improvements and bugfixes. Check the changelog for details. The most notable changes are: improved rewind logic in cases involving folds, an experimental ability to perform evolution in-memory (only on Mercurial 5.6 and newer), improved content-divergence resolution logic in cases involving parent changes.
Revision 1.16 / (download) - annotate - [select for diffs], Sat Feb 6 07:55:09 2021 UTC (2 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.15: +3 -3
lines
Diff to previous 1.15 (colored)
py-hg-evolve: update to 10.2.0.1.
10.2.0 -- 2021-02-01
--------------------
* compatibility with Mercurial 5.7
* doc: update the MQ To Evolve guide and fix build warning for index.rst
* evolve: improve resolution of some case of parent divergence
* evolve: respect command-templates.oneline-summary if configured
* evolve: remove spurious "working directory is now at ..." messages
* evolve: various documentation improvements
* packaging: default to building docs on Python 3
* strip: remove experimental.prunestrip option
topic (0.21.0)
* performance: speed up various operations using an in-memory cache for topic
* rebase: prevent in-memory rebase from silently dropping topic (by disabling
the feature)
* topic: rework how ctx.branch() is wrapped
* topic: look for topic heads only when necessary, this fixes the output of
e.g. hg heads when topics are in play
Revision 1.15 / (download) - annotate - [select for diffs], Mon Nov 9 14:43:14 2020 UTC (2 years, 6 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2020Q4-base,
pkgsrc-2020Q4
Changes since 1.14: +7 -12
lines
Diff to previous 1.14 (colored)
py-hg-evolve: update to 10.1.0.
10.1.0 -- 2020-10-31
--------------------
* compatibility with Mercurial 5.6
* numerous minor changes to packaging, Makefile, README moved to README.rst
* evolve: various improvements to content-divergence resolution
* evolve: fix various issues with --continue when solving content-divergence
* evolve: specify the source of config override for `server.bundle1=no`
* evolve: avoid leaving mergestate after instability resolution
* evolve: while resolving conflicts, the evolved node will no longer be a
dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
but it will show up as `%` with hg >= 5.4)
* metaedit: update bookmark location when applicable
* rewind: add a --dry-run flag
* rewind: properly record rewind of splits as folds
topic (0.20.0)
* stack: support foo#stack relation revset (hg-5.4+ only)
* merge: add a experimental.topic.linear-merge option to allow oedipus merges
in some cases
Revision 1.14 / (download) - annotate - [select for diffs], Tue Oct 6 17:52:16 2020 UTC (2 years, 7 months ago) by wiz
Branch: MAIN
Changes since 1.13: +15 -1
lines
Diff to previous 1.13 (colored)
py-hg-evolve: add missing test dependencies Update test status.
Revision 1.13 / (download) - annotate - [select for diffs], Sun Sep 13 11:05:01 2020 UTC (2 years, 8 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base,
pkgsrc-2020Q3
Changes since 1.12: +2 -2
lines
Diff to previous 1.12 (colored)
py-hg-evolve: update to 10.0.2.
10.0.2 -- 2020-09-08
--------------------
* py3: use '%d' for formatting revision numbers in stable range cache warning
(issue6390)
* split: correctly handle discard action after previously splitting changes
into more than one commit
* uncommit: fix situation where added file would be left in a wrong state
topic (0.19.2)
* revset: when processing `topic(REVSET)`, no longer return changesets
without topic from REVSET
Revision 1.12 / (download) - annotate - [select for diffs], Mon Aug 3 21:31:30 2020 UTC (2 years, 9 months ago) by joerg
Branch: MAIN
Changes since 1.11: +2 -3
lines
Diff to previous 1.11 (colored)
Update to hg-evolve 10.0.1:
* compatibility with Mercurial 5.5
* evolve: update the template keywords section in `hg help -e evolve`
* obslog: make obslog --no-origin -f work with multiple successor sets
* topic: hg push --topic does-not-exist now doesn't try to push unrelated
changesets and aborts instead
* topic: hg outgoing/push --topic . will use current topic
Revision 1.11 / (download) - annotate - [select for diffs], Mon Jun 1 15:48:20 2020 UTC (2 years, 11 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2020Q2-base,
pkgsrc-2020Q2
Changes since 1.10: +3 -2
lines
Diff to previous 1.10 (colored)
Sync evolve with Mercurial patches. Bump revision.
Revision 1.10 / (download) - annotate - [select for diffs], Sun May 10 19:29:58 2020 UTC (3 years ago) by joerg
Branch: MAIN
Changes since 1.9: +10 -3
lines
Diff to previous 1.9 (colored)
Update to hg-evolve-10.0.0:
* evolve: add {obsorigin}, a template keyword that works similarly to
{obsfate}, but shows predecessors of a changeset
* evolve: fix permissions of new cache files using SQLite
* evolve: always create commit when resolving divergence
* evolve: handle relocation during divergence resolution producing no changes
* evolve: provide cache to successorssets() in more cases
* obslog: make --all and --filternonlocal work properly with --no-graph
* obslog: add --origin flag to show predecessors instead of successors
* obslog: make --origin flag the default
* stablerangecache: sanity check subranges
* topic: auto-publish: issue the capabilities in all cases
* topic: provide cache to successorssets() in one more case
Revision 1.9 / (download) - annotate - [select for diffs], Mon May 4 17:23:28 2020 UTC (3 years ago) by riastradh
Branch: MAIN
Changes since 1.8: +4 -5
lines
Diff to previous 1.8 (colored)
py-hg-evolve: update to 9.3.1, needed with mercurial 5 joerg did not raise a clear objection when I asked, just alerted me that there will be a mercurial and hg-evolve update `real soon now'. Since it hasn't happened in the two weeks since I prepared this patch, I'm reading the lack of objection as approval, with the understanding that this update may be overwritten soon.
Revision 1.8 / (download) - annotate - [select for diffs], Sun Nov 3 10:18:27 2019 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2020Q1-base,
pkgsrc-2020Q1,
pkgsrc-2019Q4-base,
pkgsrc-2019Q4
Changes since 1.7: +2 -2
lines
Diff to previous 1.7 (colored)
devel/py-*: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections.
Revision 1.7 / (download) - annotate - [select for diffs], Mon Sep 2 13:19:38 2019 UTC (3 years, 8 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2019Q3-base,
pkgsrc-2019Q3
Changes since 1.6: +2 -2
lines
Diff to previous 1.6 (colored)
Changed PYTHON_VERSIONS_INCOMPATIBLE to PYTHON_VERSIONS_ACCEPTED; needed for future Python 3.8
Revision 1.6 / (download) - annotate - [select for diffs], Fri Apr 26 13:13:51 2019 UTC (4 years, 1 month ago) by maya
Branch: MAIN
CVS Tags: pkgsrc-2019Q2-base,
pkgsrc-2019Q2
Changes since 1.5: +2 -2
lines
Diff to previous 1.5 (colored)
Omit mentions of python 34 and 35, after those were removed. - Includes some whitespace changes, to be handled in a separate commit.
Revision 1.5 / (download) - annotate - [select for diffs], Thu Apr 11 13:27:55 2019 UTC (4 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.4: +2 -2
lines
Diff to previous 1.4 (colored)
Fix interaction between share and evolve extensions. Bump revision.
Revision 1.4 / (download) - annotate - [select for diffs], Wed Mar 6 14:09:10 2019 UTC (4 years, 2 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2019Q1-base,
pkgsrc-2019Q1
Changes since 1.3: +3 -3
lines
Diff to previous 1.3 (colored)
py-hg-evolve: update to 8.4.0nb1. Switch to distutils.mk.
Revision 1.3 / (download) - annotate - [select for diffs], Wed Mar 6 13:11:56 2019 UTC (4 years, 2 months ago) by joerg
Branch: MAIN
Changes since 1.2: +2 -2
lines
Diff to previous 1.2 (colored)
Update hg-evolve to 8.4.0:
8.4.0 -- 2019-12-22
-------------------
* compat: add compatibility with Mercurial 4.9
* compat: drop compatibility with Mercurial 4.3
* evolve: avoid potential crash when stabilizing orphan merges
* evolve: pick right destination in split+prune cases issue5686 (hg-4.9 only)
* evolve: prioritize --rev/--any/--all option over obsolete working directory
* fold: concatenate commit message in revision order
* next: evolve aspiring children by default (use --no-evolve to skip)
* next: pick lower part of a split as destination
* push: have `--publish` overrule the `auto-publish` config
* split: accept file patterns
* split: improve and update the user prompt (BC)
* split: make it possible to drop change during a split
* split: no longer accept revision without --rev (BC)
* split: support for non interactive splits
topic 0.13.0
* stack: introduce a --children flag (see help for details)
* stack: support for '#stack[idx]' absolute indexing in revset (hg-4.9+ only)
* topic: support for '#topic[idx]' relative indexing in revset (hg-4.9+ only)
* topic: make --age compatible with the usual other display for `hg topic`
* topics: improve the message around topic changes
8.3.3 -- 2018-12-24
-------------------
* evolve: properly detect unresolved merge conflict (issue-5966)
* evolve: fix possible crash when the repo changes during evolve (issue-6028)
* test: avoid leaking `hg serve` process
* topic: fix error message for the `ngtip` revset
8.3.2 -- 2018-11-27
-------------------
* evolve: not longer attempt to translate revision's descriptions (issue6016)
* evolve: fix compatibility with mercurial 4.8's narrow extension.
* pick: fix summary help text
* topic: only use pager when it make senses
8.3.1 -- 2018-10-25
-------------------
* evolve+topic: fix possible crash during content-divergence evolution
* use "new" unstabilities vocabulary in help
* compat: compatibility with Mercurial 4.8rc0
8.3.0 -- 2018-10-12
-------------------
* evolve: avoid redundant output when handling linear orphans
* evolve: use stack alias s# in `hg evolve` messages
* next, prev: use stack alias s# when relevant
* rewind: add an undo alias
* caches: skip warming the stablerange cache on strip in "auto" mode
* topic: properly register the '{topicidx}' for mercurial <= 4.5
* pullbundle: experimental extension to slice pull in multiple slices whose
associated bundle can be cached. The extensions is shipped
alongside evolve only for convenience. It it requires data
structures that currently live in the evolve extensions.
8.2.1 -- 2018-09-14
-------------------
* obshashrange: issue the "long stable cache" update message only once
* obshashrange: reduce impact of cache invalidation from many new obsmarkers
* caches: properly silence permission error related to caches
8.2.0 -- 2018-09-03
-------------------
* prune: rename `--biject` flag to `--pair` (old flag is kept as an alias)
* pick: rename the "grab" command to "pick" to avoid ambiguity with graft
* discovery: enable obshashrange based discovery by default
topic
* revset: `topic("patterns")` now handle standard patterns ("re:", etc)
* revset: `topic(REVS)` matches revisions with same topic as REVS
* topic: using `s#` alias instead of `t#` and `b#` alias
(compat with old form is preserved)
8.1.2 -- 2018-08-28
-------------------
* obshashrange: improved robusness of the cache under heavy load
* obshashrange: force recomputation of the final obshash related cache
(to make sure people benefit from the 8.1.1 fixes)
8.1.1 -- 2018-08-21
-------------------
* clone: fix possible crash when using clone bundle and forcing cache warming
* evolve: properly set second parent during conflict (issue5927)
* next: delete the evolvestate after aborting interrupted `next --evolve`
* next: fix topic restriction when passing --evolve
* obshashrange: fix speed and consistency issues during cache invalidation
* obshashrange: properly persist all caches involved in obshashrange discovery
* prune: improve documentation
8.1.0 -- 2018-08-03
-------------------
* compatibility with mercurial 4.7
* evolve: improve multiple aspect of content-divergence resolution
* branch changes handling,
* parent changes handling,
* description changes handling,
* divergent stack handling,
* improved resume, stop and abort of divergent resolution
* evolve: improved automatic resolution of phase-divergence
* evolve: add a --update and --no-update flag to evolve to control final
working copy parent
* evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
* evolve: show unfinished state information in `hg status -v` (issue5886)
* evolve: move bookmarks also when updating to successors (issue5923)
* evolve: improve orphan resolution when combined with divergence (issue5946)
* amend: abort `--patch` by saving an empty file (issue5925)
*
* evolve: add a new `--no-update` flag to keep working copy on the initial
revision.
* evolve: new help section dedicated to resuming operation interrupted by
merge conflit, `hg help evolve.interrupted`.
* obslog: --filternonlocal
* rewind: first limited version of `rewind` command to restore stack of commit to a
precusors state (check command help for detail and limitation)
topic (0.10.0)
* display a hint when a topic becomes empty
Revision 1.2 / (download) - annotate - [select for diffs], Sat Jul 7 21:17:02 2018 UTC (4 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base,
pkgsrc-2018Q4,
pkgsrc-2018Q3-base,
pkgsrc-2018Q3
Changes since 1.1: +2 -2
lines
Diff to previous 1.1 (colored)
Also mask Python 3.7.
Revision 1.1 / (download) - annotate - [select for diffs], Sat Jul 7 08:15:41 2018 UTC (4 years, 10 months ago) by joerg
Branch: MAIN
Import py-hg-evolve-8.0.1: The Evolve Extension extends the "changeset evolution" features of Mercurial core. It provides a set of commands to easily mutate history as well as the topics extension.