[PATCH 9 of 9 V2] merge: store cases when a file is absent post merge in commitinfo

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598263534 -19800 # Mon Aug 24 15:35:34 2020 +0530 # Node ID 7331100f93338574bf3e289fef3e622fd16859a5 # Parent 2194dc931f08e7682f75054c7bb1754ea43d504a # EXP-Topic merge-newnode merge: store cases when a file is

[PATCH 8 of 9 V2] tests: add some more debugmergestate calls in `test-merge-criss-cross.t`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600076295 -19800 # Mon Sep 14 15:08:15 2020 +0530 # Node ID 2194dc931f08e7682f75054c7bb1754ea43d504a # Parent b05428173685e1101e1968ce7c35b6e5c2f76a0d # EXP-Topic merge-newnode tests: add some more debugmergestate

[PATCH 7 of 9 V2] commit: force create a new filenode if it was set in mergestate by merge

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599121694 -19800 # Thu Sep 03 13:58:14 2020 +0530 # Node ID b05428173685e1101e1968ce7c35b6e5c2f76a0d # Parent 5a6f126f9a019e5a5c6af1a245275f4010530c85 # EXP-Topic merge-newnode commit: force create a new fi

[PATCH 6 of 9 V2] merge: store commitinfo if these is a dc or cd conflict

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599120846 -19800 # Thu Sep 03 13:44:06 2020 +0530 # Node ID 5a6f126f9a019e5a5c6af1a245275f4010530c85 # Parent e85a8500a0ba6cec21b84ff13c4558c1bcc64e2d # EXP-Topic merge-newnode merge: store commitinfo if these i

[PATCH 5 of 9 V2] mergestate: update _stateextras instead of reassinging

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1601022485 -19800 # Fri Sep 25 13:58:05 2020 +0530 # Node ID e85a8500a0ba6cec21b84ff13c4558c1bcc64e2d # Parent 233d09a66ddf9f4a5bc4cd85588afc47e211b778 # EXP-Topic merge-newnode mergestate: update _stateextras i

[PATCH 4 of 9 V2] tests: add some debugmergestate calls in `test-merge-criss-cross.t`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600072905 -19800 # Mon Sep 14 14:11:45 2020 +0530 # Node ID 233d09a66ddf9f4a5bc4cd85588afc47e211b778 # Parent 4f4ac62ec41634a570aef2d3b1e6dc44578c762d # EXP-Topic merge-newnode tests: add some debugmergestate

[PATCH 1 of 9 V2] configitems: add a new config option to control new filenode functionality

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600074083 -19800 # Mon Sep 14 14:31:23 2020 +0530 # Node ID 2459a55b887107613818e0d968ef80748dafaadb # Parent abad925af2ef488ecbe43d2d1e2d341ddcf2096a # EXP-Topic merge-newnode configitems: add a new config

[PATCH 3 of 9 V2] tests: add few debugrevlogindex and a log call to see changes in next test

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599121486 -19800 # Thu Sep 03 13:54:46 2020 +0530 # Node ID 4f4ac62ec41634a570aef2d3b1e6dc44578c762d # Parent 0fa4c552709af5063f1a07630e64785048ab3735 # EXP-Topic merge-newnode tests: add few debugrevlogindex and

[PATCH 2 of 9 V2] merge: disable `m2-vs-ma` optimization if new filenode config is true

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600074612 -19800 # Mon Sep 14 14:40:12 2020 +0530 # Node ID 0fa4c552709af5063f1a07630e64785048ab3735 # Parent 2459a55b887107613818e0d968ef80748dafaadb # EXP-Topic merge-newnode merge: disable `m2-vs-ma` optimi

[PATCH 9 of 9] merge: store cases when a file is absent post merge in commitinfo

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598263534 -19800 # Mon Aug 24 15:35:34 2020 +0530 # Node ID d017b2b74022778a9de3fbf25d70195b6ddd06a4 # Parent ef85c4b4cc2e005392b121c8aa509b440d52482c # EXP-Topic merge-newnode merge: store cases when a file is

