D4287: overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)

phillco accepted this revision. phillco added a comment. lgtm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4287 To: spectral, phillco, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D2924: rebase: rename conclude[memory]node() to commit[memory]node()

phillco added a comment. What _is_ the difference between "conclude" and "commit"? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2924 To: martinvonz, phillco, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel ___

D2701: merge: use constants for actions

phillco added subscribers: sid0, quark. phillco added a comment. btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg, #hg-reviewers, phillco Cc: quark,

D2701: merge: use constants for actions

phillco added inline comments. INLINE COMMENTS > indygreg wrote in merge.py:909 > Done. > > What's... amusing is that ``dr`` and ``rd`` are not actions in the current > code base. lol REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg,

D2701: merge: use constants for actions

phillco added inline comments. INLINE COMMENTS > merge.py:909 > if actions: > # k, dr, e and rd are no-op > +for m in (ACTION_ADD, ACTION_ADD_MODIFIED, ACTION_FORGET, ACTION_GET, Update this too? REPOSITORY rHG Mercurial REVISION DETAIL

D2701: merge: use constants for actions

phillco accepted this revision. phillco added a comment. Strong +1 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg, #hg-reviewers, phillco Cc: phillco, pulkit, mercurial-devel ___ Mercurial-devel

D1934: convert: use a collections.deque

phillco accepted this revision. phillco added a comment. Nice. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1934 To: indygreg, #hg-reviewers, phillco Cc: phillco, mercurial-devel ___ Mercurial-devel mailing list

