D6659: graft: split graft code to avoid duplication

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY To avoid duplication of code due to `cmdutil.continuegraft()`; `graft()` is split into `cmdutil.finishgraft()` which deals with the execution of graft once

D6660: commands: removed part of description from abort and continue

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The description for registration of new `continuefunc` or `abortfunc` is removed as it is not required from user perspective. REPOSITORY rHG Mercurial

mercurial@42623: 12 new changesets

12 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/3c16b9c0b099 changeset: 42612:3c16b9c0b099 user:Taapas Agrawal date:Mon Jul 15 22:23:31 2019 +0530 summary: continue: added logic for hg continue

D6655: continue: added support for graft

taapas1128 added a comment. @martinvonz I will send a patch doing that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6655/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6655 To: taapas1128, #hg-reviewers Cc: martinvonz, durin42,

[Bug 6174] New: merge could probably be smarter and produce more correct results in some obscure cases

https://bz.mercurial-scm.org/show_bug.cgi?id=6174 Bug ID: 6174 Summary: merge could probably be smarter and produce more correct results in some obscure cases Product: Mercurial Version: stable branch Hardware: All

Re: An extension to log through standard logging module

On 7/18/19 8:24 PM, Kyle Lippincott wrote: > > > On Thu, Jul 18, 2019 at 11:16 AM Augie Fackler > wrote: > > > > > On Jul 16, 2019, at 13:27, Georges Racinet > mailto:georges.raci...@octobus.net>> > wrote: > > > > Hi there, > > > > for the

Re: Last call for 5.1 changes

On 7/18/19 8:15 PM, Augie Fackler wrote: > >> On Jul 16, 2019, at 14:21, Georges Racinet >> wrote: >> >> >> On 7/16/19 2:58 PM, Augie Fackler wrote: >>> I'll cut the rc later this week, maybe tomorrow, definitely no later than >>> Friday evening America/New_York. Am I missing anything people

Re: [PATCH evolve-ext] evolve: further clarify that update is performed only when requested

I pushed the result, thanks ! On 7/18/19 7:03 PM, Kevin Peng wrote: I see. Thanks! On Thu, Jul 18, 2019 at 2:51 AM Anton Shestakov wrote: On Wed, 17 Jul 2019 12:06:14 -0700 Kevin Peng via Mercurial-devel wrote: Here is an updated patch: # HG changeset patch # User kevp...@google.com #

Re: An extension to log through standard logging module

On Thu, Jul 18, 2019 at 11:16 AM Augie Fackler wrote: > > > > On Jul 16, 2019, at 13:27, Georges Racinet > wrote: > > > > Hi there, > > > > for the needs of Heptapod [1], I ended up writing a small extension to > > divert all possible console output to the standard logging module, with > > the

D6658: py3: fix test-setdiscovery.t on Python 3 by conditionalizing two lines

durin42 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm not clear why this behaves very slightly differently on Python 3, but I'm also not concerned about it. REPOSITORY rHG Mercurial REVISION DETAIL

D6657: cleanup: remove redundant import

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY For some reason the import checker only caught this on py3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6657 AFFECTED FILES

D6655: continue: added support for graft

martinvonz added a comment. There is a lot of duplication here. Can you try to extract common parts? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6655/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6655 To: taapas1128, #hg-reviewers Cc:

D6656: py3: another passing test

durin42 created this revision. Herald added a reviewer: pulkit. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6656 AFFECTED FILES contrib/python3-whitelist CHANGE DETAILS diff

Re: An extension to log through standard logging module

> On Jul 16, 2019, at 13:27, Georges Racinet > wrote: > > Hi there, > > for the needs of Heptapod [1], I ended up writing a small extension to > divert all possible console output to the standard logging module, with > the option to send the logs to a Sentry application. > > The source is

Re: Last call for 5.1 changes

> On Jul 16, 2019, at 14:21, Georges Racinet > wrote: > > > On 7/16/19 2:58 PM, Augie Fackler wrote: >> I'll cut the rc later this week, maybe tomorrow, definitely no later than >> Friday evening America/New_York. Am I missing anything people are burning to >> see in 5.1? Are there any

D6440: fix: let fixer tools inherit hg's cwd so they can look at the working copy

durin42 added a comment. I still think we should fix the cwd for fixers, but it seems Martin and I agree that repo-root is more consistent. Would you be willing to reroll with repo-root instead of cwd? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6655: continue: added support for graft

Closed by commit rHG0fff3cc9098c: continue: added support for graft (authored by taapas1128). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE

D6654: shelve: modify help text on --interactive