[PATCH 7 of 9] commit: force create a new filenode if it was set in mergestate by merge

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599121694 -19800 # Thu Sep 03 13:58:14 2020 +0530 # Node ID 030dc3c0e2c15dfe74c5727b4bd9afe39bc97c5e # Parent 30332428d8b0233053742be0c27bcb3e6499ed15 # EXP-Topic merge-newnode commit: force create a new fi

[PATCH 8 of 9] tests: add some more debugmergestate calls in `test-merge-criss-cross.t`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600076295 -19800 # Mon Sep 14 15:08:15 2020 +0530 # Node ID ef85c4b4cc2e005392b121c8aa509b440d52482c # Parent 030dc3c0e2c15dfe74c5727b4bd9afe39bc97c5e # EXP-Topic merge-newnode tests: add some more debugmergestate

[PATCH 5 of 9] tests: add some debugmergestate calls in `test-merge-criss-cross.t`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600072905 -19800 # Mon Sep 14 14:11:45 2020 +0530 # Node ID 62404f1a66ec45ca819d411746138894dcab6e91 # Parent ef3e8f2050103f8c9fff9654ee20e7b401c42fcf # EXP-Topic merge-newnode tests: add some debugmergestate

[PATCH 6 of 9] merge: store commitinfo if mergetool resolved a dc or cd conflict

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599120846 -19800 # Thu Sep 03 13:44:06 2020 +0530 # Node ID 30332428d8b0233053742be0c27bcb3e6499ed15 # Parent 62404f1a66ec45ca819d411746138894dcab6e91 # EXP-Topic merge-newnode merge: store commitinfo if mer

[PATCH 4 of 9] tests: add few debugrevlogindex and a log call to see changes in next test

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599121486 -19800 # Thu Sep 03 13:54:46 2020 +0530 # Node ID ef3e8f2050103f8c9fff9654ee20e7b401c42fcf # Parent 967306618158321fb9367c02fe12d1fe52aacb29 # EXP-Topic merge-newnode tests: add few debugrevlogindex and

[PATCH 3 of 9] merge: check new filenode creation config before disabling optimization

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600074612 -19800 # Mon Sep 14 14:40:12 2020 +0530 # Node ID 967306618158321fb9367c02fe12d1fe52aacb29 # Parent 2f20d3b618ac474fd9341b86fa4f8e5791b66290 # EXP-Topic merge-newnode merge: check new filenode creation

[PATCH 1 of 9] scmutil: introduce function to check whether repo uses treemanifest or not

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598963904 -19800 # Tue Sep 01 18:08:24 2020 +0530 # Node ID 172ab535796f7cc34ef113a73aa95eb50aaf3f31 # Parent 93c43a480bf0851999abcb99914f3c23846f34c1 # EXP-Topic merge-newnode scmutil: introduce function to

[PATCH 2 of 9] configitems: add a new config option to control new filenode functionality

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600074083 -19800 # Mon Sep 14 14:31:23 2020 +0530 # Node ID 2f20d3b618ac474fd9341b86fa4f8e5791b66290 # Parent 172ab535796f7cc34ef113a73aa95eb50aaf3f31 # EXP-Topic merge-newnode configitems: add a new config

[PATCH] scmutil: introduce function to check whether repo uses treemanifest or not

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598963904 -19800 # Tue Sep 01 18:08:24 2020 +0530 # Node ID 172ab535796f7cc34ef113a73aa95eb50aaf3f31 # Parent 93c43a480bf0851999abcb99914f3c23846f34c1 # EXP-Topic merge-newnode scmutil: introduce function to

[PATCH 2 of 2 V3] mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600259972 -19800 # Wed Sep 16 18:09:32 2020 +0530 # Node ID 93c43a480bf0851999abcb99914f3c23846f34c1 # Parent dad7218328fc44f0706f9b6e33f3f9a50e439330 # EXP-Topic merge-newnode mergestate: define NO_OP_ACTION in

[PATCH 1 of 2 V3] mergestate: introduce a new ACTION_KEEP_NEW

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599650359 -19800 # Wed Sep 09 16:49:19 2020 +0530 # Node ID dad7218328fc44f0706f9b6e33f3f9a50e439330 # Parent e7587430ca239f3e7a148359063548b55415c919 # EXP-Topic merge-newnode mergestate: introduce a new ACTION_KE

