D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-08 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG03bec089e105: rebase: disable `inmemory` if the rebaseset contains the working copy (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-08 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4276. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1616?vs=4247=4276 REVISION DETAIL https://phab.mercurial-scm.org/D1616 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-08 Thread phillco (Phil Cohen)
phillco added a comment. @dlax you mean the parts where we pass `opts` instead of `inmemory`? This is necessary for the function to mutate `opts['inmemory']`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1616 To: phillco, #hg-reviewers, dlax Cc: durin42,

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-08 Thread dlax (Denis Laxalde)
dlax added a comment. In https://phab.mercurial-scm.org/D1616#27819, @durin42 wrote: > @dlax I see a request changes here, but I don't see any commentary as to why? I meant to comment that the first hunks (i.e. those above the big comment block) seem unrelated and to ask for

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-08 Thread durin42 (Augie Fackler)
durin42 added a comment. @dlax I see a request changes here, but I don't see any commentary as to why? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1616 To: phillco, #hg-reviewers, dlax Cc: durin42, mercurial-devel

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-07 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 4247. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1616?vs=4242=4247 REVISION DETAIL https://phab.mercurial-scm.org/D1616 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1616: rebase: disable `inmemory` if the rebaseset contains the working copy

2017-12-07 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As described in the comment, rebasing the working copy parent with in-memory merge, and then updating to the new commit, isn't much faster because of the extra