phillco (Phil Cohen)
Dervoper

Projects

User does not belong to any projects.

User Details

User Since
Jun 23 2017, 6:41 PM (86 w, 1 d)

Recent Activity

Aug 15 2018

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

lgtm

Aug 15 2018, 9:39 PM

Mar 21 2018

phillco added a comment to D2924: rebase: rename conclude[memory]node() to commit[memory]node().

What _is_ the difference between "conclude" and "commit"?

Mar 21 2018, 7:49 PM

Mar 15 2018

phillco accepted D2876: rebase: allow in-memory merge of the working copy parent.
Mar 15 2018, 4:40 PM

Mar 5 2018

phillco updated subscribers of D2701: merge: use constants for actions.

btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc)

Mar 5 2018, 10:03 PM
phillco added inline comments to D2701: merge: use constants for actions.
Mar 5 2018, 10:02 PM
phillco added inline comments to D2701: merge: use constants for actions.
Mar 5 2018, 9:07 PM
phillco accepted D2701: merge: use constants for actions.

Strong +1

Mar 5 2018, 9:06 PM

Jan 21 2018

phillco accepted D1934: convert: use a collections.deque.

Nice.

Jan 21 2018, 11:23 PM
phillco abandoned D1527: context: add an abstract base class for filectx.
Jan 21 2018, 11:22 PM
phillco abandoned D1744: rebase: print `experimental.inmemorywarning` when rebasing IMM.
Jan 21 2018, 11:22 PM

Jan 18 2018

phillco closed D1782: rebase: don't run IMM if running rebase in a transaction.
Jan 18 2018, 8:01 AM
phillco closed D1807: filemerge: only write in-memory backup during premerge.
Jan 18 2018, 8:01 AM
phillco committed rHG9a50ffd15b25: filemerge: only write in-memory backup during premerge.
filemerge: only write in-memory backup during premerge
Jan 18 2018, 8:01 AM
phillco closed D1806: filemerge: fix backing up an in-memory file to a custom location.
Jan 18 2018, 8:01 AM
phillco committed rHGc0439e11af16: filemerge: fix backing up an in-memory file to a custom location.
filemerge: fix backing up an in-memory file to a custom location
Jan 18 2018, 8:01 AM
phillco committed rHGc5d220a621e7: rebase: don't run IMM if running rebase in a transaction.
rebase: don't run IMM if running rebase in a transaction
Jan 18 2018, 8:01 AM

Jan 5 2018

phillco abandoned D1814: rebase: add experimental.inmemory.nomergedriver to turn off IMM.
Jan 5 2018, 1:14 PM
phillco abandoned D1815: merge: only abort in IMM if files are actually marked as driver-resolved.
Jan 5 2018, 1:14 PM
phillco updated the summary of D1815: merge: only abort in IMM if files are actually marked as driver-resolved.
Jan 5 2018, 1:04 PM
phillco updated the diff for D1815: merge: only abort in IMM if files are actually marked as driver-resolved.
Jan 5 2018, 1:03 PM
phillco created D1815: merge: only abort in IMM if files are actually marked as driver-resolved.
Jan 5 2018, 1:01 PM
phillco created D1814: rebase: add experimental.inmemory.nomergedriver to turn off IMM.
Jan 5 2018, 1:01 PM
phillco added a dependent revision for D1814: rebase: add experimental.inmemory.nomergedriver to turn off IMM: D1815: merge: only abort in IMM if files are actually marked as driver-resolved.
Jan 5 2018, 1:01 PM
phillco updated the diff for D1805: sparse: don't materialize sparse files during IMM.
Jan 5 2018, 12:40 AM
phillco added inline comments to D1805: sparse: don't materialize sparse files during IMM.
Jan 5 2018, 12:39 AM
phillco updated the diff for D1807: filemerge: only write in-memory backup during premerge.
Jan 5 2018, 12:38 AM
phillco updated the diff for D1806: filemerge: fix backing up an in-memory file to a custom location.
Jan 5 2018, 12:38 AM
phillco updated the diff for D1807: filemerge: only write in-memory backup during premerge.
Jan 5 2018, 12:35 AM
phillco updated the diff for D1806: filemerge: fix backing up an in-memory file to a custom location.
Jan 5 2018, 12:35 AM

Jan 4 2018

phillco added inline comments to D1805: sparse: don't materialize sparse files during IMM.
Jan 4 2018, 3:42 PM
phillco updated the diff for D1805: sparse: don't materialize sparse files during IMM.
Jan 4 2018, 3:24 PM
phillco added a comment to D1805: sparse: don't materialize sparse files during IMM.