D9047: dispatch: load shared source repository config in share-safe mode

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It seems to me now that there are two steps when config is loaded: 1. on dispatch 2. repository object creation Recent patches added functionality that

D9046: tests: add test showing broken extension loading in case of share-safe

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY When we are using share-safe and loading source repository config, we are still not loading the extensions which are enabled in the source repository. This

Re: [PATCH] share: do not write working-copy requirements twice

On Fri, Sep 18, 2020 at 5:36 PM Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1600427992 -32400 > # Fri Sep 18 20:19:52 2020 +0900 > # Node ID a8843eda9a35e4880dda58f59be42823e1078308 > # Parent c7fe0dfb53122bb72ff7e1fab75f2eec28b1883c > share: do not

D9045: tests: update test-share-safe to work with pure-python versions

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY zstd is not available on pure-python versions. Hence we need to wrap that part around `#if no-pure`. To make sure the functionality is tested on pure version

[PATCH FOLLOWUP] mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600259972 -19800 # Wed Sep 16 18:09:32 2020 +0530 # Node ID dfb65ba955b4fddf86dd79cf8263989eb905ee3d # Parent bf0ed472c2b88c2fdf60a8c3c4aa3cd58a3a258c # EXP-Topic merge-newnode mergestate: define NO_OP_ACTION in

[PATCH FOLLOWUP] mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600259972 -19800 # Wed Sep 16 18:09:32 2020 +0530 # Node ID 4a8f91ffee31a6728d762f88e511290c063b4750 # Parent 1225dec40bff937c0b51b41e3d6a349aaf6b # EXP-Topic merge-newnode mergestate: define NO_OP_ACTION in

Re: [PATCH 1 of 5] grep: clarify that --all works exactly the same way as --diff

On Fri, Sep 18, 2020 at 3:30 PM Yuya Nishihara wrote: > > On Thu, 17 Sep 2020 19:13:19 -0700, Gregory Szorc wrote: > > Nevermind: looks like https://phab.mercurial-scm.org/D9030 fixes this. I > > have this in my local queue and will push shortly. > > Apparently my stable patch wasn't queued yet.

Re: [PATCH] store: remove unnecessary copying on requires file

On Thu, Sep 17, 2020 at 4:34 PM Yuya Nishihara wrote: > > On Wed, 16 Sep 2020 18:45:15 +0530, Pulkit Goyal wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1597134985 -19800 > > # Tue Aug

Re: [PATCH 1 of 3 V2] merge: check for dir rename dest before adding ACTION_KEEP

On Thu, Sep 17, 2020 at 4:34 PM Yuya Nishihara wrote: > > On Wed, 16 Sep 2020 18:43:46 +0530, Pulkit Goyal wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1599034669 -19800 > > # Wed Sep

[PATCH] tests: run test-check-py3-compat only in pure python mode

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600337839 -19800 # Thu Sep 17 15:47:19 2020 +0530 # Node ID ffb75b6030ab7a4043ecd24c3e9355ec33f4d4fd # Parent 5f0eeda2005d986d02c702961813170d97f1e399 # EXP-Topic test-fix tests: run test-check-py3-compat only i

D9029: tests: add some more debugmergestate calls in `test-merge-criss-cross.t`

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9029 AFFECTED FILES tests/test-merge-criss-cross.t CHANGE DETAILS diff --git

D9028: tests: add some debugmergestate calls in `test-merge-criss-cross.t`

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will help notice the change in upcoming patches much better. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9027: merge: check new filenode creation config before disabling optimization

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Let's make sure that the config is also enabled before disabling the `m2-vs-ma` optimization. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D9026: configitems: add a new config option to control new filenode functionality

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This series is adding functionality where we can force create a new filenode for some files on a merge-commit. This is meant to represent an explicit choice

D9025: mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This makes sure it isn't intended to be overridden by subclasses. Thanks to Yuya for the nice suggestion. REPOSITORY rHG Mercurial BRANCH default REVISION

