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

phillco added inline comments. INLINE COMMENTS > phillco wrote in context.py:2022 > Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM. *but let me confirm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1238 To: phillco, #hg-reviewers,

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

phillco added inline comments. INLINE COMMENTS > durin42 wrote in context.py:2022 > Er, wait. As I look closer: should this be used down on lines 2025 and 2028? > Will hold on my push until I hear back. Oops, I think it should be and it got lost along the way. BUT LT ME CONFIRM. > durin42

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa660c1203a9: rebase: do not bail on uncomitted changes if rebasing in-memory (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1235: overlayworkingctx: track copy information in the context

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8b3a636bb341: overlayworkingctx: track copy information in the context (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1237: overlayworkingctx: add `_checkexist(path)`

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbea46aed1e1b: overlayworkingctx: add `_checkexist(path)` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1237?vs=4202=4225

D1236: overlayworkingctx: fix a bad reference to `self._path`

This revision was automatically updated to reflect the committed changes. Closed by commit rHGd4f65050f3c5: overlayworkingctx: fix a bad reference to `self._path` (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

This revision was automatically updated to reflect the committed changes. Closed by commit rHG306a8604741f: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1214: merge: don't check for unknown files in IMM

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5db3c748ce8f: merge: dont check for unknown files in IMM (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1214?vs=4176=4218

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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG482614b3802a: rebase: add the --inmemory option flag; assign a wctx object for the rebase (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1231: overlayworkingctx: move _wrappedctx out of the constructor

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f8c476c49fe: overlayworkingctx: move _wrappedctx out of the constructor (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

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

D1243: overlayworkingctx: add `_compact()`

phillco updated this revision to Diff 4216. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=4208=4216 REVISION DETAIL https://phab.mercurial-scm.org/D1243 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 4207. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=4188=4207 REVISION DETAIL https://phab.mercurial-scm.org/D1242 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

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

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

D1245: rebase: pass wctx to rebasenode()

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

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

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

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

phillco updated this revision to Diff 4209. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=4190=4209 REVISION DETAIL https://phab.mercurial-scm.org/D1244 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 4206. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1241?vs=4187=4206 REVISION DETAIL https://phab.mercurial-scm.org/D1241 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 4213. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=4194=4213 REVISION DETAIL https://phab.mercurial-scm.org/D1248 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py

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

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

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

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

D1243: overlayworkingctx: add `_compact()`

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

D1237: overlayworkingctx: add `_checkexist(path)`

phillco updated this revision to Diff 4202. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1237?vs=4183=4202 REVISION DETAIL https://phab.mercurial-scm.org/D1237 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 4204. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1239?vs=4185=4204 REVISION DETAIL https://phab.mercurial-scm.org/D1239 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1235: overlayworkingctx: track copy information in the context

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

D1236: overlayworkingctx: fix a bad reference to `self._path`

phillco updated this revision to Diff 4201. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1236?vs=4182=4201 REVISION DETAIL https://phab.mercurial-scm.org/D1236 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 4203. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1238?vs=4184=4203 REVISION DETAIL https://phab.mercurial-scm.org/D1238 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

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

D1231: overlayworkingctx: move _wrappedctx out of the constructor

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

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

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

D1527: context: add an abstract base class for filectx

phillco added a comment. > What exactly is that cycle? Can we break one of the links with a local import? It's the same filectx -> ctx -> fileset -> merge -> filemerge cycle that frustrated earlier. We can't circumvent it this time (I think) because the import is in the module, not a

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

phillco added a comment. > Perhaps the option should be flagged experimental then? Good point, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1232 To: phillco, #hg-reviewers, dlax Cc: durin42, dlax, mercurial-devel

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

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

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

phillco updated this revision to Diff 4184. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1238?vs=3111=4184 REVISION DETAIL https://phab.mercurial-scm.org/D1238

D1244: overlayworkingctx: invalidate the manifest cache when changing parents

phillco updated this revision to Diff 4190. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1244?vs=3117=4190 REVISION DETAIL https://phab.mercurial-scm.org/D1244

D1236: overlayworkingctx: fix a bad reference to `self._path`

phillco updated this revision to Diff 4182. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1236?vs=3109=4182 REVISION DETAIL https://phab.mercurial-scm.org/D1236

D1243: overlayworkingctx: add `_compact()`

phillco updated this revision to Diff 4189. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1243?vs=3116=4189 REVISION DETAIL https://phab.mercurial-scm.org/D1243

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

phillco updated this revision to Diff 4194. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1248?vs=3121=4194 REVISION DETAIL https://phab.mercurial-scm.org/D1248

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

phillco updated this revision to Diff 4195. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1249?vs=3122=4195 REVISION DETAIL https://phab.mercurial-scm.org/D1249

D1237: overlayworkingctx: add `_checkexist(path)`

phillco updated this revision to Diff 4183. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1237?vs=3110=4183 REVISION DETAIL https://phab.mercurial-scm.org/D1237

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

phillco updated this revision to Diff 4188. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1242?vs=3115=4188 REVISION DETAIL https://phab.mercurial-scm.org/D1242

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

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

D1241: overlayworkingctx: add _auditconflicts to write()

phillco updated this revision to Diff 4187. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1241?vs=3114=4187 REVISION DETAIL https://phab.mercurial-scm.org/D1241

D1245: rebase: pass wctx to rebasenode()

phillco updated this revision to Diff 4191. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1245?vs=3118=4191 REVISION DETAIL https://phab.mercurial-scm.org/D1245

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

phillco updated this revision to Diff 4192. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1246?vs=3119=4192 REVISION DETAIL https://phab.mercurial-scm.org/D1246

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

phillco updated this revision to Diff 4193. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1247?vs=3120=4193 REVISION DETAIL https://phab.mercurial-scm.org/D1247

D1235: overlayworkingctx: track copy information in the context

phillco updated this revision to Diff 4181. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1235?vs=3108=4181 REVISION DETAIL https://phab.mercurial-scm.org/D1235

D1240: overlayworkingctx: inherit from committablectx instead of workingctx

phillco updated this revision to Diff 4186. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1240?vs=3113=4186 REVISION DETAIL https://phab.mercurial-scm.org/D1240

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

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

D1231: overlayworkingctx: move _wrappedctx out of the constructor

phillco updated this revision to Diff 4177. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1231?vs=4041=4177 REVISION DETAIL https://phab.mercurial-scm.org/D1231 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 4185. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1239?vs=3112=4185 REVISION DETAIL https://phab.mercurial-scm.org/D1239

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

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

D1527: context: add an abstract base class for filectx

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

D1214: merge: don't check for unknown files in IMM

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

D1230: overlayworkingctx: make clean() public

This revision was automatically updated to reflect the committed changes. Closed by commit rHG307b1689e3f8: overlayworkingctx: make clean() public (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1230?vs=4040=4173

D1216: overlayworkingctx: remove flushall()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG3ceebf497057: overlayworkingctx: remove flushall() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1216?vs=4039=4172

D1211: context: switch ctx() use to changectx()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG010179e21e91: context: switch ctx() use to changectx() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1211?vs=4037=4168

D1213: merge: remove calls to flushall()

This revision was automatically updated to reflect the committed changes. Closed by commit rHG46510597d266: merge: remove calls to flushall() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1213?vs=3552=4170 REVISION

D1215: merge: skip subrepo state, update hooks, and updating the dirstate in IMM

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1b03407e808d: merge: skip subrepo state, update hooks, and updating the dirstate in IMM (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1212: filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM

This revision was automatically updated to reflect the committed changes. Closed by commit rHG46d7f0713a87: filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1211: context: switch ctx() use to changectx()

phillco added a subscriber: sid0. phillco added a comment. cc @sid0 on the absentfilectx thing, maybe he knows more REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1211 To: phillco, #hg-reviewers, dlax Cc: sid0, martinvonz, mercurial-devel

D1212: filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM

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

D1216: overlayworkingctx: remove flushall()

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

D1230: overlayworkingctx: make clean() public

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

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

phillco updated this revision to Diff 4042. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1232?vs=3105=4042 REVISION DETAIL https://phab.mercurial-scm.org/D1232

D1234: rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts

phillco updated this revision to Diff 4044. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1234?vs=3107=4044 REVISION DETAIL https://phab.mercurial-scm.org/D1234

D1231: overlayworkingctx: move _wrappedctx out of the constructor

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

D1233: rebase: do not bail on uncomitted changes if rebasing in-memory

phillco updated this revision to Diff 4043. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1233?vs=3106=4043 REVISION DETAIL https://phab.mercurial-scm.org/D1233

D1211: context: switch ctx() use to changectx()

phillco added a subscriber: martinvonz. phillco added a comment. I made https://phab.mercurial-scm.org/D1527 the new bottom of the stack, per @martinvonz's request. It actually caught a mistake that made me significantly change this commit :) REPOSITORY rHG Mercurial REVISION DETAIL

D1212: filemerge: raise InMemoryMergeConflictsError whenever we hit merge conflicts

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

D1211: context: switch ctx() use to changectx()

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

D1211: context: switch ctx() use to changectx()

phillco updated this revision to Diff 4036. phillco edited the summary of this revision. phillco retitled this revision from "context: add ctx() to workingfilectx and absentfilectx" to "context: switch ctx() use to changectx()". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1527: context: add an abstract base class for filectx

phillco added a comment. Note that we can't actually make `absentfilectx` based off this class today because of the `context -> merge` imprt cycle. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1527 To: phillco, #hg-reviewers, martinvonz Cc: mercurial-devel

D1527: context: add an abstract base class for filectx

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `basectx` is very well and good, but we have two other filectx-like classes that do not inherit from it (`arbitraryfilectx` and absentfilectx`), and cannot,

D1210: error: add InMemoryMergeConflictsError

This revision was automatically updated to reflect the committed changes. Closed by commit rHG795bfa2a9103: error: add InMemoryMergeConflictsError (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1210?vs=3059=3685

D1231: overlayworkingctx: move _wrappedctx out of the constructor

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

D1230: overlayworkingctx: make clean() public

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

D1215: merge: skip subrepo state, update hooks, and updating the dirstate in IMM

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

D1216: overlayworkingctx: remove flushall()

phillco updated this revision to Diff 3560. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1216?vs=3556=3560 REVISION DETAIL https://phab.mercurial-scm.org/D1216 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py ---

D1214: merge: don't check for unknown files in IMM

phillco updated this revision to Diff 3559. phillco marked an inline comment as done. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1214?vs=3554=3559 REVISION DETAIL https://phab.mercurial-scm.org/D1214 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D1214: merge: don't check for unknown files in IMM

phillco marked an inline comment as done. phillco added inline comments. INLINE COMMENTS > martinvonz wrote in merge.py:664 > Should this also short-circuit? Good catch, thanks. REVISION DETAIL https://phab.mercurial-scm.org/D1214 To: phillco, #hg-reviewers Cc: mercurial-devel, martinvonz

D1215: merge: skip subrepo state, update hooks, and updating the dirstate in IMM

phillco updated this revision to Diff 3555. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1215?vs=3064=3555 REVISION DETAIL https://phab.mercurial-scm.org/D1215 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py b/mercurial/merge.py ---

D1231: overlayworkingctx: move _wrappedctx out of the constructor

phillco updated this revision to Diff 3558. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1231?vs=3104=3558 REVISION DETAIL https://phab.mercurial-scm.org/D1231 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py ---

D1230: overlayworkingctx: make clean() public

phillco updated this revision to Diff 3557. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1230?vs=3103=3557 REVISION DETAIL https://phab.mercurial-scm.org/D1230 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py ---

D1216: overlayworkingctx: remove flushall()

phillco updated this revision to Diff 3556. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1216?vs=3065=3556 REVISION DETAIL https://phab.mercurial-scm.org/D1216 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py ---

D1214: merge: don't check for unknown files in IMM

phillco updated this revision to Diff 3554. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1214?vs=3063=3554 REVISION DETAIL https://phab.mercurial-scm.org/D1214 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py b/mercurial/merge.py ---

D1213: merge: remove calls to flushall()

phillco added a comment. Note: This series actually starts with https://phab.mercurial-scm.org/D1210: https://phab.mercurial-scm.org/D1210. I submitted it without a callsign originally which is why it did not hit the mailing list at first. REVISION DETAIL

D1212: filemerge: raise InMemoryMergeConflictsError whenever we hit merge conflicts

phillco updated this revision to Diff 3551. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1212?vs=3061=3551 REVISION DETAIL https://phab.mercurial-scm.org/D1212 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py

D1213: merge: remove calls to flushall()

phillco updated this revision to Diff 3552. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1213?vs=3062=3552 REVISION DETAIL https://phab.mercurial-scm.org/D1213 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py b/mercurial/merge.py ---

D1165: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco added inline comments. INLINE COMMENTS > phillco wrote in test-arbitraryfilectx.t:4-5 > hm, something might be up with my setup, definitely got a green on > everything. I'll look into it. Ah, mea culpa. I had exempted those from my test system while on the long-lived in-memory merge

D1165: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco added inline comments. INLINE COMMENTS > ryanmce wrote in context.py:2578 > I will remove the backticks in-flight; I think this are discouraged in > comments still > > Excellent comment overall, nonetheless Is there one standard for indicating code snippets? I've seen backticks,

D1165: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco added inline comments. INLINE COMMENTS > ryanmce wrote in test-arbitraryfilectx.t:4-5 > --- /data/users/rmcelroy/mercurial/hg/tests/test-check-module-imports.t > +++ /data/users/rmcelroy/mercurial/hg/tests/test-check-module-imports.t.err > @@ -42,3 +42,6 @@ > > -X

D1165: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

This revision was automatically updated to reflect the committed changes. Closed by commit rHG14c87708f432: arbitraryfilecontext: skip the cmp fast path if any side is a symlink (authored by phillco, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D1165?vs=2942=2954#toc

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco added a comment. I've sent https://phab.mercurial-scm.org/D1165, which is the corrected version. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel

D1165: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `filecmp` follows symlinks by default, which a `filectx.cmp()` call should not be doing as it should only compare the requested entry. After this patch, only

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco updated this revision to Diff 2941. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2878=2941 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tests/test-arbitraryfilectx.t CHANGE DETAILS

D1122: arbitraryfilecontext: skip the cmp fast path if any side is a symlink

phillco added a comment. Whoops, sorry, I forgot to run tests on the most recent version. Will fix & resend. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel

D1106: context: add workingfilectx.markcopied

This revision was automatically updated to reflect the committed changes. Closed by commit rHGcc1bf4612bb4: context: add workingfilectx.markcopied (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1106?vs=2798=2867

D1057: filemerge: use arbitraryfilectx for backups

This revision was automatically updated to reflect the committed changes. phillco marked an inline comment as done. Closed by commit rHG8e247db0d0f6: filemerge: use arbitraryfilectx for backups (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1058: context: add overlayfilectx.cmp()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe8ec39263850: context: add overlayfilectx.cmp() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1058?vs=2697=2863 REVISION

<    1   2   3   4   5   >