D6081: i18n-ja: correct translation of "committing"

matvore created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The previous translation considered the English word to mean "committing is currently happening" but it actually meant "for purposes of committing." REPOSITORY

D6080: i18n-ja: translate "integer" more precisely

matvore created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There were some times where "integer" was translated inaccurately as suuchi (number). Make these more precise by translating them as seisuuchi or simply seisuu.

[PATCH "] discovery: clarify why the caching of children is valid

# HG changeset patch # User Pierre-Yves David # Date 1551918504 -3600 # Thu Mar 07 01:28:24 2019 +0100 # Node ID b8c0855a41e76a76fcef367b75ad3b1844685428 # Parent a05f0bbefdd961409bf77120a0f71d4ad8332785 # EXP-Topic discovery # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[Bug 6097] New: "ProgrammingError: tried to relocate a node on top of itself" from evolve

https://bz.mercurial-scm.org/show_bug.cgi?id=6097 Bug ID: 6097 Summary: "ProgrammingError: tried to relocate a node on top of itself" from evolve Product: Mercurial Version: 4.8 Hardware: PC OS: Linux

D6079: tests: simplify test-uncommit.t by removing an unnecessary commit

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I don't see what value the first commit adds in the test for issue 5977, so let's remove it. REPOSITORY rHG Mercurial REVISION DETAIL

D6078: tests: clarify test setup test in test-uncommit.t

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I assume the "hg uncommit b" is there to prove that the working copy is dirty before we try "hg uncommit --allow-dirty-working-copy b". It seems clearer to

D6077: tests: fix a stale reference to experimental.uncommitondirtywdir

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY These tests no longer test the config option, they test the command line flag. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH 8 of 9 "] discovery: cache the children mapping used during each discovery

On Tue, 05 Mar 2019 18:39:19 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551314900 -3600 > # Thu Feb 28 01:48:20 2019 +0100 > # Node ID 6127533daac7b331ba980d70040d55ee938ce106 > # Parent fe57cbd053432d10bccd3955072a4c6c581e3355 > # EXP-Topic

Re: [PATCH 1 of 9 "] discovery: rename `srvheads` to `knownsrvheads`

On Tue, 05 Mar 2019 18:39:12 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Georges Racinet > # Date 1551307506 -3600 > # Wed Feb 27 23:45:06 2019 +0100 > # Node ID d0213fa8b2d4fa5f46f4efc79f8562faa9dfd2ef > # Parent 2d835c42ab41a6cdcf7c0f2169f82c01b7e249ff > # EXP-Topic

Re: [PATCH 4 of 9 "] discovery: use a lower level but faster way to retrieve parents

On Tue, 05 Mar 2019 18:39:15 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551311787 -3600 > # Thu Feb 28 00:56:27 2019 +0100 > # Node ID ffd98d208aa7f92e13bf233b6d752cd2d292ebbe > # Parent 82035c1d714f8f3911632ea1271002745fc620f4 > # EXP-Topic

D6026: lock: Improve the waiting for lock message which will help newcomers(issue6081)

akshjain.jain74 added a comment. In https://phab.mercurial-scm.org/D6026#88552, @pulkit wrote: > I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now. > >

Re: [PATCH 01 of 18 "] verify: document the `warn` method

On Wed, Mar 6, 2019 at 7:42 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551867785 -3600 > # Wed Mar 06 11:23:05 2019 +0100 > # Node ID 4df3541cd0704c1df6476b04a2b83aa7ff247ad8 > # Parent

Re: [PATCH 18 of 18 "] verify: also check full manifest validity during verify runs [RFC]

On Wed, Mar 6, 2019 at 8:10 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551881213 -3600 > # Wed Mar 06 15:06:53 2019 +0100 > # Node ID 1e978412397a4fe629dfa9420b1a7773dc936b19 > # Parent

Re: [PATCH 10 of 18 "] verify: document the `checkentry` method

On Wed, Mar 6, 2019 at 8:03 PM Pierre-Yves David < pierre-yves.da...@ens-lyon.org> wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551871084 -3600 > # Wed Mar 06 12:18:04 2019 +0100 > # Node ID 51efb7d6f032202abaeaed8bf1b3a13a9f426cdd > # Parent

D6026: lock: Improve the waiting for lock message which will help newcomers(issue6081)

akshjain.jain74 added a comment. okay @pulkit let me work upon your suggestion and INLINE COMMENTS > pulkit wrote in test-lock-badness.t:18 > still here are unrealted changes. I accept these changes while running test, if i am not changing this then it will cause test failing REPOSITORY

[PATCH "] transaction: include txnname in the hookargs dictionary

# HG changeset patch # User Pierre-Yves David # Date 1549749690 -3600 # Sat Feb 09 23:01:30 2019 +0100 # Node ID e271731575f1f16708a346bcce90b0ae633b1cd6 # Parent 82d9728ace9535057d77df6c920385861ec00072 # EXP-Topic hook.txname # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 16 of 18 "] verify: document the `_verifymanifest` method

# HG changeset patch # User Pierre-Yves David # Date 1551872384 -3600 # Wed Mar 06 12:39:44 2019 +0100 # Node ID a6b80a595d5e6a94e13d08150636faa0ca4729e5 # Parent c1c1c85983e94ec91a6cb2a44f2784567483e6f1 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 18 of 18 "] verify: also check full manifest validity during verify runs [RFC]

# HG changeset patch # User Pierre-Yves David # Date 1551881213 -3600 # Wed Mar 06 15:06:53 2019 +0100 # Node ID 1e978412397a4fe629dfa9420b1a7773dc936b19 # Parent 92091b3de1503bf562fe5bf2b544781f92702738 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 06 of 18 "] verify: make the `exc` method private

# HG changeset patch # User Pierre-Yves David # Date 1551868308 -3600 # Wed Mar 06 11:31:48 2019 +0100 # Node ID cfc34a3b69850c784cc57fbb474c1c14e0e5387e # Parent 6c59b746e8b71df6d5f0cc02a72fedac099a2a80 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 17 of 18 "] verify: small refactoring and documentation in `_verifymanifest`

# HG changeset patch # User Pierre-Yves David # Date 1551879782 -3600 # Wed Mar 06 14:43:02 2019 +0100 # Node ID 92091b3de1503bf562fe5bf2b544781f92702738 # Parent a6b80a595d5e6a94e13d08150636faa0ca4729e5 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 10 of 18 "] verify: document the `checkentry` method

# HG changeset patch # User Pierre-Yves David # Date 1551871084 -3600 # Wed Mar 06 12:18:04 2019 +0100 # Node ID 51efb7d6f032202abaeaed8bf1b3a13a9f426cdd # Parent 8092d6de83c346e069322eede70baa05896744d3 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 07 of 18 "] verify: minimal documentation for `verifier.verify`

# HG changeset patch # User Pierre-Yves David # Date 1551868534 -3600 # Wed Mar 06 11:35:34 2019 +0100 # Node ID feeaebe5aa639ce0d8df7e42ea2540046565aee5 # Parent cfc34a3b69850c784cc57fbb474c1c14e0e5387e # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 09 of 18 "] verify: add some inline documentation to the top level `verify` method

# HG changeset patch # User Pierre-Yves David # Date 1551869001 -3600 # Wed Mar 06 11:43:21 2019 +0100 # Node ID 8092d6de83c346e069322eede70baa05896744d3 # Parent 33e3e6c86203f9ddecff5843b51bd6b43b5883ec # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 08 of 18 "] verify: explicitly return 0 if no error are encountered

# HG changeset patch # User Pierre-Yves David # Date 1551868734 -3600 # Wed Mar 06 11:38:54 2019 +0100 # Node ID 33e3e6c86203f9ddecff5843b51bd6b43b5883ec # Parent feeaebe5aa639ce0d8df7e42ea2540046565aee5 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 12 of 18 "] revlog: add some documentation to the `checksize` method

# HG changeset patch # User Pierre-Yves David # Date 1551877647 -3600 # Wed Mar 06 14:07:27 2019 +0100 # Node ID 2b4470cd927234cd028051e8ddee77dee82dccec # Parent a09dc0dcd48c837b278e3603d05fd1036222cff9 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 15 of 18 "] verify: document `_verifychangelog`

# HG changeset patch # User Pierre-Yves David # Date 1551871318 -3600 # Wed Mar 06 12:21:58 2019 +0100 # Node ID c1c1c85983e94ec91a6cb2a44f2784567483e6f1 # Parent 1acdc1069618867d7b3e0add9a435fad2810ab64 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 14 of 18 "] verify: rename the `checklog` to `_checkrevlog`

# HG changeset patch # User Pierre-Yves David # Date 1551878119 -3600 # Wed Mar 06 14:15:19 2019 +0100 # Node ID 1acdc1069618867d7b3e0add9a435fad2810ab64 # Parent 4390cbb4a01be93907ec49c5dce2599fe5a272df # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 13 of 18 "] verify: document the `checklog` method

# HG changeset patch # User Pierre-Yves David # Date 1551877823 -3600 # Wed Mar 06 14:10:23 2019 +0100 # Node ID 4390cbb4a01be93907ec49c5dce2599fe5a272df # Parent 2b4470cd927234cd028051e8ddee77dee82dccec # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 04 of 18 "] verify: make `err` a private method

# HG changeset patch # User Pierre-Yves David # Date 1551868057 -3600 # Wed Mar 06 11:27:37 2019 +0100 # Node ID d6124b30caf951800f61a53a72792c2e6a98e393 # Parent 0124906dffd713a436215ab35ae56fd55b8ac77f # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 11 of 18 "] verify: make `checkentry` a private method

# HG changeset patch # User Pierre-Yves David # Date 1551871250 -3600 # Wed Mar 06 12:20:50 2019 +0100 # Node ID a09dc0dcd48c837b278e3603d05fd1036222cff9 # Parent 51efb7d6f032202abaeaed8bf1b3a13a9f426cdd # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 01 of 18 "] verify: document the `warn` method

# HG changeset patch # User Pierre-Yves David # Date 1551867785 -3600 # Wed Mar 06 11:23:05 2019 +0100 # Node ID 4df3541cd0704c1df6476b04a2b83aa7ff247ad8 # Parent 82d9728ace9535057d77df6c920385861ec00072 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 02 of 18 "] verify: make the `warn` method private

# HG changeset patch # User Pierre-Yves David # Date 1551867880 -3600 # Wed Mar 06 11:24:40 2019 +0100 # Node ID 0f480192d01335682e03e3c0793e7d380deb4bbe # Parent 4df3541cd0704c1df6476b04a2b83aa7ff247ad8 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 05 of 18 "] verify: document the `exc` method

# HG changeset patch # User Pierre-Yves David # Date 1551868270 -3600 # Wed Mar 06 11:31:10 2019 +0100 # Node ID 6c59b746e8b71df6d5f0cc02a72fedac099a2a80 # Parent d6124b30caf951800f61a53a72792c2e6a98e393 # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 03 of 18 "] verify: document the `err` method

# HG changeset patch # User Pierre-Yves David # Date 1551867916 -3600 # Wed Mar 06 11:25:16 2019 +0100 # Node ID 0124906dffd713a436215ab35ae56fd55b8ac77f # Parent 0f480192d01335682e03e3c0793e7d380deb4bbe # EXP-Topic verify # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D6026: lock: Improve the waiting for lock message which will help newcomers(issue6081)

pulkit added a comment. I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now. Something like: `waiting for lock on working directory of b held by process '*'

D6069: uncommit: add flag --allow-dirty-working-copy

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa284d9a33ca: uncommit: add flag --allow-dirty-working-copy (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6069?vs=14372=14375#toc REPOSITORY

D5940: uncommit: don't allow dirty working copy with PATH (issue5977)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbf22e370ae9a: uncommit: dont allow dirty working copy with PATH (issue5977) (authored by navaneeth.suresh, committed by ). CHANGED PRIOR TO COMMIT

D6076: cleanup: remove two bogus test names from python3 list

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe0384d4c51ae: cleanup: remove two bogus test names from python3 list (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5940: uncommit: don't allow dirty working copy with PATH (issue5977)

pulkit added a comment. Amended the following in flight and resolved conflicts while rebasing the next one. diff --git a/hgext/uncommit.py b/hgext/uncommit.py --- a/hgext/uncommit.py +++ b/hgext/uncommit.py @@ -160,8 +160,8 @@ def uncommit(ui, repo, *pats, **opts):

D6038: push: added clear warning message when pushing a closed branch(issue6080)

pulkit added inline comments. INLINE COMMENTS > discovery.py:351 > +raise error.Abort(_("push creates new remote branches:" > +" %s (closed)!")% branchnames, > hint=_("use 'hg push --new-branch' to create" This is adding ` (closed)`

D6075: [RFC] transplant: append log to commit message before running filter

Kwan abandoned this revision. Kwan added a comment. Urgh, never mind, just realised I missed the existence of HGREVISION in the documentation. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6075 To: Kwan, #hg-reviewers Cc: mercurial-devel

Re: [PATCH "V2] revlog: preserve `_lazydelta` attribute in `revlog.clone`

On Tue, 05 Mar 2019 15:37:59 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551710814 -3600 > # Mon Mar 04 15:46:54 2019 +0100 > # Node ID 951a1d74f8ea4576169d1437f1c0bcc82e3da586 > # Parent 82d9728ace9535057d77df6c920385861ec00072 > # EXP-Topic

Re: [PATCH "] localrepo: explicit `_lock` arguments in `lock`

On Tue, 05 Mar 2019 14:31:16 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1551712124 -3600 > # Mon Mar 04 16:08:44 2019 +0100 > # Node ID c3ba4d32430605d3d85f13c8fca20fba695edb2f > # Parent bbe72376f2a91b383370619b3a0f66cf4a5d8178 > # EXP-Topic