[PATCH] store: remove unnecessary copying on requires file

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1597134985 -19800 # Tue Aug 11 14:06:25 2020 +0530 # Node ID ed13c879d4d46075d76d7b4e2d7a5c3995a44e20 # Parent bd56597b225455b1d34501c043e36e62c1aa4748 # EXP-Topic refactor store: remove unnecessary copying on re

[PATCH 3 of 3 V2] mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600259972 -19800 # Wed Sep 16 18:09:32 2020 +0530 # Node ID 6552f998d7177837e68033ff667e4075a1608c63 # Parent 1225dec40bff937c0b51b41e3d6a349aaf6b # EXP-Topic merge-newnode mergestate: define NO_OP_ACTION in

[PATCH 2 of 3 V2] mergestate: introduce a new ACTION_KEEP_NEW

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599650359 -19800 # Wed Sep 09 16:49:19 2020 +0530 # Node ID 1225dec40bff937c0b51b41e3d6a349aaf6b # Parent 72edc2d86f6524d1d65f33e49cdb46606826200f # EXP-Topic merge-newnode mergestate: introduce a new ACTION_KE

[PATCH 1 of 3 V2] merge: check for dir rename dest before adding ACTION_KEEP

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599034669 -19800 # Wed Sep 02 13:47:49 2020 +0530 # Node ID 72edc2d86f6524d1d65f33e49cdb46606826200f # Parent 4f27ca3ef97d8372b9bb288bd8102460d372d160 # EXP-Topic merge-newnode merge: check for dir rename dest

Re: [PATCH 1 of 3] log: reorganize if-else and for loop in logcmdutil._makematcher()

On Mon, Sep 14, 2020 at 6:58 PM Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1599804538 -32400 > # Fri Sep 11 15:08:58 2020 +0900 > # Node ID 306c09f80dd9659aa9f0eebe1baa328afa3b7977 > # Parent 4532e7ebde4d9eb5011b78fb537879bcc67b30c4 > log: reorganize

Re: ShareSafePlan

On Wed, Sep 16, 2020 at 4:20 AM Martin von Zweigbergk wrote: > > > > On Tue, Sep 15, 2020 at 12:34 PM Pierre-Yves David > wrote: >> >> >> >> On 9/15/20 7:35 PM, Martin von Zweigbergk via Mercurial-devel wrote: >> > I read https://www.mercurial-scm.org/wiki/ShareSafePlan. It has >> > examples of

[PATCH V3] merge: show list of bids for each file in bid-merge in ui.debug()

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598442653 -19800 # Wed Aug 26 17:20:53 2020 +0530 # Node ID be084d2cbcd0681bf9654a39331502a3b1689142 # Parent d2b5a7659fff465286c7a1a451f0ebfe7118f251 # EXP-Topic merge-newnode merge: show list of bids for eac

[PATCH 8 of 8] mergestate: introduce a new ACTION_KEEP_NEW

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599650359 -19800 # Wed Sep 09 16:49:19 2020 +0530 # Node ID d5e63af55451c06b706484f1ba5ee589bfc8f26c # Parent a6378fd3a90effdd150f94f4da8266687276e0e4 # EXP-Topic merge-newnode mergestate: introduce a new ACTION_KE

[PATCH 7 of 8] merge: check for dir rename dest before adding ACTION_KEEP

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599034669 -19800 # Wed Sep 02 13:47:49 2020 +0530 # Node ID a6378fd3a90effdd150f94f4da8266687276e0e4 # Parent 21f520670eb08917eeb5fcf11c75cc1dfb242530 # EXP-Topic merge-newnode merge: check for dir rename dest

[PATCH 6 of 8] merge: update commitinfo from all mergeresults during bid merge

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598440043 -19800 # Wed Aug 26 16:37:23 2020 +0530 # Node ID 21f520670eb08917eeb5fcf11c75cc1dfb242530 # Parent 9be2d61f80be6059bcdc890bfb889d0a9670dbda # EXP-Topic merge-newnode merge: update commitinfo fr

