D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco added inline comments. INLINE COMMENTS > durin42 wrote in util.py:1862 > This function makes me really nervous, because it's a naive datetime rather > than a tz-aware datetime. Could we do better about preserving the exact > point-in-time value of the tz-aware time information? > >

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco added a comment. r https://phab.mercurial-scm.org/rHG87c6ad2251d8703d7f16d51e99e3d1c040f0be49 INLINE COMMENTS > phillco wrote in util.py:1862 > Hm, good question. I only do that because that's what the earlier code did -- > that change dates from

D376: filemerge: extract `_picklabels` as a helper function

This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa6c290a77fa: filemerge: extract `_picklabels` as a helper function (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D376?vs=857=958

D375: simplemerge: write merge result to the localctx, if passed

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb86fc43e4b73: simplemerge: write merge result to the localctx, if passed (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D375?vs=856=957

D371: simplemerge: extract verifytext as a helper function

This revision was automatically updated to reflect the committed changes. Closed by commit rHGde573184686e: simplemerge: extract verifytext as a helper function (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D371?vs=852=953 REVISION

D373: filemerge: pass contexts to simplemerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHGdb3e9f7c91aa: filemerge: pass contexts to simplemerge (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D373?vs=854=956 REVISION DETAIL

D374: simplemerge: use contexts to read file data from, if passed

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8b91a4ff23ad: simplemerge: use contexts to read file data from, if passed (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D374?vs=855=955

D372: simplemerge: add optional context parameters to simplemerge

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb3571dc0e6b8: simplemerge: add optional context parameters to simplemerge (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D372?vs=853=954

D351: demandimport: disable by default if chg is being used

phillco accepted this revision. phillco added a comment. lgtm, pending sid's comment. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D351 To: quark, #hg-reviewers, phillco Cc: phillco, sid0, yuja, mercurial-devel ___

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco added a comment. > Forget about my comment on the commit message, I was fooled by phabricator Did you make one? I only see the two inline ones. INLINE COMMENTS > lothiraldan wrote in util.py:1898 > Why not passing the date and tz as separate argument instead of a tuple? I

D370: templatefilters: add `reldate` for human-style relative dates

phillco added a comment. Heh, whoops. It didn't come up for searches of "relative" or "relative date". I'll abandon this revision but the one right before it is probably still worth including. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D370 To:

D388: filemerge: extract _maketemp and _makebackup

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/D388 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

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

D401: filemerge: reduce creation of tempfiles until needed

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/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D401: filemerge: add `_workingpath`

phillco updated this revision to Diff 910. phillco edited the summary of this revision. phillco retitled this revision from "filemerge: reduce creation of tempfiles until needed" to "filemerge: add `_workingpath`". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D403: filemerge: reduce creation of tempfiles until needed

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This restricts the creation of temporary files to just `_xmerge`, when we call an external tool. REPOSITORY rHG Mercurial REVISION DETAIL

D369: util: add `hgdatetopython` to convert hg-style dates to datetimes

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Extract the existing code from ``datestr``. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D369 AFFECTED FILES mercurial/util.py

D370: templatefilters: add `reldate` for human-style relative dates

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY e.g., "3 days ago", "6 hours ago", etc. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D370 AFFECTED FILES

D381: simplemerge: stop accepting, and passing, file parameters

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/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py CHANGE

D380: simplemerge: stop reading from, and writing to, files

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now use contexts first for everything and also pass them everywhere. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D380 AFFECTED

D375: simplemerge: write merge result to the localctx, if passed

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/D375 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py

D378: contrib: make simplemerge script pass context-like objects

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `simplemerge()` will soon require context-like objects to work. Create a simple context-like object that wraps the requested files and can be passed to the new

D373: filemerge: pass contexts to simplemerge

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Otherwise, this should be a no-op. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D373 AFFECTED FILES mercurial/filemerge.py

D379: simplemerge: use context paths for default labels instead of file paths

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is the last place we used the filepath arguments without first using the context version. REPOSITORY rHG Mercurial REVISION DETAIL

D383: simplemerge: simplify code now that we always write to a context

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There's no need for an `out` abstraction between files and contexts anymore. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D383

D372: simplemerge: add optional context parameters to simplemerge

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename the existing parameters for clarity. These will, in subsequent patches, allow callers to redirect reads (of the three sides of the merge) and writes

D382: simplemerge: make context parameters non-optional

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Also update the function docstring. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D382 AFFECTED FILES mercurial/simplemerge.py

D374: simplemerge: use contexts to read file data from, if passed

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/D374 AFFECTED FILES mercurial/simplemerge.py tests/test-lfconvert.t CHANGE DETAILS diff --git

D376: filemerge: extract `_picklabels` as a helper function

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This shortens `simplemerge()` and is a bit cleaner, IMO. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D376 AFFECTED FILES

D371: simplemerge: extract verifytext as a helper function

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will be used in a subsequent commit. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D371 AFFECTED FILES

D371: simplemerge: extract verifytext as a helper function

phillco added a comment. This stack isn't particular complicated; it's just that changing simplemerge to go from files to contexts, with small commits and working intermediate commits, requires some jumping around. REPOSITORY rHG Mercurial REVISION DETAIL

[Differential] [Accepted] D38: phabricator: allow specifying reviewers on phabsend

phillco accepted this revision. phillco added a comment. This revision is now accepted and ready to land. lgtm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D38 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: quark,

[Differential] [Commented On] D62: rebase: add config to move rebase into a single transaction

phillco added a comment. lgtm INLINE COMMENTS > util.py:592-594 > +class nullcontextmanager(object): > +"""A no-op context manager. > +""" Thanks, I was looking for something like this on one of my branches! REPOSITORY rHG Mercurial REVISION DETAIL

[Differential] [Accepted] D62: rebase: add config to move rebase into a single transaction

phillco accepted this revision as: phillco. phillco added a comment. This revision is now accepted and ready to land. Actual LGTM. Though, it's interesting, it looks like I have the ability to accept as `hg`. I presume I'll need to keep unchecking that so I don't accidentally pretend to

[Differential] [Changed Subscribers] D63: rebase: use one dirstateguard for when using rebase.singletransaction

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in test-rebase-base.t:400 > I haven't seen this style of starting a comment with '-' elsewhere, so it > feels more confusing than helpful. I can see the point of doing it to > indicate intra-testcase comments (as opposed to the

D444: merge: move some of the logic in batchget() to workingfilectx

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We will use this logic in two places with in-memory merge. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES

D399: filemerge: eliminate most uses of tempfiles

phillco added a comment. Fixed, thanks @lothiraldan :) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D399 To: phillco, #hg-reviewers Cc: lothiraldan, mercurial-devel ___ Mercurial-devel mailing list

D449: merge: pass wctx to premerge, filemerge

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/D449 AFFECTED FILES hgext/largefiles/overrides.py mercurial/filemerge.py mercurial/merge.py

D449: merge: pass wctx to premerge, filemerge

phillco added a comment. Not sure if I phabsent this correctly, but this shouldn't have any dependencies. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D449 To: phillco, #hg-reviewers Cc: mercurial-devel ___

D434: context: add `decodeddata()` to basefilectx

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will be used as an abstraction by simplemerge to get the data it used to read off the filesystem. REPOSITORY rHG Mercurial REVISION DETAIL

D378: contrib: make simplemerge script pass context-like objects

phillco updated this revision to Diff 1038. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D378?vs=859=1038 REVISION DETAIL https://phab.mercurial-scm.org/D378 AFFECTED FILES contrib/simplemerge CHANGE DETAILS diff --git a/contrib/simplemerge

D435: simplemerge: use `ctx.decoddeddata()` instead of `repo.wreaddata`

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This eliminates the need for the `repo` object. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D435 AFFECTED FILES

D377: simplemerge: add `filtereddata=False` to simplemerge()

phillco abandoned this revision. phillco added a comment. Abandoned in favor of https://phab.mercurial-scm.org/D434's approach. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D377 To: phillco, #hg-reviewers Cc: durin42, mercurial-devel

D381: simplemerge: stop accepting, and passing, file parameters

phillco updated this revision to Diff 1041. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=862=1041 REVISION DETAIL https://phab.mercurial-scm.org/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py

D382: simplemerge: make context parameters non-optional

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

D383: simplemerge: simplify code now that we always write to a context

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

D380: simplemerge: stop reading from, and writing to, files

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

D379: simplemerge: use context paths for default labels instead of file paths

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

D379: simplemerge: use context paths for default labels instead of file paths

phillco added a comment. Blocked on https://phab.mercurial-scm.org/D378. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D379 To: phillco, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D616: context: add overlayworkingcontext and overlayworkingfilectx

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf698bb31bdfb: context: add overlayworkingcontext and overlayworkingfilectx (authored by phillco). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D616?vs=1723=1744#toc REPOSITORY rHG

D674: filemerge: use arbitraryfilectx for backup files

phillco added inline comments. INLINE COMMENTS > martinvonz wrote in filemerge.py:744 > Can we not simply make arbitraryfilectx.cmp() something like > > def cmp(self, fctx): > if isinstance(fctx, arbitraryfilectx): > return filecmp.cmp(self.path(), fctx.path()) > return

D674: filemerge: use arbitraryfilectx for backup files

phillco planned changes to this revision. phillco added a comment. Putting back in my queue -- still have two comments of Martin's to respond to. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D674 To: phillco, #hg-reviewers Cc: sid0, martinvonz, mercurial-devel

D674: filemerge: use arbitraryfilectx for backup files

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

D674: filemerge: use arbitraryfilectx for backup files

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

D674: filemerge: use arbitraryfilectx for backup files

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

D682: merge: allow a custom working context to be passed to update

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

D682: merge: allow a custom working context to be passed to update

This revision was automatically updated to reflect the committed changes. Closed by commit rHG440ece43024c: merge: allow a custom working context to be passed to update (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D683: largefiles: force an on-disk merge

This revision was automatically updated to reflect the committed changes. Closed by commit rHG575097b4dce0: largefiles: force an on-disk merge (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D683?vs=1727=2043 REVISION

D1105: merge: don't use workers in in-memory mode

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The worker processes can't share memory, so workers should not be used. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1105

D1106: context: add workingfilectx.markcopied

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY With in-memory merge, copy information needs to be stored in-memory, not in the dirstate. To make this transition easy, move the existing dirstate-based

D1057: use arbitraryfilectx for backups

phillco added inline comments. INLINE COMMENTS > durin42 wrote in filemerge.py:604 > Well that's a bummer. Could we move context.*filectx* into > mercurial.filecontext and then avoid the need for this function-level import? I don't think so, because the filectx classes reference the ctx

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

phillco added inline comments. INLINE COMMENTS > ryanmce wrote in context.py:2567 > Why is this sufficient? Can't the contents be the same even if the paths are > different? > > I think you can only fastpath if the paths are the same, otherwise you have > to fall back to data comparison. > >

D1106: context: add workingfilectx.markcopied

phillco added a comment. I could split out the wctx passing, if necessary. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1106 To: phillco, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

phillco added inline comments. INLINE COMMENTS > phillco wrote in context.py:2567 > Ryan and I talked offline -- but surprisingly, the default `filectx.cmp` > function only compares contents: > > 1:~/1$ repo['.']['A'].cmp(repo['.']['B']) > Out[1]: False > > 2:~/1$

D1061: context: add is `isinmemory()` to filectx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4dc8a2ee0f4f: context: add is `isinmemory()` to filectx (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1061?vs=2700=2715

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6036e6e205ca: context: add a fast-comparision for arbitraryfilectx and workingfilectx (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

phillco updated this revision to Diff 2840. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2839=2840 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 updated this revision to Diff 2839. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1122?vs=2838=2839 REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py tests/test-arbitraryfilectx.t CHANGE DETAILS

D1057: filemerge: use arbitraryfilectx for backups

phillco marked 4 inline comments as done. phillco added inline comments. INLINE COMMENTS > phillco wrote in filemerge.py:604 > Sure, will do. I think most likely by breaking the context -> fileset > dependency. @durin42 done REPOSITORY rHG Mercurial REVISION DETAIL

D1057: filemerge: use arbitraryfilectx for backups

phillco added inline comments. INLINE COMMENTS > durin42 wrote in filemerge.py:604 > Ick. Please add a TODO here to figure out a way to break the cycle (it can be > done! I'm sure of it, even if I don't yet know how) and then we can move > forward with this. Sure, will do. I think most likely

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

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

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

phillco added a comment. Done: https://phab.mercurial-scm.org/D1122. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1056 To: phillco, #hg-reviewers, durin42 Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing

D1057: filemerge: use arbitraryfilectx for backups

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

D1122: 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1122 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

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

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

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

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

D1060: filemerge: add a missing flushall()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGa25f886e1b8b: filemerge: add a missing flushall() (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1060?vs=2699=2865

D1105: merge: don't use workers in in-memory mode

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8ff80d1c75b5: merge: dont use workers in in-memory mode (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1105?vs=2797=2866

D1059: filemerge: store backups in the overlayworkingctx if using imm

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb5e7aa688689: filemerge: store backups in the overlayworkingctx if using imm (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1057: use arbitraryfilectx for backups

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/D1057 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D1058: context: add overlayfilectx.cmp()

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/D1058 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1059: filemerge: store backups in the overlayworkingctx 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/D1059 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D1056: context: add a fast-comparision path between arbitraryfilectx and workingfilectx

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/D1056 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py

D1060: filemerge: add a missing flushall()

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/D1060 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D674: filemerge: use arbitraryfilectx for backup files

phillco abandoned this revision. phillco added a comment. I've split this into https://phab.mercurial-scm.org/D1056, https://phab.mercurial-scm.org/D1057, https://phab.mercurial-scm.org/D1058, https://phab.mercurial-scm.org/D1059, https://phab.mercurial-scm.org/D1060, so abandoning this

D1061: context: add is `isinmemory()` to filectx

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will make it easier to skip certain behavior when running an in-memory merge. REPOSITORY rHG Mercurial REVISION DETAIL

D657: revset: move weight information to predicate

phillco added a comment. Constants could pobably help make it more self-documenting. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D657 To: quark, #hg-reviewers, phillco Cc: yuja, phillco, mercurial-devel ___

D628: merge: flush any deferred writes before, and after, running any workers

phillco added a comment. Ah, right, I forgot about that. I'll do that and send a new rev. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D628 To: phillco, #hg-reviewers Cc: quark, mercurial-devel ___ Mercurial-devel

D388: filemerge: extract _maketemp and _makebackup

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

D403: filemerge: reduce creation of tempfiles until needed

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

D401: filemerge: add `_workingpath`

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

D444: merge: move some of the logic in batchget() to workingfilectx

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

D404: filemerge: add _restorebackup

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

D400: filemerge: move a util copy call to filectx.write

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

D616: context: add overlayworkingcontext and overlayworkingfilectx

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

D627: filemerge: flush if using deferred writes when running a merge tool

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

D672: merge: add `ondisk` to merge.update and pass it in largefiles

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If set to false, parts of the merge might be performed in memory. Largefiles isn't a good candidate for in-memory merge (it uses a custom dirstate, matcher,

D673: merge: flush any deferred writes just before recordupdates()

phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY ``recordupdates`` calls into the dirstate which requires the files to be there, so this is the last possible moment we can flush anything. REPOSITORY rHG

  1   2   3   4   5   >