D492: context: remove unnecessary default values for matchers (API)

martinvonz added a comment. In https://phab.mercurial-scm.org/D492#7991, @dsp wrote: > if match can't be None, then we should remove it as the default value. Otherwise I look at this in a year and think "why do we not handle a None matcher, when it clearly can be None if the value for

D492: context: remove unnecessary default values for matchers (API)

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

D494: test-casecollision-merge: fix the test

dsp accepted this revision. dsp added a comment. Thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D494 To: quark, #hg-reviewers, dsp Cc: dsp, mercurial-devel ___ Mercurial-devel mailing list

D492: context: remove unnecessary default values for matchers (API)

dsp requested changes to this revision. dsp added a comment. This revision now requires changes to proceed. if match can't be None, then we should remove it as the default value. Otherwise I look at this in a year and think "why do we not handle a None matcher, when it clearly can be None if

D491: context: always pass a matcher into _matchstatus() (API)

dsp accepted this revision. dsp added a comment. I guess either works. I personally prefer the inheritance here as it feels easier to get it right from an unsuspected caller, but i can see benefits on both sides. REPOSITORY rHG Mercurial REVISION DETAIL

D441: revset: optimize "draft() & ::x" pattern

quark planned changes to this revision. quark added a comment. Let's wait for my revset order and Yuya's matchtree patches first. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D441 To: quark, #hg-reviewers Cc: yuja, martinvonz, mercurial-devel

D422: mdiff: add a --ignore-space-at-eol option

dsp updated this revision to Diff 1241. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D422?vs=1240=1241 REVISION DETAIL https://phab.mercurial-scm.org/D422 AFFECTED FILES mercurial/cmdutil.py mercurial/help/config.txt mercurial/mdiff.py

D422: mdiff: add a --ignore-space-at-eol option

dsp updated this revision to Diff 1240. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D422?vs=1022=1240 REVISION DETAIL https://phab.mercurial-scm.org/D422 AFFECTED FILES mercurial/cmdutil.py mercurial/help/config.txt mercurial/mdiff.py

D368: releasenotes: add check flag for use of admonitions and its validity

pulkit added a comment. @rishabhmadan96 Sorry for jumping late, can you followup with a patch adding some docs for the flag. Also document the behavior of `hg releasenotes -c` and it will be great if you can add a test for that too. REPOSITORY rHG Mercurial REVISION DETAIL

D450: filemerge: add wctx to all internal tools

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

D449: merge: pass wctx to premerge, filemerge

phillco updated this revision to Diff 1236. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D449?vs=1235=1236 REVISION DETAIL https://phab.mercurial-scm.org/D449 AFFECTED FILES hgext/largefiles/overrides.py mercurial/filemerge.py mercurial/merge.py

D450: filemerge: add wctx to all internal tools

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

D449: merge: pass wctx to premerge, filemerge

phillco updated this revision to Diff 1235. phillco edited the summary of this revision. phillco retitled this revision from "merge: pass `wctx` object to `premerge()` and `filemerge`" to "merge: pass wctx to premerge, filemerge". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D450: filemerge: add wctx to all internal tools

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

D499: merge: pass wctx to premerge, filemerge

phillco updated this revision to Diff 1233. phillco retitled this revision from "filemerge: add wctx to all internal tools" to "merge: pass wctx to premerge, filemerge". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D499?vs=1232=1233 REVISION DETAIL

D499: filemerge: add wctx to all internal tools

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

D464: commit: use an unambiguous path suffix for the commit editor file

smf added a comment. Everything I was talking about in https://phab.mercurial-scm.org/D468 was meant to be posted here. (I am not doing well with phabricator it seems) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D464 To: mbolin, quark, durin42,

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7920, @mbolin wrote: > @smf so are you OK with this patch as-is? Yeah, should be fine. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D468 To: mbolin, #hg-reviewers, quark, durin42 Cc: smf,

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

