Mercurial > evolve
changeset 5164:3a2a17b1985c
branching: merge stable back into default
evolve 9.3.0 have been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 04 Mar 2020 17:49:58 +0100 |
| parents | e78926a1a473 (current diff) 3ff25aafdb4e (diff) |
| children | 7d0d066329f4 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 7 files changed, 65 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 04 15:47:08 2020 +0100 +++ b/.hgtags Wed Mar 04 17:49:58 2020 +0100 @@ -84,3 +84,4 @@ 40795751be1c329ec23202ecd79ba45623e1df66 9.2.0 d989bab720e5f7638a9e58fda76cf3f4b40d0611 9.2.1 ef41094c34e162eb32ef24bf66d9776d1112751a 9.2.2 +583dc6ef3eb21fbf6574021136f32b8a1163506c 9.3.0
--- a/CHANGELOG Wed Mar 04 15:47:08 2020 +0100 +++ b/CHANGELOG Wed Mar 04 17:49:58 2020 +0100 @@ -1,19 +1,27 @@ Changelog ========= -9.3.0 - in progress +9.3.0 -- 2020-03-04 ------------------- + * compat: compatibility with Mercurial 5.3 + * compat: drop compatibility with Mercurial 4.5 + * compat: cleanup old compatibility code for Mercurial < 4.5 + * evolve: extensive cleanup of functions, template keywords and compatibility code related to obsfate and successorssets + * evolve: add content divergence checking to the standard pre-rewrite check + * evolve: improve the message associated with content divergence + * evolve: correctly handle --continue and --stop when relocating + content-divergent changesets + * exchange: dropped more bundle-1 related dead code + * help: categorizing evolve and topic commands + * obslog: make templatable * obslog: show folds and use more specific verbs when possible - * compat: cleanup some compatibility code for mercurial < 4.5 - * compat: compatibility with some changes of the upcoming Mercurial 5.3 - * evolve: add content divergence checking to the standard pre-rewrite check, - * evolve: improve the message associated with content divergence. + * topic: add a `experimental.topic.server-gate-topic-changesets` config 9.2.2 -- 2020-01-31
--- a/debian/changelog Wed Mar 04 15:47:08 2020 +0100 +++ b/debian/changelog Wed Mar 04 17:49:58 2020 +0100 @@ -1,3 +1,9 @@ +mercurial-evolve (9.3.0-1) unstable; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Wed, 04 Mar 2020 16:47:58 +0100 + mercurial-evolve (9.2.2-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/metadata.py Wed Mar 04 15:47:08 2020 +0100 +++ b/hgext3rd/evolve/metadata.py Wed Mar 04 17:49:58 2020 +0100 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = b'9.3.0.dev' -testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' -minimumhgversion = b'4.5' +__version__ = b'9.4.0.dev' +testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' +minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Wed Mar 04 15:47:08 2020 +0100 +++ b/hgext3rd/topic/__init__.py Wed Mar 04 17:49:58 2020 +0100 @@ -202,10 +202,10 @@ b'topic.active': b'green', } -__version__ = b'0.18.0.dev' +__version__ = b'0.19.0.dev' -testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' -minimumhgversion = b'4.5' +testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' +minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/' if util.safehasattr(registrar, 'configitem'):
--- a/hgext3rd/topic/server.py Wed Mar 04 15:47:08 2020 +0100 +++ b/hgext3rd/topic/server.py Wed Mar 04 17:49:58 2020 +0100 @@ -10,9 +10,15 @@ wireprotov1server, ) -from mercurial.utils import ( - repoviewutil, -) + +try: + from mercurial.utils import ( + repoviewutil, + ) + repoviewutil.subsettable +except (AttributeError, ImportError): + # hg <= 4.8 + from mercurial import branchmap as repoviewutil from . import ( common, @@ -44,6 +50,7 @@ if cl.changelogrevision(r).extra.get(constants.extrakey, b''): extrafiltered.add(r) if extrafiltered: + extrafiltered = set(repo.revs('%ld::%ld', extrafiltered, consider)) filteredrevs = frozenset(filteredrevs | extrafiltered) return filteredrevs
--- a/tests/test-topic-server.t Wed Mar 04 15:47:08 2020 +0100 +++ b/tests/test-topic-server.t Wed Mar 04 17:49:58 2020 +0100 @@ -99,6 +99,15 @@ $ echo c > c $ hg commit -Am 'adding c (no topic)' adding c + $ hg up some-work + switching to topic some-work + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg topic --clear + $ echo d > d + $ hg commit -Am 'adding d (no topic)' + adding d + created new head + (consider using topic for lightweight branches. See 'hg help topic') $ hg log -r 'all() - 0' changeset: 1:2a2e8b3520f2 topic: some-work @@ -107,12 +116,18 @@ summary: adding b (topic) changeset: 2:b46feb4d24f9 - tag: tip parent: 0:6569b5a81c7e user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: adding c (no topic) + changeset: 3:be22ca6e89ea + tag: tip + parent: 1:2a2e8b3520f2 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: adding d (no topic) + (disable the bare publishing to put a bare draft on the server) @@ -120,16 +135,16 @@ > [experimental] > topic.publish-bare-branch = no > EOF - $ hg push + $ hg push --force pushing to ssh://user@dummy/server searching for changes remote: adding changesets remote: adding manifests remote: adding file changes - remote: added 2 changesets with 2 changes to 2 files (+1 heads) + remote: added 3 changesets with 3 changes to 3 files (+1 heads) $ cd .. $ hg --cwd server phase -r 'tip' - 2: draft + 3: draft Clients with topic can exchange draft changesets both with and without a topic through the server @@ -139,9 +154,9 @@ adding changesets adding manifests adding file changes - added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets 2a2e8b3520f2:b46feb4d24f9 (2 drafts) - (run 'hg heads' to see heads) + added 3 changesets with 3 changes to 3 files (+1 heads) + new changesets 2a2e8b3520f2:be22ca6e89ea (3 drafts) + (run 'hg heads' to see heads, 'hg merge' to merge) $ hg --cwd client-topic2 log -r 'all() - 0' changeset: 1:2a2e8b3520f2 topic: some-work @@ -150,12 +165,18 @@ summary: adding b (topic) changeset: 2:b46feb4d24f9 - tag: tip parent: 0:6569b5a81c7e user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: adding c (no topic) + changeset: 3:be22ca6e89ea + tag: tip + parent: 1:2a2e8b3520f2 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: adding d (no topic) + Client without topic only sees draft changesets if they don't have a topic