[PATCH 5 of 8] merge: add missing ACTION_KEEP when both remote and ancestor are not present

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598269948 -19800 # Mon Aug 24 17:22:28 2020 +0530 # Node ID 9be2d61f80be6059bcdc890bfb889d0a9670dbda # Parent 8c918c4872a151ba17e744c6a7a4610fef8f16b3 # EXP-Topic merge-newnode merge: add missing ACTION_KEEP whe

[PATCH 4 of 8] merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598262609 -19800 # Mon Aug 24 15:20:09 2020 +0530 # Node ID 8c918c4872a151ba17e744c6a7a4610fef8f16b3 # Parent 2c58747e0a1ebe17b6bf1f4f393da2be57bce63a # EXP-Topic merge-newnode merge: store ACTION_KEEP_ABSENT w

[PATCH 3 of 8] merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598960306 -19800 # Tue Sep 01 17:08:26 2020 +0530 # Node ID 2c58747e0a1ebe17b6bf1f4f393da2be57bce63a # Parent cfabb1ccdf7a2cb67bb2819f798bad53c6aac977 # EXP-Topic merge-newnode merge: add `ACTION_KEEP_

[PATCH 2 of 8] mergeresult: introduce dedicated tuple for no-op actions

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600071699 -19800 # Mon Sep 14 13:51:39 2020 +0530 # Node ID cfabb1ccdf7a2cb67bb2819f798bad53c6aac977 # Parent eab095687e7b655011a26001dc83c802ab474ceb # EXP-Topic merge-newnode mergeresult: introduce dedicated

[PATCH 1 of 8] tests: add criss cross merging tests whose behavior need to be fixed

# HG changeset patch # User Pierre-Yves David # Date 1592566066 -7200 # Fri Jun 19 13:27:46 2020 +0200 # Node ID eab095687e7b655011a26001dc83c802ab474ceb # Parent 6df7dc3e9c3578587c96f244b685d284d114f732 # EXP-Topic merge-newnode tests: add criss cross merging tests whose behavior need to

[PATCH V2] merge: show list of bids for each file in bid-merge in ui.debug()

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598442653 -19800 # Wed Aug 26 17:20:53 2020 +0530 # Node ID 7f605a79653a170cbf028192e1b2b5deb2f0d9b7 # Parent d2b5a7659fff465286c7a1a451f0ebfe7118f251 # EXP-Topic merge-newnode merge: show list of bids for eac

Re: [PATCH 2 of 5] merge: show list of bids for each file in bid-merge in ui.note()

On Sat, Sep 12, 2020 at 8:31 AM Yuya Nishihara wrote: > > On Fri, 11 Sep 2020 12:35:30 +0530, Pulkit Goyal wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1598442653 -19800 > > # Wed Aug

Re: [PATCH 5 of 5] merge: move initial handling of mergeactions near to later one

On Sat, Sep 12, 2020 at 8:31 AM Yuya Nishihara wrote: > > On Fri, 11 Sep 2020 12:35:33 +0530, Pulkit Goyal wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1599119729 -19800 > > # Thu Sep

Re: [PATCH 2 of 2] tags: take lock while writing `tags2` cache

On Sat, Sep 12, 2020 at 8:31 AM Yuya Nishihara wrote: > > On Fri, 11 Sep 2020 12:34:01 +0530, Pulkit Goyal wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1599727895 -19800 > > # Thu Sep

Re: [PATCH STABLE] py3: fix formatting of LookupError for workingctx

On Sun, Sep 13, 2020 at 2:02 PM Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1599980363 -32400 > # Sun Sep 13 15:59:23 2020 +0900 > # Branch stable > # Node ID 63842da54dde663b9227ca4c5e7615649073303c > # Parent d4a83a7d132ace8e3cfe366d9ef56fb99f26ffab >

Re: [PATCH 1 of 5] largefiles: remove unused 'rev' parameter from downloadlfiles()

On Sun, Sep 13, 2020 at 3:57 PM Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1599788837 -32400 > # Fri Sep 11 10:47:17 2020 +0900 > # Node ID ff5371cc36edbe4bce8f0bb8514763ced1c8da6e > # Parent 4668766a0dac96ceb1fa27e32890889a893d5695 > largefiles: remove