I added a comment and also filed T24918295 for the wider task around allowing lazy filectx writes (but as Durham mentioned that's a strict improvement on the status quo).

Jan 4 2018, 3:22 PM
phillco updated the diff for D1805: sparse: don't materialize sparse files during IMM.
Jan 4 2018, 3:20 PM
phillco added a comment to D1806: filemerge: fix backing up an in-memory file to a custom location.

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?

Jan 4 2018, 3:18 PM
phillco updated the summary of D1806: filemerge: fix backing up an in-memory file to a custom location.
Jan 4 2018, 2:37 PM
phillco created D1807: filemerge: only write in-memory backup during premerge.
Jan 4 2018, 2:36 PM
phillco created D1806: filemerge: fix backing up an in-memory file to a custom location.
Jan 4 2018, 2:36 PM
phillco added a dependent revision for D1806: filemerge: fix backing up an in-memory file to a custom location: D1807: filemerge: only write in-memory backup during premerge.
Jan 4 2018, 2:36 PM
phillco added a comment to D1805: sparse: don't materialize sparse files during IMM.

I'll add a comment.

Jan 4 2018, 2:21 PM
phillco created D1805: sparse: don't materialize sparse files during IMM.
Jan 4 2018, 1:01 PM

Dec 28 2017

phillco updated the diff for D1787: rebase: turn off IMM if any rebased paths match a config.
Dec 28 2017, 8:46 PM
phillco updated the diff for D1787: rebase: turn off IMM if any rebased paths match a config.
Dec 28 2017, 6:13 PM
phillco updated the summary of D1785: rebase: log why we didn't use IMM.
Dec 28 2017, 5:38 PM
phillco created D1787: rebase: turn off IMM if any rebased paths match a config.
Dec 28 2017, 5:35 PM
phillco added a dependent revision for D1786: rebase: extract _shoulddisableimm for clarity: D1787: rebase: turn off IMM if any rebased paths match a config.
Dec 28 2017, 5:35 PM
phillco created D1786: rebase: extract _shoulddisableimm for clarity.
Dec 28 2017, 5:35 PM
phillco added a dependent revision for D1785: rebase: log why we didn't use IMM: D1786: rebase: extract _shoulddisableimm for clarity.
Dec 28 2017, 5:35 PM
phillco added a reviewer for D1785: rebase: log why we didn't use IMM: quark.
Dec 28 2017, 5:04 PM
phillco created D1785: rebase: log why we didn't use IMM.
Dec 28 2017, 5:04 PM

Dec 27 2017

phillco accepted D1783: perftweaks: log nodemap lag.
Dec 27 2017, 7:23 PM
phillco added a reviewer for D1744: rebase: print `experimental.inmemorywarning` when rebasing IMM: hg-reviewers.
Dec 27 2017, 6:51 PM
phillco updated the diff for D1782: rebase: don't run IMM if running rebase in a transaction.
Dec 27 2017, 6:44 PM
phillco updated the diff for D1782: rebase: don't run IMM if running rebase in a transaction.
Dec 27 2017, 6:38 PM
phillco closed D1781: merge: raise before running mergedriver if using IMM.
Dec 27 2017, 6:37 PM
phillco committed rHG87918218da70: merge: raise before running mergedriver if using IMM.
merge: raise before running mergedriver if using IMM
Dec 27 2017, 6:37 PM
phillco updated the diff for D1782: rebase: don't run IMM if running rebase in a transaction.
Dec 27 2017, 6:36 PM
phillco created D1782: rebase: don't run IMM if running rebase in a transaction.
Dec 27 2017, 6:34 PM
phillco updated the summary of D1781: merge: raise before running mergedriver if using IMM.
Dec 27 2017, 2:53 PM
phillco created D1781: merge: raise before running mergedriver if using IMM.
Dec 27 2017, 2:51 PM

Dec 22 2017

phillco closed D1751: histedit: add ui.log for action count.
Dec 22 2017, 9:08 PM
phillco committed rHG784a85c87c22: histedit: add ui.log for action count.
histedit: add ui.log for action count
Dec 22 2017, 9:08 PM
phillco closed D1748: rebase: switch ui.log calls to common style.
Dec 22 2017, 9:08 PM
phillco committed rHGbf556bd2f589: rebase: switch ui.log calls to common style.
rebase: switch ui.log calls to common style
Dec 22 2017, 9:08 PM
phillco updated the diff for D1751: histedit: add ui.log for action count.
Dec 22 2017, 4:26 PM
phillco planned changes to D1751: histedit: add ui.log for action count.
Dec 22 2017, 4:23 PM
phillco added a reviewer for D1751: histedit: add ui.log for action count: quark.
Dec 22 2017, 4:19 PM
phillco created D1751: histedit: add ui.log for action count.
Dec 22 2017, 4:18 PM
phillco created D1748: rebase: switch ui.log calls to common style.
Dec 22 2017, 2:16 PM
phillco closed D1745: rebase: don't take out a dirstate guard for in-memory rebase.
Dec 22 2017, 11:01 AM
phillco committed rHG01b084914a60: rebase: don't take out a dirstate guard for in-memory rebase.
rebase: don't take out a dirstate guard for in-memory rebase
Dec 22 2017, 11:01 AM
phillco added a reviewer for D1745: rebase: don't take out a dirstate guard for in-memory rebase: hg-reviewers.
Dec 22 2017, 1:44 AM
phillco created D1745: rebase: don't take out a dirstate guard for in-memory rebase.
Dec 22 2017, 1:36 AM

Dec 21 2017

phillco created D1744: rebase: print `experimental.inmemorywarning` when rebasing IMM.
Dec 21 2017, 9:43 PM
phillco closed D1739: filemerge: only raise InMemoryMergeConflictsError when running _xmerge.
Dec 21 2017, 1:26 PM
phillco committed rHGef7e667a4f7b: filemerge: only raise InMemoryMergeConflictsError when running _xmerge.
filemerge: only raise InMemoryMergeConflictsError when running _xmerge
Dec 21 2017, 1:26 PM

Dec 20 2017

phillco created D1739: filemerge: only raise InMemoryMergeConflictsError when running _xmerge.
Dec 20 2017, 6:22 PM
phillco accepted D1711: clindex: remove broken caches if things go wrong.

lgtm

Dec 20 2017, 5:37 PM

Dec 17 2017

phillco committed rHG71446ca85813: rebase: add ui.log calls for whether IMM used, whether rebasing WCP.
rebase: add ui.log calls for whether IMM used, whether rebasing WCP
Dec 17 2017, 2:27 PM

Dec 15 2017

phillco committed rFBHGX4e9b9c330f43: fastverify: fix config defaults.
fastverify: fix config defaults
Dec 15 2017, 2:34 PM
phillco committed rFBHGX1b85ea1826cc: noverify: add extension to skip repo verification.
noverify: add extension to skip repo verification
Dec 15 2017, 2:33 PM
phillco closed D1681: rebase: add ui.log calls for whether IMM used, whether rebasing WCP.
Dec 15 2017, 1:22 PM
phillco committed rHG464b3e5e3eec: rebase: add ui.log calls for whether IMM used, whether rebasing WCP.
rebase: add ui.log calls for whether IMM used, whether rebasing WCP
Dec 15 2017, 1:22 PM
phillco abandoned D1614: noverify: add extension to skip repo verification.

landed

Dec 15 2017, 2:08 AM
phillco updated the diff for D1614: noverify: add extension to skip repo verification.
Dec 15 2017, 1:59 AM
phillco added a comment to D1614: noverify: add extension to skip repo verification.

Based on Messenger discussion, this version just skips the manifest verification and future steps which require it, but keeps changeset verification. Can probably get by without upstream refactor.

Dec 15 2017, 1:53 AM
phillco updated the diff for D1614: noverify: add extension to skip repo verification.
Dec 15 2017, 1:52 AM
phillco updated the diff for D1614: noverify: add extension to skip repo verification.
Dec 15 2017, 1:51 AM

Dec 14 2017

phillco added a comment to D1679: rebase: fix for hgsubversion.

@yuja is that just because of the _manifest property cache, or are there others as well?

Dec 14 2017, 2:01 PM
phillco closed D1679: rebase: fix for hgsubversion.
Dec 14 2017, 7:30 AM
phillco committed rHG83014fa95435: rebase: fix for hgsubversion.
rebase: fix for hgsubversion
Dec 14 2017, 7:30 AM

Dec 13 2017

phillco added a comment to D1614: noverify: add extension to skip repo verification.

(Need to look at https://phabricator.intern.facebook.com/D6558110 too which is touching verify)

Dec 13 2017, 7:42 PM
phillco updated the summary of D1330: hgext3rd: add hg continue and hg abort.
Dec 13 2017, 7:05 PM
phillco added a comment to D1614: noverify: add extension to skip repo verification.

OK, extracting just the manifest verification will take a bit of upstream refactoring. I'll send an upstream change to do that + a followup to scope this to just changesets. But people are still running verifies that take 4 days and make tons of packfiles, so I'm still +1 on landing this while that's happening.

Dec 13 2017, 6:47 PM
phillco added a comment to D1614: noverify: add extension to skip repo verification.

I can do that, we just wanted to get a MVP out ASAP since people are hurtin'.

Dec 13 2017, 6:20 PM
phillco updated the summary of D1681: rebase: add ui.log calls for whether IMM used, whether rebasing WCP.
Dec 13 2017, 1:32 PM
phillco created D1681: rebase: add ui.log calls for whether IMM used, whether rebasing WCP.
Dec 13 2017, 1:31 PM
phillco added a comment to D1614: noverify: add extension to skip repo verification.

Added a test, description and moved to config.

Dec 13 2017, 1:20 PM
phillco updated the diff for D1614: noverify: add extension to skip repo verification.
Dec 13 2017, 1:19 PM
phillco added inline comments to D1614: noverify: add extension to skip repo verification.
Dec 13 2017, 1:06 PM
phillco added a comment to D1679: rebase: fix for hgsubversion.

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 self.inmemory instead of self.wctx.isinmemory().

Dec 13 2017, 12:55 PM