martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
As we found out the hard way (thanks to spectral@ for figuring it
out!), `cmdutil.revert()`'s `parents` argument must be
I've used hg-git in the past with success, likely with a Python 2
mercurial.
These days I've got Python 3.8.5 and have not found a working
mercurial/hg-git combination which works. I'll show a traceback with my
current setup lower down.
I'd be happy(-ish) to install a special purpose
On 8/10/20 3:42 PM, Marcin Kasperski wrote:
All my extensions, including mercurial_all_dirs and mercurial_all_paths,
were formally tested against mercurial 5.4. Please verify versions you
use (+ verify version of mercurial_extension_utils module which is there
to shield extensions from
6 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/3c783ff08d40
changeset: 45346:3c783ff08d40
user:Pulkit Goyal <7895pul...@gmail.com>
date:Wed Aug 05 16:00:25 2020 +0530
summary: mergeresult: introduce filemap() which yields filename based
mapping
>>> "MK" == Marcin Kasperski writes:
>> > All my extensions, including mercurial_all_dirs and mercurial_all_paths,
>> > were formally tested against mercurial 5.4. Please verify versions you
>> > use (+ verify version of mercurial_extension_utils module which is there
>> > to shield
23 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/aea6a812f7cb
changeset: 45323:aea6a812f7cb
user:Pierre-Yves David
date:Sat Jul 25 15:49:12 2020 +0200
summary: commitctx: return a richer object from _prepare_files
> On Jul 29, 2020, at 12:57, Pierre-Yves David
> wrote:
>
> # HG changeset patch
> # User Pierre-Yves David
> # Date 1595684952 -7200
> # Sat Jul 25 15:49:12 2020 +0200
> # Node ID 88cc2b7a810243e8c101933fd99778ce772ac316
> # Parent 6b4ada6dca3ff5591c5dea32ffbe2fa22f4e5ed7
> #
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
Some requirements like the SPARSE_REQUIREMENT is working directory specific
and
cannot be shared. We add a set which will contain all these requirements.
> > All my extensions, including mercurial_all_dirs and mercurial_all_paths,
> > were formally tested against mercurial 5.4. Please verify versions you
> > use (+ verify version of mercurial_extension_utils module which is there
> > to shield extensions from various incompatibilities).
>
>
> (…)
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
Storing that a file is resolved for the other parent while merging is just one
case of things we will like to store in the mergestate. There are more which
we
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
There is a set of information related to a merge which is needed on commit. We
want to store such information in the mergestate so that we can read it while
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
This makes code little bit nicer as we directly update information in the
mergeresult object instead of building up a dict first and then setting it.
REPOSITORY
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
We will be storing info from mergeresult.commitinfo to mergestate._stateextras
in upcoming patches, let's make them use same structure so that we don't have
to
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
I want to use this _stateextras more in upcoming patches to store some commit
time related information. Using defaultdict will help in cleaner code around
14 matches
Mail list logo