[PATCH 5 of 5] merge: move initial handling of mergeactions near to later one

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599119729 -19800 # Thu Sep 03 13:25:29 2020 +0530 # Node ID c48ee69a8c7202517cade973b3abe3715bfc3c5e # Parent 8abe98dc3e3c020566d64ac3f3b802de2751d55f # EXP-Topic merge-newnode merge: move initial ha

[PATCH 4 of 5] debugmergestate: sort extras before printing

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599124516 -19800 # Thu Sep 03 14:45:16 2020 +0530 # Node ID 8abe98dc3e3c020566d64ac3f3b802de2751d55f # Parent 4e5bb80a831d8201e3407cf78721b8d2d236b74d # EXP-Topic merge-newnode debugmergestate: sort extras

[PATCH 3 of 5] merge: show number of ancestors in bid merge debug notes

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598442862 -19800 # Wed Aug 26 17:24:22 2020 +0530 # Node ID 4e5bb80a831d8201e3407cf78721b8d2d236b74d # Parent 76753724e6b5453d9540c73b1a1a6f11de818e46 # EXP-Topic merge-newnode merge: show number of ancestors

[PATCH 1 of 5] debugmergestate: show extras for files which are not in mergestate

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598275759 -19800 # Mon Aug 24 18:59:19 2020 +0530 # Node ID c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf # Parent c889e1fddc190ff73265939965706b2dd0bfec3b # EXP-Topic merge-newnode debugmergestate: show extras for

[PATCH 2 of 5] merge: show list of bids for each file in bid-merge in ui.note()

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598442653 -19800 # Wed Aug 26 17:20:53 2020 +0530 # Node ID 76753724e6b5453d9540c73b1a1a6f11de818e46 # Parent c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf # EXP-Topic merge-newnode merge: show list of bids for eac

[PATCH V2] commit: pass mergestate into _filecommit() instead of re-reading it

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599122644 -19800 # Thu Sep 03 14:14:04 2020 +0530 # Node ID c889e1fddc190ff73265939965706b2dd0bfec3b # Parent 64de86fd0984ff1e2306de52849be7ebf7dcfd25 # EXP-Topic merge-newnode commit: pass mergestate into _file

[PATCH 2 of 2] tags: take lock while writing `tags2` cache

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599727895 -19800 # Thu Sep 10 14:21:35 2020 +0530 # Node ID 3eae3d3a1b44b0fe10e00766e1113c50d48ed086 # Parent 3095d36efcaf9ce835249c9312e892b0d54aac78 # EXP-Topic tags-fix tags: take lock while writing `tags2`

[PATCH 1 of 2] tests: update lockdelay.py to handle the `wait` argument

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599736900 -19800 # Thu Sep 10 16:51:40 2020 +0530 # Node ID 3095d36efcaf9ce835249c9312e892b0d54aac78 # Parent 64de86fd0984ff1e2306de52849be7ebf7dcfd25 # EXP-Topic tags-fix tests: update lockdelay.py to handle the

[PATCH] git: remove unrequired assignment of listignored and listunknown

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599737618 -19800 # Thu Sep 10 17:03:38 2020 +0530 # Node ID bb9c58334a8313684c023e87321095b5a94fa2a1 # Parent e47385ef4e1713a95db194bde7e28461fd8d987b # EXP-Topic test-fixes git: remove unrequired assi

[PATCH 3 of 3 V2] tags: take lock instead of wlock before writing hgtagsfnodes1 cache

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599574000 -19800 # Tue Sep 08 19:36:40 2020 +0530 # Node ID db5aaebba7f2b947baf84c31a82c305202572d66 # Parent 2236c304b8ad360333ee125aa777316628d1e3d5 # EXP-Topic tags-fix tags: take lock instead of wlock before w

[PATCH 2 of 3 V2] statichttprepo: use LockUnavailable() instead of Abort() for lock (API)

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599725255 -19800 # Thu Sep 10 13:37:35 2020 +0530 # Node ID 2236c304b8ad360333ee125aa777316628d1e3d5 # Parent 5ecbecdc0aa49eb6a3878e01f8aa99417602b957 # EXP-Topic tags-fix statichttprepo: use LockUnavailable() i