mbolin added a comment. @smf so are you OK with this patch as-is? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D468 To: mbolin, #hg-reviewers, quark, durin42 Cc: smf, mercurial-devel ___ Mercurial-devel mailing list

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7915, @mbolin wrote: > @smf Personally, I think that https://phab.mercurial-scm.org/D464 is a better place to have that discussion. Sigh. Yes, this is what I was confused about. REPOSITORY rHG Mercurial REVISION

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7916, @durin42 wrote: > In https://phab.mercurial-scm.org/D468#7914, @smf wrote: > > > Basically, I was pondering aloud if '~' would be enough to future-proof us and if we shouldn't just rename all temp files to something

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7912, @mbolin wrote: > @smf As I put in the summary, I think this use of `tempfile.mkstemp()` is different than the others in the codebase because it uses the `dir=` argument to create a file in the working copy. As such, I'd

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

durin42 added a comment. In https://phab.mercurial-scm.org/D468#7914, @smf wrote: > Basically, I was pondering aloud if '~' would be enough to future-proof us and if we shouldn't just rename all temp files to something unique (HG_EDITOR for commits, HG_HISTEDIT for histedit, etc). What

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

mbolin added a comment. @smf Personally, I think that https://phab.mercurial-scm.org/D464 is a better place to have that discussion. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D468 To: mbolin, #hg-reviewers, quark, durin42 Cc: smf, mercurial-devel

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7910, @smf wrote: > That seems a bit over complicated to me. Why not just just use the > random tmp as a directory instead of a file while renaming the file at > the same time: > > /tmp/XYZ123/hg-editor (or HG_EDITOR or

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

mbolin added a comment. @smf As I put in the summary, I think this use of `tempfile.mkstemp()` is different than the others in the codebase because it uses the `dir=` argument to create a file in the working copy. As such, I'd argue that it's reasonable to consider it separately from the

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7909, @durin42 wrote: > In https://phab.mercurial-scm.org/D468#7908, @smf wrote: > > > In https://phab.mercurial-scm.org/D468#7836, @quark wrote: > > > > > In https://phab.mercurial-scm.org/D468#7833, @smf wrote: > > >

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

durin42 added a comment. In https://phab.mercurial-scm.org/D468#7908, @smf wrote: > In https://phab.mercurial-scm.org/D468#7836, @quark wrote: > > > In https://phab.mercurial-scm.org/D468#7833, @smf wrote: > > > > > Basically, I'd like a more unified approach for all types of temp

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7836, @quark wrote: > In https://phab.mercurial-scm.org/D468#7833, @smf wrote: > > > Basically, I'd like a more unified approach for all types of temp files (commit message, histedit, conflicts, etc). > > > I think

D290: bundlerepo: move bundle2 part handling out to a function

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf672d060a931: bundlerepo: move bundle2 part handling out to a function (authored by durham). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D290?vs=1217=1229

D289: bundle2: seek part back during iteration

This revision was automatically updated to reflect the committed changes. Closed by commit rHG891118dcd279: bundle2: seek part back during iteration (authored by durham). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D289?vs=1216=1228 REVISION DETAIL

D288: bundlerepo: move temp bundle creation to a separate function

This revision was automatically updated to reflect the committed changes. Closed by commit rHG702a26fec3e2: bundlerepo: move temp bundle creation to a separate function (authored by durham). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D288?vs=1215=1227

D422: mdiff: add a --ignore-space-at-eol option

martinvonz added a comment. In https://phab.mercurial-scm.org/D422#7818, @akushner wrote: > @martinvonz - a reasonable first pass would be to whitelist known contributors for CI runs. That sounds reasonable. Still not my area of expertise, but I'd be happy to see it done.

D288: bundlerepo: move temp bundle creation to a separate function

durham added a comment. I fixed the comment and renamed read to readfn. I know we usually do renames as separate from code moves, but this was a tiny rename (only one use). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D288 To: durham, #hg-reviewers, indygreg

D404: filemerge: add _restorebackup

phillco updated this revision to Diff 1225. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D404?vs=913=1225 REVISION DETAIL https://phab.mercurial-scm.org/D404 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 1226. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D444?vs=1073=1226 REVISION DETAIL https://phab.mercurial-scm.org/D444 AFFECTED FILES mercurial/context.py mercurial/merge.py CHANGE DETAILS diff --git

D403: filemerge: reduce creation of tempfiles until needed

phillco updated this revision to Diff 1224. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D403?vs=912=1224 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 1223. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D401?vs=911=1223 REVISION DETAIL https://phab.mercurial-scm.org/D401 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py

D388: filemerge: extract _maketemp and _makebackup

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

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

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

D399: filemerge: eliminate most uses of tempfiles

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

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

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

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

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

D289: bundle2: seek part back during iteration

durham updated this revision to Diff 1216. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D289?vs=659=1216 REVISION DETAIL https://phab.mercurial-scm.org/D289 AFFECTED FILES mercurial/bundle2.py mercurial/bundlerepo.py CHANGE DETAILS diff --git

D288: bundlerepo: move temp bundle creation to a separate function

durham updated this revision to Diff 1215. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D288?vs=658=1215 REVISION DETAIL https://phab.mercurial-scm.org/D288 AFFECTED FILES mercurial/bundlerepo.py CHANGE DETAILS diff --git a/mercurial/bundlerepo.py

D290: bundlerepo: move bundle2 part handling out to a function

durham updated this revision to Diff 1217. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D290?vs=660=1217 REVISION DETAIL https://phab.mercurial-scm.org/D290 AFFECTED FILES mercurial/bundlerepo.py CHANGE DETAILS diff --git a/mercurial/bundlerepo.py

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

quark added a comment. In https://phab.mercurial-scm.org/D468#7846, @mbolin wrote: > @quark Rather than exposing the additional keyword argument now, why don't we wait until there is a compelling use-case to use something other than `~`? As it stands, creating an API for this would just

D497: bundlerepo: move bundle2 part handling out to a function

durham abandoned this revision. durham added a comment. Duplciate REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D497 To: durham, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D495: bundlerepo: move temp bundle creation to a separate function

durham abandoned this revision. durham added a comment. Duplicate REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D495 To: durham, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D496: bundle2: seek part back during iteration

durham abandoned this revision. durham added a comment. Duplicate REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D496 To: durham, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D495: bundlerepo: move temp bundle creation to a separate function

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A future patch will refactor certain parts of bundlerepo initiatlization such that we need to create temp bundles from another function. Let's move this to

D496: bundle2: seek part back during iteration

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, iterparts would yield the part to users, then consume the part. This changed the part after the user was given it and left it at the end, both of

D497: bundlerepo: move bundle2 part handling out to a function

durham created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This moves the bundle2 part handling for bundlerepo out to a separate function so extensions can participate in bundlerepo setup when using bundle2 bundles.

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

mbolin requested review of this revision. mbolin added a comment. @quark Rather than exposing the additional keyword argument now, why don't we wait until there is a compelling use-case to use something other than `~`? As it stands, creating an API for this would just open things up to

D450: filemerge: add wctx to all internal tools

phillco updated this revision to Diff 1211. phillco edited the summary of this revision. phillco retitled this revision from "filemerge: pass `wctx` to all internal merge tool functions" to "filemerge: add wctx to all internal tools". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

quark requested changes to this revision. quark added a comment. This revision now requires changes to proceed. Back to you to add the keyword argument. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D468 To: mbolin, #hg-reviewers, quark, durin42 Cc: smf,

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

quark added a comment. In https://phab.mercurial-scm.org/D468#7833, @smf wrote: > Basically, I'd like a more unified approach for all types of temp files (commit message, histedit, conflicts, etc). I think this patch is about low-level `util` function that shouldn't be coupled

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

smf added a comment. In https://phab.mercurial-scm.org/D468#7748, @durin42 wrote: > I don't object to this, but maybe others do. Reviewers not on vacation, please feel encouraged to push this. Well, I had some objections on the mailing list. It's sad that those don't show up in

D358: copytrace: move fb extension to core under flag experimental.fastcopytrace

pulkit abandoned this revision. pulkit added a comment. There is work ongoing on improving copytrace in fb-hgext. I will resend patches with updated copytrace logic once the work is done. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D358 To: pulkit,

D494: test-casecollision-merge: fix the test

quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY https://phab.mercurial-scm.org/D30 makes the error message unpredictable, therefore the fix. REPOSITORY rHG Mercurial REVISION DETAIL

D288: bundlerepo: move temp bundle creation to a separate function

krbullock added inline comments. INLINE COMMENTS > martinvonz wrote in bundlerepo.py:322 > I think we usually use a "fn" prefix for function arguments. I think "readfn" > would be clearer. I agree, but as it is, this is simple code movement. Usually we like renames to be done in separate

D422: mdiff: add a --ignore-space-at-eol option

akushner added a comment. @martinvonz - a reasonable first pass would be to whitelist known contributors for CI runs. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D422 To: dsp, #hg-reviewers, quark Cc: akushner, martinvonz, quark, mercurial-devel

D493: dirstate: perform transactions with _copymap using single call, where possible

mbolin updated this revision to Diff 1209. mbolin added a comment. Minor fix. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D493?vs=1208=1209 BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D493 AFFECTED FILES

D493: dirstate: perform transactions with _copymap using single call, where possible

mbolin created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This replaces patterns such as this: if f in self._copymap: del self._copymap[f] with this: self._copymap.pop(f, None) Although

D422: mdiff: add a --ignore-space-at-eol option

quark requested changes to this revision. quark added a comment. This revision now requires changes to proceed. Maybe we should set up CI on Phabricator. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D422 To: dsp, #hg-reviewers, quark Cc: martinvonz, quark,

D289: bundle2: seek part back during iteration

martinvonz added inline comments. INLINE COMMENTS > bundle2.py:811 > +# code consuming this generator has a part that starts at 0. > part.seek(0, 2) > +part.seek(0) Unrelated to this patch, but seems like we should define constants for "whence". I don't

D288: bundlerepo: move temp bundle creation to a separate function

martinvonz added inline comments. INLINE COMMENTS > bundlerepo.py:322 > > +def _writetempbundle(self, read, suffix, header=''): > +"""Write a temporary file to disk I think we usually use a "fn" prefix for function arguments. I think "readfn" would be clearer. REPOSITORY rHG

D422: mdiff: add a --ignore-space-at-eol option

martinvonz added a comment. In https://phab.mercurial-scm.org/D422#7797, @martinvonz wrote: > In https://phab.mercurial-scm.org/D422#7795, @martinvonz wrote: > > > Looks like you didn't run test-help.t. I'll fix it in flight, but please run all tests next time. > > >

D422: mdiff: add a --ignore-space-at-eol option

martinvonz added a comment. In https://phab.mercurial-scm.org/D422#7795, @martinvonz wrote: > Looks like you didn't run test-help.t. I'll fix it in flight, but please run all tests next time. ...and test-completion.t and test-qrecord.t REPOSITORY rHG Mercurial REVISION DETAIL

D422: mdiff: add a --ignore-space-at-eol option

martinvonz added a comment. Looks like you didn't run test-help.t. I'll fix it in flight, but please run all tests next time. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D422 To: dsp, #hg-reviewers, quark Cc: martinvonz, quark, mercurial-devel

Re: Handling path conflicts

On 23/08/2017, 15:26, "Kevin Bullock" wrote: > On Aug 23, 2017, at 06:05, Mark Thomas wrote: > > Hi, > > I’m looking at implementing path conflict handling, as the lack of it has caused a few bugs, including

D492: context: remove unnecessary default values for matchers (API)

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY ctx._dirstatestatus() is called only from workingctx._buildstatus() and that function, in turn, is called only from basectx.status(). basectx.status() will

D491: context: always pass a matcher into _matchstatus() (API)

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This just makes it a little easier to follow and removes the need to call the superclass's method in workingctx. REPOSITORY rHG Mercurial REVISION DETAIL

D472: extensions: make wrapfunction() return a context manager

martinvonz added a comment. In https://phab.mercurial-scm.org/D472#7758, @quark wrote: > In https://phab.mercurial-scm.org/D472#7756, @lothiraldan wrote: > > > All users of wrapfunction will need to be updated anyway to use the context manager style > > > I think only those who

D477: revlog: add option to mmap revlog index

quark added a comment. I think it might make sense to only apply it to manifest and changelog. Filelogs are usually short and probably do not need it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D477 To: mbthomas, #fbhgext, indygreg, #hg-reviewers, durin42

D423: pushvars: do not mangle repo state

This revision was automatically updated to reflect the committed changes. Closed by commit rHG800bb35d891e: pushvars: do not mangle repo state (authored by quark). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D423?vs=1019=1203 REVISION DETAIL

D461: morestatus: check whether the conflict message is None before printing

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe5d104c35e51: morestatus: check whether the conflict message is None before printing (authored by pulkit). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D440: exchange: don't attempt phase exchange if phase-heads was in bundle

This revision was automatically updated to reflect the committed changes. Closed by commit rHG13dc7f29531e: exchange: don't attempt phase exchange if phase-heads was in bundle (authored by martinvonz). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D477: revlog: add option to mmap revlog index

durin42 requested changes to this revision. durin42 added a comment. Also, please include at least one `log` invocation or similar in a test with the config knob set? And maybe some rough benchmark results in the commit message to justify the feature. :) REPOSITORY rHG Mercurial REVISION

D472: extensions: make wrapfunction() return a context manager

quark added a comment. In https://phab.mercurial-scm.org/D472#7756, @lothiraldan wrote: > All users of wrapfunction will need to be updated anyway to use the context manager style I think only those who use the return value of wrapfunction will need change (actually, new code is

D472: extensions: make wrapfunction() return a context manager

lothiraldan added a comment. Maybe instead of replacing wrapfunction with a context manager, what about introducing it with a separate name? All users of wrapfunction will need to be updated anyway to use the context manager style REPOSITORY rHG Mercurial REVISION DETAIL

D468: util: use ~ as a suffix for a temp file in the same directory as a source file

durin42 accepted this revision as: durin42. durin42 added a comment. I don't object to this, but maybe others do. Reviewers not on vacation, please feel encouraged to push this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D468 To: mbolin, #hg-reviewers,

D472: extensions: make wrapfunction() return a context manager

quark added inline comments. INLINE COMMENTS > mjpieters wrote in extensions.py:408-412 > Move this to `__enter__`. You want to be able to create the context manager > separately from actually entering the context: > > cmwrapper = wrapfunction(cont, 'name', wrapper) > > # do other

D451: revset: remove order information from tree

quark added a comment. In https://phab.mercurial-scm.org/D451#7698, @yuja wrote: > The point is these implementations would become invalid if `subset` were > optimized to "any" order. That's breaking change, but which is likely to be > not covered by tests. How about making

D482: bundle2: fixed usage of an attribute that was removed in py3k

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8d75b9effa07: bundle2: fixed usage of an attribute that was removed in py3k (authored by alex.gaynor). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D477: revlog: add option to mmap revlog index

indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. This seems reasonable as an experimental feature. I worry about memory mapping all files without regards to size. That seems unnecessary. Do you know what happens

D368: releasenotes: add check flag for use of admonitions and its validity

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6a49c74b1e8f: releasenotes: add check flag for use of admonitions and its validity (authored by rishabhmadan96). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D368?vs=973=1200#toc REPOSITORY

D482: bundle2: fixed usage of an attribute that was removed in py3k

lothiraldan added a comment. Good for me. I have the impression that we tend to defined static data (like `pycompat.bytestr(string.ascii_letters)` or some translations) inside functions while they could be defined once at module level. Is it intentional, is it for reducing startup

D368: releasenotes: add check flag for use of admonitions and its validity

krbullock accepted this revision. krbullock added a comment. Looks good, queued! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D368 To: rishabhmadan96, #hg-reviewers, durin42, krbullock Cc: krbullock, quark, durin42, mercurial-devel

D476: util: add an mmapread method

indygreg added inline comments. INLINE COMMENTS > simonfar wrote in util.py:413 > As per comment on https://phab.mercurial-scm.org/D477 - do we want this to be > raw, or `buffer(mmap.mmap(...`? Some consumers may want file like objects. Others may want buffers. Whatever you do, I would rename

[PATCH 7 of 9 V4] template: compute dates in obsfatedate

# HG changeset patch # User Boris Feld # Date 1499088850 -7200 # Mon Jul 03 15:34:10 2017 +0200 # Node ID b8b8b5bd728a5fb9fa847d56dd489c77a054b5ee # Parent fc257b24c35c492591f348b039d9e3f9488118a8 # EXP-Topic obsfatetemplate template: compute dates in obsfatedate

[PATCH 9 of 9 V4] test: add more obsmarker tests for pruning scenarios

# HG changeset patch # User Boris Feld # Date 1502986172 -7200 # Thu Aug 17 18:09:32 2017 +0200 # Node ID 153f799f30f949735b7c1ae0d64209f83ea5baf1 # Parent 852ba8848f1cbab25b1f6cdd6574c51e16ef601e # EXP-Topic obsfatetemplate test: add more obsmarker tests for pruning

[PATCH 8 of 9 V4] template: better prune support in obsfate

# HG changeset patch # User Boris Feld # Date 1499096336 -7200 # Mon Jul 03 17:38:56 2017 +0200 # Node ID 852ba8848f1cbab25b1f6cdd6574c51e16ef601e # Parent b8b8b5bd728a5fb9fa847d56dd489c77a054b5ee # EXP-Topic obsfatetemplate template: better prune support in obsfate

[PATCH 6 of 9 V4] template: compute user in obsfateusers

# HG changeset patch # User Boris Feld # Date 1499088840 -7200 # Mon Jul 03 15:34:00 2017 +0200 # Node ID fc257b24c35c492591f348b039d9e3f9488118a8 # Parent 8c1da4748240142e1ee62521279cf8556192c79e # EXP-Topic obsfatetemplate template: compute user in obsfateusers

[PATCH 3 of 9 V4] obsolete: track markers in _succs

# HG changeset patch # User Boris Feld # Date 1499045278 -7200 # Mon Jul 03 03:27:58 2017 +0200 # Node ID e8087ac6f8c52088233f5d499133de7f881a0c12 # Parent da1000201623558319d5cc9da567f6416166e982 # EXP-Topic obsfatetemplate obsolete: track markers in _succs We now

[PATCH 1 of 9 V4] obsolete: introduce a _succs class

# HG changeset patch # User Boris Feld # Date 1499036035 -7200 # Mon Jul 03 00:53:55 2017 +0200 # Node ID b689080388e11ecbfe69ca9b826a4367b6fd4384 # Parent 3cfc9070245fbaa8c4c010327f24d579a416370f # EXP-Topic obsfatetemplate obsolete: introduce a _succs class It

[PATCH 4 of 9 V4] template: add minimal obsfate template function

# HG changeset patch # User Boris Feld # Date 1502987171 -7200 # Thu Aug 17 18:26:11 2017 +0200 # Node ID c2702967b47010d10ee0b8cf9ee633928d4b6214 # Parent e8087ac6f8c52088233f5d499133de7f881a0c12 # EXP-Topic obsfatetemplate template: add minimal obsfate template

[PATCH 2 of 9 V4] obsolete: add an explicit '_succs.copy()' method

# HG changeset patch # User Boris Feld # Date 1499044397 -7200 # Mon Jul 03 03:13:17 2017 +0200 # Node ID da1000201623558319d5cc9da567f6416166e982 # Parent b689080388e11ecbfe69ca9b826a4367b6fd4384 # EXP-Topic obsfatetemplate obsolete: add an explicit '_succs.copy()'

D482: bundle2: fixed usage of an attribute that was removed in py3k

durin42 added a comment. In https://phab.mercurial-scm.org/D482#7640, @lothiraldan wrote: > Would it be possible to define `pycompat.bytestr(string.ascii_letters)` at the module level once and for all? I think I'd bias against this, just because it's only used in six or so

Re: [PATCH 3 of 3] drawdag: port to python 3

> On Aug 23, 2017, at 10:57 AM, Augie Fackler wrote: > > # HG changeset patch > # User Augie Fackler > # Date 1503465796 14400 > # Wed Aug 23 01:23:16 2017 -0400 > # Node ID 4be5cef7bafa1d216668b2bbdd3d3b8074c30d26 > # Parent

  1   2   >