D1782: rebase: don't run IMM if running rebase in a transaction

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc5d220a621e7: rebase: dont run IMM if running rebase in a transaction (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1807: filemerge: only write in-memory backup during premerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9a50ffd15b25: filemerge: only write in-memory backup during premerge (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1806: filemerge: fix backing up an in-memory file to a custom location

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc0439e11af16: filemerge: fix backing up an in-memory file to a custom location (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1815: merge: only abort in IMM if files are actually marked as driver-resolved

phillco updated this revision to Diff 4713. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1815?vs=4711=4713 REVISION DETAIL https://phab.mercurial-scm.org/D1815 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D1814: rebase: add experimental.inmemory.nomergedriver to turn off IMM

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This gives us an easy way to ensure IMM is disabled automatically if the user configures a mergedriver script. REPOSITORY rHG Mercurial REVISION DETAIL

D1815: merge: only abort in IMM if files are actually marked as driver-resolved

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before, we would raise whenever the `usemergedriver` condition was set when merging in-memory, which equated to "any merge with (cd, dc, or m) actions in a repo

D1807: filemerge: only write in-memory backup during premerge

phillco updated this revision to Diff 4700. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1807?vs=4698=4700 REVISION DETAIL https://phab.mercurial-scm.org/D1807 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D1806: filemerge: fix backing up an in-memory file to a custom location

phillco updated this revision to Diff 4699. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1806?vs=4697=4699 REVISION DETAIL https://phab.mercurial-scm.org/D1806 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D1806: filemerge: fix backing up an in-memory file to a custom location

phillco updated this revision to Diff 4697. phillco edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1806?vs=4688=4697 REVISION DETAIL https://phab.mercurial-scm.org/D1806 AFFECTED FILES mercurial/filemerge.py

D1807: filemerge: only write in-memory backup during premerge

phillco updated this revision to Diff 4698. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1807?vs=4689=4698 REVISION DETAIL https://phab.mercurial-scm.org/D1807 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D1806: filemerge: fix backing up an in-memory file to a custom location

phillco added a comment. > Should we even be calling _makebackup in the case of an inmemory merge? Like, maybe the makebackup should be conditional based on if the source file context is actually a workingctx? The merge process itself uses the backup, it's not just for the user. INLINE

D1806: filemerge: fix backing up an in-memory file to a custom location

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If the user specifies a ui.origbackuppath, we used to always copy the file there, but if the source file is in memory we must write it instead of copying.

D1807: filemerge: only write in-memory backup during premerge

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This wasn't broken, but should mirror the non-in memory case to save an extra write. REPOSITORY rHG Mercurial REVISION DETAIL

D1782: rebase: don't run IMM if running rebase in a transaction

phillco updated this revision to Diff 4648. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1782?vs=4647=4648 REVISION DETAIL https://phab.mercurial-scm.org/D1782 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1782: rebase: don't run IMM if running rebase in a transaction

phillco updated this revision to Diff 4647. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1782?vs=4645=4647 REVISION DETAIL https://phab.mercurial-scm.org/D1782 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1781: merge: raise before running mergedriver if using IMM

This revision was automatically updated to reflect the committed changes. Closed by commit rHG87918218da70: merge: raise before running mergedriver if using IMM (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1782: rebase: don't run IMM if running rebase in a transaction

phillco updated this revision to Diff 4645. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1782?vs=4644=4645 REVISION DETAIL https://phab.mercurial-scm.org/D1782 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1782: rebase: don't run IMM if running rebase in a transaction

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Some callers to rebase.rebase(), like `_moverelative` in `fbamend/movement.py`, wrap the entire rebase call in a transaction. This raises havoc when IMM tries

D1781: merge: raise before running mergedriver if using IMM

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1781 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D1748: rebase: switch ui.log calls to common style

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbf556bd2f589: rebase: switch ui.log calls to common style (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1748?vs=4586=4598

D1751: histedit: add ui.log for action count

This revision was automatically updated to reflect the committed changes. Closed by commit rHG784a85c87c22: histedit: add ui.log for action count (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1751?vs=4590=4601

D1751: histedit: add ui.log for action count

phillco updated this revision to Diff 4590. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1751?vs=4589=4590 REVISION DETAIL https://phab.mercurial-scm.org/D1751 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git a/hgext/histedit.py

D1751: histedit: add ui.log for action count

phillco created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1751 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git

D1748: rebase: switch ui.log calls to common style

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The old style raised errors in some cases. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1748 AFFECTED FILES hgext/rebase.py

D1745: rebase: don't take out a dirstate guard for in-memory rebase

This revision was automatically updated to reflect the committed changes. Closed by commit rHG01b084914a60: rebase: dont take out a dirstate guard for in-memory rebase (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1739: filemerge: only raise InMemoryMergeConflictsError when running _xmerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHGef7e667a4f7b: filemerge: only raise InMemoryMergeConflictsError when running _xmerge (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1739: filemerge: only raise InMemoryMergeConflictsError when running _xmerge

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The old code here was overly broad and would raise in cases when we didn't end up calling `xmerge` and resolved using an internal tool (such as when

D1681: rebase: add ui.log calls for whether IMM used, whether rebasing WCP

This revision was automatically updated to reflect the committed changes. Closed by commit rHG464b3e5e3eec: rebase: add ui.log calls for whether IMM used, whether rebasing WCP (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1679: rebase: fix for hgsubversion

phillco added a comment. @yuja is that just because of the `_manifest` property cache, or are there others as well? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1679 To: phillco, #hg-reviewers, yuja Cc: yuja, mercurial-devel

D1679: rebase: fix for hgsubversion

This revision was automatically updated to reflect the committed changes. Closed by commit rHG83014fa95435: rebase: fix for hgsubversion (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1679?vs=4415=4428 REVISION

D1681: rebase: add ui.log calls for whether IMM used, whether rebasing WCP

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1681 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py

D1679: rebase: fix for hgsubversion

phillco added a comment. A better way might just be to use `None` for `self.wtcx` when rebasing on disk, which will cause fresh wctxs to be used every time and feel less icky. We could use `sel.inmemory` instead of `self.wctx.isinmemory()`. REPOSITORY rHG Mercurial REVISION DETAIL

D1679: rebase: fix for hgsubversion

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/rHG5c25fe7fb1e63a31ed082dfcb93673fa79cf081f broke something in the hgsubversion test path, causing it raise an abort (Abort:

D1666: rebase: replace --inmemory flag with rebase.experimental.inmemory config

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdd11df900f7f: rebase: replace --inmemory flag with rebase.experimental.inmemory config (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1666: rebase: replace --inmemory flag with rebase.experimental.inmemory config

phillco updated this revision to Diff 4377. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1666?vs=4376=4377 REVISION DETAIL https://phab.mercurial-scm.org/D1666 AFFECTED FILES hgext/rebase.py mercurial/configitems.py tests/test-rebase-inmemory.t

D1666: rebase: replace --inmemory flag with rebase.experimental.inmemory config

phillco updated this revision to Diff 4376. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1666?vs=4375=4376 REVISION DETAIL https://phab.mercurial-scm.org/D1666 AFFECTED FILES hgext/rebase.py mercurial/configitems.py tests/test-rebase-inmemory.t

D1666: rebase: replace --inmemory flag with rebase.experimental.inmemory config

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1666 AFFECTED FILES hgext/rebase.py mercurial/configitems.py tests/test-rebase-inmemory.t CHANGE

D1232: rebase: add the --inmemory option flag; assign a wctx object for the rebase

phillco added a comment. Given that most users will be using the config knob (and eventually, nothing at all), I can just send a followup to rename to `experimental.inmmemory`. Nobody is using it yet. INLINE COMMENTS > dlax wrote in rebase.py:738 > This is useless because "inmemory" will

D1652: tests: add a simple test for in-memory rebase

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb9bdee046cc2: tests: add a simple test for in-memory rebase (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1650: tests: add commit hashes to log commands in rebase tests

This revision was automatically updated to reflect the committed changes. Closed by commit rHG469b06b4c3ca: tests: add commit hashes to log commands in rebase tests (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1652: tests: add a simple test for in-memory rebase

phillco updated this revision to Diff 4348. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1652?vs=4347=4348 REVISION DETAIL https://phab.mercurial-scm.org/D1652 AFFECTED FILES hgext/rebase.py tests/test-rebase-conflicts.t

D1617: rebase: extract _assignworkingcopy

phillco added inline comments. INLINE COMMENTS > krbullock wrote in rebase.py:393 > Rather than having this method spookily set self.wctx, why not make > `_assignworkingcopy` _return_ the wctx (and rename it accordingly)? Good point, I'll send a followup. REPOSITORY rHG Mercurial REVISION

D1652: tests: add a simple test for in-memory rebase

phillco updated this revision to Diff 4347. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1652?vs=4346=4347 REVISION DETAIL https://phab.mercurial-scm.org/D1652 AFFECTED FILES hgext/rebase.py tests/test-rebase-inmemory.t CHANGE DETAILS diff

D1652: tests: add a simple test for in-memory rebase

phillco updated this revision to Diff 4346. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1652?vs=4345=4346 REVISION DETAIL https://phab.mercurial-scm.org/D1652 AFFECTED FILES hgext/rebase.py tests/test-rebase-inmemory.t CHANGE DETAILS diff

D1652: tests: add a simple test for in-memory rebase

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is just a very simple start, but verifies some of the basic cases of an in-memory rebase. REPOSITORY rHG Mercurial REVISION DETAIL

D1650: tests: add commit hashes to log commands in rebase tests

phillco added a comment. (To make this easier to review, I sent https://phab.mercurial-scm.org/D1651 as an abandoned diff that just makes the changes to the `log -G` calls. You could take that one, then run the whole test suite and accept the changes, if it'd be easier to review.)

D1651: tests: change log templates to include hashes

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1651 AFFECTED FILES tests/test-mq-header-date.t tests/test-mq-header-from.t

D1650: tests: add commit hashes to log commands in rebase tests

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Commit hashes are a useful way to ensure the content of commits made in the tests are not changing, even if we don't query every aspect of every commit. (And

D1617: rebase: extract _assignworkingcopy

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8dba17546016: rebase: extract _assignworkingcopy (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1617?vs=4277=4286 REVISION

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

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

D1617: rebase: extract _assignworkingcopy

phillco updated this revision to Diff 4277. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1617?vs=4248=4277 REVISION DETAIL https://phab.mercurial-scm.org/D1617 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

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

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

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

This revision was automatically updated to reflect the committed changes. Closed by commit rHG777cb4497d8d: overlayworkingctx: invalidate the manifest cache when changing parents (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1243: overlayworkingctx: add `_compact()`

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdc9da4f4f363: overlayworkingctx: add `_compact()` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4249=4272

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2e1c32a9c97b: overlayworkingctx: add _manifest, files(), added(), removed(), modified() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

This revision was automatically updated to reflect the committed changes. Closed by commit rHG71edd38c4bb4: overlayworkingctx: add ``tomemctx()`` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=4234=4271

D1241: overlayworkingctx: add _auditconflicts to write()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG72fbdd373de8: overlayworkingctx: add _auditconflicts to write() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1239: overlayworkingctx: add a no-op ``clearunknown()``

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbaf58e621363: overlayworkingctx: add a no-op ``clearunknown()`` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8e1386b342f7: overlayworkingctx: inherit from committablectx instead of workingctx (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

This revision was automatically updated to reflect the committed changes. Closed by commit rHG228916ca12b5: rebase: add concludememorynode(), and call it when rebasing in-memory (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1245: rebase: pass wctx to rebasenode()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG259feddc04e6: rebase: pass wctx to rebasenode() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1245?vs=4260=4262 REVISION

D1247: rebase: pass the wctx object (IMM or on-disk) to merge.update

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2bac2d836ce0: rebase: pass the wctx object (IMM or on-disk) to merge.update (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd901a88891fe: rebase: rerun a rebase on-disk if IMM merge conflicts arise (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1246: rebase: do not update if IMM; instead, set the overlaywctx's parents

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5c25fe7fb1e6: rebase: do not update if IMM; instead, set the overlaywctxs parents (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

phillco added a comment. I've moved the comment back to `rebase()` to fix the help issue. I'm mostly neutral on using recursion or using this approach, though I think having to pass a flag to prevent infinite recursion would be messy. REPOSITORY rHG Mercurial REVISION DETAIL

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

phillco updated this revision to Diff 4261. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4246=4261 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1245: rebase: pass wctx to rebasenode()

phillco added inline comments. INLINE COMMENTS > dlax wrote in rebase.py:995 > Isn't it meant to be used in the function body? I see a `wctx = repo[None]` > below, perhaps it should be dropped. > > But this wouldn't work with a `None` default value as mentioned in the next > patch. Yes, it's

D1245: rebase: pass wctx to rebasenode()

phillco updated this revision to Diff 4260. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1245?vs=4210=4260 REVISION DETAIL https://phab.mercurial-scm.org/D1245 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1246: rebase: do not update if IMM; instead, set the overlaywctx's parents

phillco added inline comments. INLINE COMMENTS > dlax wrote in rebase.py:1003 > `wctx` has a default value of `None`, so either it shouldn't have that or > there should be a check for `None` here. Good point -- dropped. > dlax wrote in rebase.py:1007 > `wctx` is redefined here. This is

D1246: rebase: do not update if IMM; instead, set the overlaywctx's parents

phillco updated this revision to Diff 4259. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1246?vs=4211=4259 REVISION DETAIL https://phab.mercurial-scm.org/D1246 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

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

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,

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

phillco updated this revision to Diff 4258. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=4236=4258 REVISION DETAIL https://phab.mercurial-scm.org/D1244 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

phillco added inline comments. INLINE COMMENTS > dlax wrote in context.py:2003 > Wouldn't `util.clearcachedproperty(self, '_manifest')` work? Thanks! I did not know about it -- will use. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1244 To: phillco,

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

phillco added inline comments. INLINE COMMENTS > durin42 wrote in rebase.py:667 > It's just a style thing. I find avoiding recursion to generally be clearer. > > @phillco dlax is right, the docstring needs fixed here (I'm surprised tests > passed...) huh, weird. not sure how they did.

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

phillco added a comment. OK, kept it in and passing to `man.setflag()`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1238 To: phillco, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list

D1243: overlayworkingctx: add `_compact()`

phillco updated this revision to Diff 4249. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4235=4249 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1617: rebase: extract _assignworkingcopy

phillco updated this revision to Diff 4248. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1617?vs=4243=4248 REVISION DETAIL https://phab.mercurial-scm.org/D1617 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

phillco updated this revision to Diff 4245. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4239=4245 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py mercurial/context.py CHANGE DETAILS diff --git

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

phillco updated this revision to Diff 4246. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4240=4246 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

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

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

D1617: rebase: extract _assignworkingcopy

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Slightly cleaner, and makes it easier to hook this in an extension. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1617 AFFECTED

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

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

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

phillco updated this revision to Diff 4240. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4238=4240 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

phillco updated this revision to Diff 4239. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4237=4239 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py mercurial/context.py CHANGE DETAILS diff --git

D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

phillco updated this revision to Diff 4238. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=4214=4238 REVISION DETAIL https://phab.mercurial-scm.org/D1249 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

phillco updated this revision to Diff 4236. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=4217=4236 REVISION DETAIL https://phab.mercurial-scm.org/D1244 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

phillco updated this revision to Diff 4232. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1240?vs=4205=4232 REVISION DETAIL https://phab.mercurial-scm.org/D1240 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1238: overlayworkingctx: add _manifest, files(), added(), removed(), modified()

phillco updated this revision to Diff 4230. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1238?vs=4203=4230 REVISION DETAIL https://phab.mercurial-scm.org/D1238 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1248: rebase: add concludememorynode(), and call it when rebasing in-memory

phillco updated this revision to Diff 4237. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4213=4237 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py mercurial/context.py CHANGE DETAILS diff --git

D1243: overlayworkingctx: add `_compact()`

phillco updated this revision to Diff 4235. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4216=4235 REVISION DETAIL https://phab.mercurial-scm.org/D1243 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1239: overlayworkingctx: add a no-op ``clearunknown()``

phillco updated this revision to Diff 4231. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1239?vs=4204=4231 REVISION DETAIL https://phab.mercurial-scm.org/D1239 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1242: overlayworkingctx: add ``tomemctx()`` and ``commit()``

phillco updated this revision to Diff 4234. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=4215=4234 REVISION DETAIL https://phab.mercurial-scm.org/D1242 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1241: overlayworkingctx: add _auditconflicts to write()

phillco updated this revision to Diff 4233. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1241?vs=4206=4233 REVISION DETAIL https://phab.mercurial-scm.org/D1241 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

  1   2   3   4   5   >