Closed by commit rHG9eace8d6d537: shelve: modify help text on --interactive (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D6653: unshelve: mark unshelve interactive as experimental

Closed by commit rHG74ba82abbf29: unshelve: mark unshelve interactive as experimental (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG

D6655: continue: added support for graft

durin42 added a comment. I'm landing this, but in the future I suspect we should make sure we just have a mix of `hg graft --continue` and `hg graft` rather than run the whole test twice, as it'll severely bloat the already-slow testsuite to do that for many tests. REPOSITORY rHG

D6655: continue: added support for graft

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds support of graft to hg continue plan. The patch creates a seperate function `cmdutil.continuegraft` so that continue logic for graft can be

[Bug 6173] New: Allow `share` to specify sparse profiles and a revision to checkout.

https://bz.mercurial-scm.org/show_bug.cgi?id=6173 Bug ID: 6173 Summary: Allow `share` to specify sparse profiles and a revision to checkout. Product: Mercurial Version: unspecified Hardware: PC OS: Linux

D6596: unshelve: add interactive mode

pulkit added inline comments. INLINE COMMENTS > navaneeth.suresh wrote in test-shelve.t:1354 > We only pass `-i` if we want to do the unshelve interactively again. It's not > mandatory to do that. After an interactive shelve, the stored remaining > shelve is same as a normal shelve. We can

Re: [PATCH evolve-ext] evolve: further clarify that update is performed only when requested

I see. Thanks! On Thu, Jul 18, 2019 at 2:51 AM Anton Shestakov wrote: > > On Wed, 17 Jul 2019 12:06:14 -0700 > Kevin Peng via Mercurial-devel > wrote: > > > Here is an updated patch: > > > > # HG changeset patch > > # User kevp...@google.com > > # Date 1560563083 25200 > > # Fri Jun 14

D6654: shelve: modify help text on --interactive

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now have `unshelve --interactive` after rHG5162753c4c14 . So, the help

D6653: unshelve: mark unshelve interactive as experimental

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have the logic for interactive unshelve under `_rebaserestorecommit()`. So, we might get conflicts even if there are conflicting changes other than

D6596: unshelve: add interactive mode

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:6172 > Can you mark this as `EXPERIMENTAL` because right now we rebases the whole > commit, which leads to conflicts in files which the user might not want to > unshelve. Doing that right away! Will solve

mercurial@42611: 3 new changesets

3 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/326fdce22fb2 changeset: 42609:326fdce22fb2 user:Raphaël Gomès date:Tue Jul 02 17:15:03 2019 +0200 summary: rust: switch hg-core and hg-cpython to rust 2018 edition

D6651: rust-utils: remove buggy assertion

yuja added a comment. > While this assertion had good intentions, it broke existing behavior with a > nasty panic. So the hgignore parser doesn't handle `\#` correctly? https://www.mercurial-scm.org/repo/hg-committed/file/5672bb73f61e/rust/hg-core/src/filepatterns.rs#l251

Re: D6651: rust-utils: remove buggy assertion

> While this assertion had good intentions, it broke existing behavior with a > nasty panic. So the hgignore parser doesn't handle `\#` correctly? https://www.mercurial-scm.org/repo/hg-committed/file/5672bb73f61e/rust/hg-core/src/filepatterns.rs#l251

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

yuja added a comment. > I fixed the renames. The amended changeset is available at, bitbucket.org/octobus/mercurial-devel, rev d4bbf54624e14ac2913d452a8a7cb32823227c16. If you want me to send you the patch some other way, please tell me. Pushed as 326fdce22fb2

Re: D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

> I fixed the renames. The amended changeset is available at, > bitbucket.org/octobus/mercurial-devel, rev > d4bbf54624e14ac2913d452a8a7cb32823227c16. If you want me to send you the > patch some other way, please tell me. Pushed as 326fdce22fb2, thanks.

D6612: tests: show the files fields of changelogs for many merges

valentin.gatienbaron added a comment. Thanks! I didn't expect this would make it for 5.1. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6612/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6612 To: valentin.gatienbaron, #hg-reviewers, durin42

Re: [PATCH evolve-ext] evolve: further clarify that update is performed only when requested

On Wed, 17 Jul 2019 12:06:14 -0700 Kevin Peng via Mercurial-devel wrote: > Here is an updated patch: > > # HG changeset patch > # User kevp...@google.com > # Date 1560563083 25200 > # Fri Jun 14 18:44:43 2019 -0700 > # Node ID 8716e0b2ff1cf09efa79dca6303a83600ee42824 > # Parent

D6597: rust-2018: switch hg-core and hg-cpython to rust 2018 edition

Alphare added a comment. In D6597#97348 , @yuja wrote: >> diff --git a/rust/hg-core/src/utils/mod.rs b/rust/hg-core/src/utils/mod.rs >> deleted file mode 100644 > > Can you rename these instead of adding new files? Last time I fixed that