[PATCH 1 of 3 V2] localrepo: warn if we are writing to cache without a lock

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599570961 -19800 # Tue Sep 08 18:46:01 2020 +0530 # Node ID 5ecbecdc0aa49eb6a3878e01f8aa99417602b957 # Parent 0babbc33baec093b9119be36ec535edb8a12b3b8 # EXP-Topic tags-fix localrepo: warn if we are writing to

[PATCH 1 of 2] commit: pass mergestate into _filecommit() instead of re-reading it

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599122644 -19800 # Thu Sep 03 14:14:04 2020 +0530 # Node ID e82b76915ffaa62dcdb8a088a877f41c2a2a87ca # Parent 092035fbd42926fcaf274c60857d3e758d419526 # EXP-Topic merge-newnode commit: pass mergestate into _file

[PATCH 2 of 2] commit: fix a wrong argument name in documentation

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599122680 -19800 # Thu Sep 03 14:14:40 2020 +0530 # Node ID 7c644a397b127e986f6ec371eb23f1c0c683 # Parent e82b76915ffaa62dcdb8a088a877f41c2a2a87ca # EXP-Topic merge-newnode commit: fix a wrong argumen

[PATCH 2 of 2] tags: take lock instead of wlock before writing hgtagsfnodes1 cache

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599574000 -19800 # Tue Sep 08 19:36:40 2020 +0530 # Node ID 72038a47c1cd157672f44e33c839c7823989cee4 # Parent 5ecbecdc0aa49eb6a3878e01f8aa99417602b957 # EXP-Topic tags-fix tags: take lock instead of wlock before w

[PATCH 1 of 2] localrepo: warn if we are writing to cache without a lock

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599570961 -19800 # Tue Sep 08 18:46:01 2020 +0530 # Node ID 5ecbecdc0aa49eb6a3878e01f8aa99417602b957 # Parent 0babbc33baec093b9119be36ec535edb8a12b3b8 # EXP-Topic tags-fix localrepo: warn if we are writing to

D9003: merge: store cases when a file is absent post merge in commitinfo

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Some merges can result in file being absent form working directory. This can be one of file was kept deleted or file was removed by merge code. User might

D9002: mergestate: introduce a new ACTION_KEEP_NEW

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced

D9000: localrepo: warn if we are writing to cache without a lock

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY From quite sometime we have two types of cache, `cache` and `wcache`. The later one is a working copy cache and the first one is a store cache. Let's add a

D9001: tags: take lock instead of wlock before writing hgtagsfnodes1 cache

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This cache is shared across stores and hence we should take store lock before writing to it. Otherwise there will be race where one share with wlock is writing

D8989: commit: force create a new filenode if it was set in mergestate by merge

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY For reasons mentioned in previous commits, we will like to forcefully create a new filenode sometimes. Combination of this patch and previous one, we fixed

D8988: merge: store commitinfo if mergetool resolved a dc or cd conflict

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY delete-changed or changed-delete conflicts can be resolved by mergetool, either if some tool is passed and using or by user choose something on prompt. If

D8986: debugmergestate: sort extras before printing

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Prevents flaky output. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8986 AFFECTED FILES

D8987: tests: add few debugrevlogindex and a log call to see changes in next test

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY In upcoming patches, we will create a new filenode in couple of cases. Let's add some debugrevlogindex and a log call so that we can observe those changes

D8981: scmutil: introduce function to check whether repo uses treemanifest or not

pulkit created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY In next patch, I wanted to check whether current repo uses treemanifest or not. I looked

D8983: merge: move initial handling of mergeactions near to later one

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We build `mergeactions` in the beginning and use it in end. Let's build it just before where it will be used. Helps making code much easier to understand.

D8985: commit: fix a wrong argument name in documentation

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8985 AFFECTED FILES mercurial/commit.py CHANGE DETAILS diff --git

