Discussion about Mercurial 4.8 Sprint

Hello everyone! I want to bring up a discussion about the next location for the sprint. In my recent travels, I talked with ~10 people who expressed some reservations about being able to make the next sprint if it is held in Japan. I was a bit bummed out but that was for selfish reasons (because

D3684: shelve: merge in obsshelve changes implemented at facebook

lothiraldan added a comment. After reading your obsshelve series, it seems that we have some overlap. We have an implementation of shelve without strip nor obsmarkers. The first series https://phab.mercurial-scm.org/D3685 is the first half, cleaning up the shelve extensions in order

D2938: grep: make grep search on working directory by default

sangeet259 added a comment. Hey @yuja Can you explain why you did this ? > - slowpath = match.anypats() or (not match.always() and opts.get('removed')) +slowpath = True REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2938 To: sangeet259, #hg-reviewer

[Bug 5909] New: maximum recursion depth exceeded by cross-included .hgignore

https://bz.mercurial-scm.org/show_bug.cgi?id=5909 Bug ID: 5909 Summary: maximum recursion depth exceeded by cross-included .hgignore Product: Mercurial Version: default branch Hardware: PC OS: Linux

[PATCH 2 of 5] templater: add try-except stub to runmember()

# HG changeset patch # User Yuya Nishihara # Date 1524300196 -32400 # Sat Apr 21 17:43:16 2018 +0900 # Node ID e666247f5c2b95a10a84123257fbe2b8af05c1e5 # Parent f028d9f94272b971eafc60582af15d83cc9a8f4a templater: add try-except stub to runmember() New wrapped interface will raise ParseError

[PATCH 5 of 5] templater: resolve type of dict key in getmember()

# HG changeset patch # User Yuya Nishihara # Date 1525405395 -32400 # Fri May 04 12:43:15 2018 +0900 # Node ID 2002b2699cf6066f8965d84aa15a97d6c4df1b2f # Parent c30ef16679c1fa6fead795a0ccadd7dced41f408 templater: resolve type of dict key in getmember() This seems more correct and is consist

[PATCH 4 of 5] templater: promote getmember() to an interface of wrapped types

# HG changeset patch # User Yuya Nishihara # Date 1521599421 -32400 # Wed Mar 21 11:30:21 2018 +0900 # Node ID c30ef16679c1fa6fead795a0ccadd7dced41f408 # Parent 8d50ec6e8b832fec6b9dc42cd1d7be2ff53199b9 templater: promote getmember() to an interface of wrapped types diff --git a/mercurial/hg

[PATCH 1 of 5] templater: do dict lookup over a wrapped object

# HG changeset patch # User Yuya Nishihara # Date 1521562709 -32400 # Wed Mar 21 01:18:29 2018 +0900 # Node ID f028d9f94272b971eafc60582af15d83cc9a8f4a # Parent 2b8c8b8d1a0698c7b045053806368c9a05ee9fd0 templater: do dict lookup over a wrapped object Dict/list lookup operations will be moved

[PATCH 3 of 5] templater: move getdictitem() to hybrid class

# HG changeset patch # User Yuya Nishihara # Date 1521563984 -32400 # Wed Mar 21 01:39:44 2018 +0900 # Node ID 8d50ec6e8b832fec6b9dc42cd1d7be2ff53199b9 # Parent e666247f5c2b95a10a84123257fbe2b8af05c1e5 templater: move getdictitem() to hybrid class Since a raw dict will never be returned by

D3678: graft: correct documentation about options can be reapplied

yuja added a comment. > About this change in help, I am going to drop this note completely in https://phab.mercurial-scm.org/D3667 once --continue reapplies all the previous flags. Cool, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 To: kh

Re: D3678: graft: correct documentation about options can be reapplied

> About this change in help, I am going to drop this note completely in > https://phab.mercurial-scm.org/D3667 once --continue reapplies all the > previous flags. Cool, thanks. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https:

D3668: graft: add a new `--stop` flag to stop interrupted graft

yuja added a comment. > The `--stop` flag takes back you to the last successful step i.e. it will keep > your grafted commits, it will just clear the mergestate and interrupted graft > state. No idea if git is right regarding UI, but they appear to have `--quit` for this.

Re: D3668: graft: add a new `--stop` flag to stop interrupted graft

> The `--stop` flag takes back you to the last successful step i.e. it will > keep > your grafted commits, it will just clear the mergestate and interrupted > graft > state. No idea if git is right regarding UI, but they appear to have `--quit` for this. https://git-scm.com/docs/git-cherr

D3662: graft: reuse the --log value passed initially in `hg graft --continue` (BC)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2b8c8b8d1a06: graft: reuse the --log value passed initially in `hg graft --continue` (BC) (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3662?vs=8907&id=89

D3661: graft: add test showing --continue not preserving --log passed earlier

This revision was automatically updated to reflect the committed changes. Closed by commit rHG66fc2ef8dbff: graft: add test showing --continue not preserving --log passed earlier (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-sc

D3664: graft: reuse the --edit value passed initially in `hg graft --continue` (BC)

yuja added a comment. Queued the first two, thanks. > This patch starts storing the value of --edit flag passed by the user initially > when they runs `hg graft --edit`. We can now read the value from graftstate in > case of `--continue` and respect the value which user passed

Re: D3664: graft: reuse the --edit value passed initially in `hg graft --continue` (BC)

Queued the first two, thanks. > This patch starts storing the value of --edit flag passed by the user > initially > when they runs `hg graft --edit`. We can now read the value from graftstate > in > case of `--continue` and respect the value which user passed earlier. I'm -0.5 on this sin

D3684: shelve: merge in obsshelve changes implemented at facebook

lothiraldan added a comment. We just sent https://phab.mercurial-scm.org/D3685 that update shelve to not use rebase anymore. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3684 To: durin42, #hg-reviewers Cc: lothiraldan, mercurial-devel

D3692: merge: add a 'keepconflictparent' argument to graft

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this change, `merge.graft` was always dropping the "grafted" changeset from the parent. This is impractical in case of conflict as the second parent c

D3693: shelve: directly handle the initial parent alignment

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to h

D3689: shelve: directly handle `--continue`

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to h

D3690: shelve: actually test corrupted shelve state

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test was previous moving the corrupted shelve state file as an histedit state file. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-s

D3694: shelve: use more accurate description in conflict marker

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-sc

D3691: shelve: stop testing missing rebase state file

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We no longer use the file. Neither during rebase not during continue. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3691 AFFECT

D3688: shelve: directly handle the abort process

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to h

D3687: shelve: check the actual shelvestate in morestatus

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The rebasestate is a lower level implementation details that we are trying to remove. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm

D3686: shelve: wider check for successful abort in test

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The test was previously focusing on checking that the "sub-rebase" aborted properly. Since rebase is an implementation details we should also check for other

D3685: shelve: use full hash in tests

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Using revision number is fragile. Moving to full hash to help with further development. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-sc

[Bug 5908] New: hgwebdir.wsgi getting repos from dir and subdir

https://bz.mercurial-scm.org/show_bug.cgi?id=5908 Bug ID: 5908 Summary: hgwebdir.wsgi getting repos from dir and subdir Product: Mercurial Version: 4.6 Hardware: PC OS: Other Status: UNCONFIRMED Severity: