evolve merge requestshttps://foss.heptapod.net/mercurial/evolve/-/merge_requests2024-02-08T17:27:06Zhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/559compat: Handle case where opts are None for <= 6.52024-02-08T17:27:06ZZeger Van de Vannetcompat: Handle case where opts are None for <= 6.5fix for https://bz.mercurial-scm.org/show_bug.cgi?id=6865
encountered when doing a backout on a changeset in a topic
mercurial version 6.5.1fix for https://bz.mercurial-scm.org/show_bug.cgi?id=6865
encountered when doing a backout on a changeset in a topic
mercurial version 6.5.1https://foss.heptapod.net/mercurial/evolve/-/merge_requests/547topic: return our special executor classes for each instance2024-01-17T18:00:23ZAnton Shestakovtopic: return our special executor classes for each instanceIt looks like globally patching classes once when the extension is being
initialized is not a great idea, because people might use other extensions that
get initialized earlier than topic or only for certain repos. Replacing global
execu...It looks like globally patching classes once when the extension is being
initialized is not a great idea, because people might use other extensions that
get initialized earlier than topic or only for certain repos. Replacing global
executor classes is less safe than wrapping certain functions that should
return newly instantiated objects of said classes, so let's do that instead.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/519Draft: drop fishy code ?2023-08-30T03:11:21ZPierre-Yves DavidDraft: drop fishy code ?Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/524evolve: fix docstring of _markerseffects()2023-08-26T18:55:53ZAnton Shestakovevolve: fix docstring of _markerseffects()This block of text doesn't apply to the function, it seems to be just an
artifact of copy-pasting.This block of text doesn't apply to the function, it seems to be just an
artifact of copy-pasting.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/499evolve: retain extras when relocating a commit2023-04-07T22:39:43ZJason R. Coombsevolve: retain extras when relocating a commitFrom one commit:
> Building on https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/511, this change addresses the regression introduced in !458 when evolve stopped including extras when relocating commits for evolve. It ...From one commit:
> Building on https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/511, this change addresses the regression introduced in !458 when evolve stopped including extras when relocating commits for evolve. It restores the retention of extras for graft (same as rebase) but also provides an extension point where downstream users might extend the list of extras to be retained.Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/491Draft: WIP tns: report changes in a transaction2023-03-29T17:15:14ZAnton ShestakovDraft: WIP tns: report changes in a transactionPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/496compat: Fix AttributeError when precheck wrapped in partial.2023-03-20T23:42:49ZJason R. Coombscompat: Fix AttributeError when precheck wrapped in partial.If corerewriteutil.precheck was extended/patched, it fails with `functools.partial has no attribute '__code__'` (or similar). This change revisits this compatibility mechanism. It turns out that d4752aeb20f1 added the `check_divergence` ...If corerewriteutil.precheck was extended/patched, it fails with `functools.partial has no attribute '__code__'` (or similar). This change revisits this compatibility mechanism. It turns out that d4752aeb20f1 added the `check_divergence` parameter, so check for that directly and simply use the built-in version if it has that interface. If it doesn't, fall back to the compatibility function. d90f6237 appears not to be relevant.Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/487ci: also build .deb package for tagged releases automatically2023-02-14T14:33:07ZAnton Shestakovci: also build .deb package for tagged releases automaticallyThe 2 rules (yes, it's not just one) say that if commit has a tag associated
with it, create this job with default condition (i.e. on_success, which runs it
automatically if the previous stage succeeds). Otherwise create this job, but
on...The 2 rules (yes, it's not just one) say that if commit has a tag associated
with it, create this job with default condition (i.e. on_success, which runs it
automatically if the previous stage succeeds). Otherwise create this job, but
only run it manually.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/482Draft: topic: simply reuse wirepeer.branchmap() as wirepeer.branchmaptns()2023-02-06T12:43:50ZAnton ShestakovDraft: topic: simply reuse wirepeer.branchmap() as wirepeer.branchmaptns()The function is just parsing bytes into a dict. In this way, branchmap and
branchmaptns are completely compatible.
The only downside is that wirepeer.branchmaptns doesn't get proper function
name, so if someone needs to debug this, they...The function is just parsing bytes into a dict. In this way, branchmap and
branchmaptns are completely compatible.
The only downside is that wirepeer.branchmaptns doesn't get proper function
name, so if someone needs to debug this, they might still see
"wirepeer.branchmap" in certain places even if we're calling branchmaptns.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/447Draft: topic namespaces exchange2022-07-26T23:40:16ZAnton ShestakovDraft: topic namespaces exchangePierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/42210.5.0: stable and default2022-02-24T05:38:24ZAnton Shestakov10.5.0: stable and default--HG--
branch : stable--HG--
branch : stablePierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/353add labels to messages in evolve and topic, reword some of them2022-02-11T16:14:47ZAnton Shestakovadd labels to messages in evolve and topic, reword some of themAnton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/313pick-with-topic test coverage and a bug fix2021-10-13T09:38:24ZSushil Khanchipick-with-topic test coverage and a bug fixSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/212evolve: make sure we always pick min revision to solve content-div2021-05-20T07:48:55ZSushil Khanchievolve: make sure we always pick min revision to solve content-divSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/189Topic/default/khanchi fix divergence resolution case to rebase divergent cset...2021-03-01T13:32:47ZSushil KhanchiTopic/default/khanchi fix divergence resolution case to rebase divergent cset backwardSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/260khanchi-gca refactoring2021-03-01T12:43:36ZSushil Khanchikhanchi-gca refactoringSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/308compat: correctly force a module import in the strip backcompat code2021-02-01T14:27:26ZIan Moodycompat: correctly force a module import in the strip backcompat codeJust calling strip without accessing anything inside the module doesn't
actually trigger the ImportError on older versions if demandimport is active,
so they end up setting debugstrip as the command to wrap, and then dying with
"UnknownC...Just calling strip without accessing anything inside the module doesn't
actually trigger the ImportError on older versions if demandimport is active,
so they end up setting debugstrip as the command to wrap, and then dying with
"UnknownCommand: ('debugstrip', [...etc])".
See https://bugzilla.mozilla.org/show_bug.cgi?id=1689647
--HG--
branch : stableIan MoodyIan Moodyhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/238WIP: rewind improvements WIP2020-12-22T11:08:38ZAnton ShestakovWIP: rewind improvements WIPWIPWIPhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/118build: make docs/conf.py compatible with py32020-11-25T14:12:40ZMartin von Zweigbergkbuild: make docs/conf.py compatible with py3I don't even know what this file does, but it made our Debian build
fail on py3 because it attempted to pass unicode to
`mercurial.ui.setconfig()`.I don't even know what this file does, but it made our Debian build
fail on py3 because it attempted to pass unicode to
`mercurial.ui.setconfig()`.https://foss.heptapod.net/mercurial/evolve/-/merge_requests/280Build docs on py32020-11-25T14:07:41ZAnton ShestakovBuild docs on py3This should finally work without requiring anything weird.
Previously on this issue: !118 and !194This should finally work without requiring anything weird.
Previously on this issue: !118 and !194Anton ShestakovAnton Shestakov