D8982: merge: disable `m2-vs-ma` diff optimization in case of flat manifests

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY 4d504e541d3d1a139f8ebbf8c405291140fd1853 introduced an optimization where in some

D8984: commit: pass mergestate into _filecommit() instead of re-reading it

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY mergestate reading although cheap is not free. Let's read mergestate once on top and pass it into `_filecommit()`. In upcoming patches, we will be reading

[PATCH 3 of 3] diff: add a `--tool` flag to use external diffing tools

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598625380 -19800 # Fri Aug 28 20:06:20 2020 +0530 # Node ID 9a4f8b4d94c42b49f956886a9222b1d88a78580e # Parent f41847eb060d7807c6dad5276c9f13e461ce14db # EXP-Topic extdiff-refactor diff: add a `--tool` flag

[PATCH 2 of 3] extdiff: refactor cmdline and gui calculation login in a separate fn

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599056215 -19800 # Wed Sep 02 19:46:55 2020 +0530 # Node ID f41847eb060d7807c6dad5276c9f13e461ce14db # Parent 17c140bd8aad6fcf046d112683679f9a0c983ee5 # EXP-Topic extdiff-refactor extdiff: refactor cmdline a

[PATCH 1 of 3] extdiff: reorder an if-else conditional

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599054451 -19800 # Wed Sep 02 19:17:31 2020 +0530 # Node ID 17c140bd8aad6fcf046d112683679f9a0c983ee5 # Parent 451e13cc6d859c3a5f7971059265abdfb4e37ca3 # EXP-Topic extdiff-refactor extdiff: reorder an if-else condi

D8977: merge: check for dir rename dest before adding ACTION_KEEP

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY A previous patch in the series blindly uses `ACTION_KEEP` if the file is not present on both remote and ancestor. This was wrong. We tries to detect

[PATCH 3 of 3] extdiff: move single file handling inside `not per-file` conditional

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598691918 -19800 # Sat Aug 29 14:35:18 2020 +0530 # Node ID c1f593d4d608fe9180c3e7b2c4cb8eb179d1c468 # Parent 28e81de5f83624341454eea6ef5973cd7db10675 # EXP-Topic extdiff-refactor extdiff: move single file ha

[PATCH 2 of 3] extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598691746 -19800 # Sat Aug 29 14:32:26 2020 +0530 # Node ID 28e81de5f83624341454eea6ef5973cd7db10675 # Parent e49d6016a24ce0ead59e32db68489de6c18c779d # EXP-Topic extdiff-refactor extdiff: remove dir2root and pas

[PATCH 1 of 3] extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598691514 -19800 # Sat Aug 29 14:28:34 2020 +0530 # Node ID e49d6016a24ce0ead59e32db68489de6c18c779d # Parent c25efc468a4939682031d2a16a3c897cf59f0fb9 # EXP-Topic extdiff-refactor extdiff: pass full paths of

D8974: merge: add `ACTION_KEEP_DELETED` to represent files we want to keep deleted

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY There are files which were deleted/not present in working copy parent but were present on other side of merge. On merge, we might decide to keep them deleted.

D8972: [WIP] diff: add a `--tool` flag

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is a WIP because it's mostly plumbing at the moment and wanted to share it with others. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8971: extdiff: move single file handling inside `not per-file` conditional

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY If `--per-file` is passed, we will diffing files one by one, hence there is no need to make this optimization around single file in that case. This

D8970: extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The only use of `dir2root` was to join with `dir2` to generate the path for other side of diff. Like in previous patch, `dir1a` and `dir1b` are full paths and

D8969: extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Earlier we were passing basename instead of the fullpath and then joining with the tmproot. This is wrong because the user can choose `rev1a` as wdir and in

D8967: merge: show number of ancestors in bid merge debug notes

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY A good number of times, we don't generate an action for a file in manifestmerge() which can result in bid merge doing the wrong thing. Mentioning the number

D8966: merge: show list of bids for each file in bid-merge in ui.note()

pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Earlier, we were showing the list of bids only when we were ambiguously picking. However, the cases where we unambiguously picked a side may not always be

<    1   2   3   4   5   6   7   8   9   10   >