D216: evolution: rename bumped to phase-divergent

ryanmce accepted this revision. ryanmce added a comment. A Dead Horse in Need of Kicking === I have no strong desire to drag this dead horse out of its grave to continue kicking it. However, since we are here, I will state for the record that I disagree that

D216: evolution: rename bumped to phase-divergent

ryanmce added a comment. In fact, right at the top of that CED page is an introduction that I think is pretty clear for such a powerful topic: Introduction to Instability --- Rewriting changesets may introduce **instability**. There are two main kinds o

D426: obsutil: correct deprecation warning message

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D426 AFFECTED FILES mercurial/obsutil.py CHANGE DETAILS diff --git a/mercurial/obsut

D426: obsutil: correct deprecation warning message

ryanmce abandoned this revision. ryanmce added a comment. I don't pull from committed usually. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D426 To: ryanmce, #hg-reviewers Cc: lothiraldan, mercurial-devel ___ Mercuria

D423: pushvars: do not mangle repo state

ryanmce accepted this revision. ryanmce added a comment. It would be really nice to get this change in. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D423 To: quark, #hg-reviewers, dsp, ryanmce Cc: ryanmce, dsp, mercurial-devel __

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

ryanmce accepted this revision. ryanmce added a comment. Should be safe and effective. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D464 To: mbolin, quark, durin42, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel

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

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. But you should include a test to prevent regressions. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D464 To: mbolin, quark, durin42, #hg-reviewers

D464: editor: use an unambiguous path suffix for editor files

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. One small issue noted inline. A new test would be super nice to prevent regressions here. INLINE COMMENTS > crecord.py:1556 > patch = self.ui.edit(patch.ge

D552: import-checker: allow relative import a module being checked

ryanmce added inline comments. INLINE COMMENTS > test-imports-checker.t:128 > > - $ $PYTHON "$import_checker" testpackage*/*.py testpackage/subpackage/*.py > +# Shallow a stdlib module to test "relative import of stdlib module" is > allowed > +# if the module is also being checked Shallow? D

D464: editor: use an unambiguous path suffix for editor files

ryanmce added a comment. > You could do that, but what I'd do is make an "editor" that prints the filename to stderr or something, and then invoke some commands that call that editor to see what the filename is like. Yeah, that's what I had in mind too. Something like: `editor.sh`:

D677: scmutil: handle conflicting files and dirs in origbackuppath

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. I think this will be a bit easier to ingest as two patches: one to deal with the conflicting directories and one to remove the .orig from files with a custom destination. T

D680: scmutil: handle conflicting files and dirs in origbackuppath

ryanmce accepted this revision. ryanmce added a comment. looks good REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D680 To: mbthomas, ryanmce, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial

D680: scmutil: handle conflicting files and dirs in origbackuppath

ryanmce added a subscriber: ikostia. ryanmce added a comment. Calling in windows path expert @ikostia REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D680 To: mbthomas, ryanmce, #hg-reviewers, durham, yuja Cc: ikostia, yuja, durham, mercurial-devel ___

D789: merge: add option to abort merge process on failure

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Traditionally, the merge process attempts to merge all unresolved files using the merge tool of choice, regardless of whether previous file merge attempts succee

D789: merge: add option to abort merge process on failure

ryanmce added a comment. No, it's an option that let's me `:cq` out of vim and stop additional windows from popping up, AFTER the merge process has already started. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce, #hg-reviewers Cc: quark, mercuri

D789: merge: add option to abort merge process on failure

ryanmce added inline comments. INLINE COMMENTS > test-filemerge-abort.t:22 > + $ hg commit -qAm d > + $ hg rebase -s 1 -d 2 --tool false > + rebasing 1:1f28a51c3c9b "c" Or did you mean this? I guess here I can use `:fail` REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-s

D789: merge: add option to abort merge process on failure

ryanmce marked an inline comment as done. ryanmce added inline comments. INLINE COMMENTS > ryanmce wrote in test-filemerge-abort.t:22 > Or did you mean this? I guess here I can use `:fail` Actually I can't because I need an external tool to fail here. REPOSITORY rHG Mercurial REVISION DETAIL

D774: merge: add pathconflict merge state

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. Logic looks good to me. Just a couple of inline nits about comments to improve understanding that I think would be useful. INLINE COMMENTS > merge.py:84-87 > +u: unresolved

D775: commands: update the resolve command to handle path conflicts

ryanmce accepted this revision. ryanmce added a comment. This looks fine to me. Some future cleanup opportunities but this fits the current style just fine. INLINE COMMENTS > commands.py:4273-4275 > l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', > +

D776: merge: add merge action 'p' to record path conflicts during update

ryanmce accepted this revision. ryanmce added a comment. There's some opportunities here but most are definitely outside the scope of this patch. One inline to consider but do what makes sense to you. INLINE COMMENTS > merge.py:1250-1259 > +repo.ui.status( > +_("%s: path

D777: merge: add merge action 'pr' to rename files during update

ryanmce added a comment. Looks good. One question inline. INLINE COMMENTS > merge.py:1461 > +repo.dirstate.remove(f0) > +repo.dirstate.copy(f0, f) > + Thanks for remembering to preserve copy information! Did you test with transitive renames? Something like: I rename `a` ->

D778: merge: backup conflicting directories when getting files

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. It seems like this one should have an externally-testable result. Could you adda test that shows the new behavior working better than it did before? If there a bug on bugzilla o

D779: merge: add _checkunknowndirs function for detecting path conflicts

ryanmce added inline comments. INLINE COMMENTS > merge.py:654 > +for p in reversed(list(util.finddirs(f))): > +if (repo.wvfs.audit.check(p) > +and repo.wvfs.isfileorlink(p) Why do we need to audit this path first? If we fail the audit, what happens? This looks weird

D781: merge: check for path conflicts when updating

ryanmce accepted this revision. ryanmce added a comment. nice INLINE COMMENTS > test-merge1.t:33-43 > + b: untracked file differs > + abort: untracked files in working directory differ from files in requested > revision >[255] >$ hg ci > - abort: last update was interrupted > - (

D782: merge: improve error messages for path conflicts during update

ryanmce accepted this revision. ryanmce added a comment. nice improvement INLINE COMMENTS > merge.py:741-747 > +if f in pathconflicts: > +if repo.wvfs.isfileorlink(f): > +repo.ui.warn(_("%s: untracked file conflicts with > directory\n") > +

D783: util: add safename function for generating safe names to rename to

ryanmce accepted this revision. ryanmce added a comment. Looks straightforward. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D783 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel m

D816: histedit: add copy histedit action

ryanmce accepted this revision. ryanmce added inline comments. INLINE COMMENTS > histedit.py:861 > +@action(['copy', 'c'], > + _('copy (graft) a changeset from elsewhere')) > +class copy(histeditaction): The formatting looks one space off here. REPOSITORY rHG Mercurial REVISION DETAI

D817: histedit: add move histedit action

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. I think we need to think about this one a bit more. INLINE COMMENTS > histedit.py:861 > +@action(['move', 'v'], > + _('move (graft and hide) a changeset from elsewhere')

D818: tests: add tests for histedit copy and move

ryanmce requested changes to this revision. ryanmce added a comment. This revision now requires changes to proceed. Requesting changes per feedback on the "move" verb. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D818 To: mbthomas, #hg-reviewers, ryanmce Cc: ry

D789: merge: add option to abort merge process on failure

ryanmce added a comment. Thanks for the feedback @yuja! I'll work on a second version. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce, #hg-reviewers, quark, yuja Cc: yuja, quark, mercurial-devel ___ Mer

D789: merge: add option to abort merge process on failure

ryanmce added inline comments. INLINE COMMENTS > mbthomas wrote in filemerge.py:537 > Typo: `nonrzero`. doh! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce, #hg-reviewers, quark, yuja, mbthomas Cc: mbthomas, yuja, quark, mercurial-devel __

D821: unamend: move fb extension unamend to core

ryanmce added inline comments. INLINE COMMENTS > durham wrote in uncommit.py:260 > This should be in a with statement probably? Can we just have it be as part > of the top level lock with statement? Test test REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D821 T

D789: merge: add option to abort merge process on failure

ryanmce marked 4 inline comments as done. ryanmce added inline comments. INLINE COMMENTS > yuja wrote in filemerge.py:734 > Perhaps it's better to abort here, not in _xmerge(). > > Several merge tools do not return non-zero status on error, so > we have extra _check() to detect merge error. I l

D789: merge: add option to abort merge process on failure

ryanmce updated this revision to Diff 2332. ryanmce marked an inline comment as done. ryanmce added a comment. Followed yuja's advice and moved the abort later. This has many advantages as shown in the updated test, which shows this abort also helps with merge tool post-checks, which are

D789: merge: add option to abort merge process on failure

ryanmce updated this revision to Diff 2333. ryanmce added a comment. fix check-code -- whoops REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D789?vs=2332&id=2333 BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D789 AFFECTED FILES m

D789: merge: add option to abort merge process on failure

ryanmce planned changes to this revision. ryanmce added a comment. This doesn't actually lead to merge conflicts in the repo -- the error.Abort is "too strong". I need deeper surgery here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce, #hg-revi

D905: style: never put multiple statements on one line

ryanmce accepted this revision. ryanmce added a comment. This seems like a straightforward win. Is there any way we can add a check-code for this if we don't already have one? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D905 To: alex_gaynor, durin42, #hg

D930: merge: add tests to show current behavior on failed filemerges

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Currently, failed file merges will nevertheless force the user to continue attempting to merge all additional unresolved files. Future patches will allow the use

D931: merge: ensure that we always commit the mergestate

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In future patches, we may halt the merge process based on configuration or user requests by raising exceptions. We need to ensure that the mergestate is uncondit

D932: filemerge: introduce functions to halt merge flow

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D931. This patch introduces functions and a config option that will allow a user to halt the merge if there are fail

D951: merge: allow user to halt merge on merge-tool failures

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D932. Call the new _onfilemergefailure function when a merge tool reports failure via a return code. REPOSITORY r

D952: merge: additional test cases to show changing behavior

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D951. In the next patch more cases of failed file merges will be able to halt the merge process. Add some test cases

D953: merge: use filemerge failure handler in post-filemerge checks checks

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Depends on https://phab.mercurial-scm.org/D952. This allows the user to halt the merge if conflict markers or no changes are found in the merged file as well.

D930: merge: add tests to show current behavior on failed filemerges

ryanmce added inline comments. INLINE COMMENTS > krbullock wrote in test-merge-halt.t:24 > Why test this with rebase instead of merge? That's how I roll. That being said, I'm happy to change it if people feel testing merge would provide more value. REPOSITORY rHG Mercurial REVISION DETAIL

D932: filemerge: introduce functions to halt merge flow

ryanmce added a comment. > I was initially confused by the description of this change, because the user can already halt (by configuration) after the first failed file merge. As far as I know, this is simply not true. I know of no way in mercurial, before this series, to halt a merge aft

D932: filemerge: introduce functions to halt merge flow

ryanmce updated this revision to Diff 2457. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D932?vs=2413&id=2457 REVISION DETAIL https://phab.mercurial-scm.org/D932 AFFECTED FILES mercurial/configitems.py mercurial/filemerge.py mercurial/help/config

D680: scmutil: handle conflicting files and dirs in origbackuppath

ryanmce accepted this revision. ryanmce added a comment. It looks like all concerns have been addressed. This looks good to me. INLINE COMMENTS > mbthomas wrote in scmutil.py:570 > At this point the path is a vfs-path within the repo, so it should be using > `/` as a separator. > > In the c

D774: merge: add pathconflict merge state

ryanmce accepted this revision. ryanmce added a comment. lgtm INLINE COMMENTS > mbthomas wrote in merge.py:364-365 > This could use some improvement in general, so I'll write some comments on > how this function works as a follow-up patch. that works for me > mbthomas wrote in merge.py:434

D776: merge: add merge action 'p' to record path conflicts during update

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

D777: merge: add merge action 'pr' to rename files during update

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

D778: merge: backup conflicting directories when getting files

ryanmce accepted this revision. ryanmce added a comment. lgtm INLINE COMMENTS > kiilerix wrote in merge.py:1175 > This seems quite a bit slower. But I guess it never will happen in tight > loops? If we have to backup a lot of files, then we have lost anyway? > If we have to backup a lot o

D780: merge: rename conflicts to fileconflicts in _checkunknownfiles

ryanmce accepted this revision. ryanmce added a comment. still lookin good here REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D780 To: mbthomas, #hg-reviewers, ryanmce Cc: mercurial-devel ___ Mercurial-devel mailing li

D781: merge: check for path conflicts when updating (issue5628)

ryanmce accepted this revision. ryanmce added a comment. Still looks good. The test looks much better now! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D781 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel __

D779: merge: add _checkunknowndirs function for detecting path conflicts

ryanmce accepted this revision. ryanmce added a comment. Would love to see the comment added, but the code looks good to me. INLINE COMMENTS > mbthomas wrote in merge.py:654 > As in `_checkunknownfile`, this is to avoid symlink traversal while checking > these files. > > Consider: > > $

D783: util: add safename function for generating safe names to rename to

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

D782: merge: improve error messages for path conflicts during update

ryanmce accepted this revision. ryanmce added a comment. still looks good after updates REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D782 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial

D784: merge: check for path conflicts when merging (issue5628)

ryanmce accepted this revision. ryanmce added a comment. I'm so excited by these improvements. one nit inline but this is such an improvement! INLINE COMMENTS > mbthomas wrote in merge.py:903-921 > This is potentially slow for large repos, as it has to iterate over the whole > manifest.

D784: merge: check for path conflicts when merging (issue5628)

ryanmce added inline comments. INLINE COMMENTS > merge.py:927 > +if p not in deletedfiles: > +ctxname = str(wctx).rstrip('+') > +pnew = util.safename(p, ctxname, wctx, set(actions.keys())) nit: worth a comment as to why we strip the + REPOSITORY rHG Mercurial

D785: context: also consider path conflicts when clearing unknown files

ryanmce accepted this revision. ryanmce added a comment. Updated version looks good to me REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D785 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, kiilerix, mercurial-devel _

D787: tests: add test for path conflicts during merge

ryanmce accepted this revision. ryanmce added a comment. lgtmacro REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D787 To: mbthomas, #hg-reviewers, swhitaker, ryanmce Cc: ryanmce, swhitaker, mercurial-devel ___ Mercurial

D861: commands: tidy up merge state decoding in resolve

ryanmce accepted this revision. ryanmce added a comment. nice! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D861 To: mbthomas, #hg-reviewers, dlax, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list

D955: merge: improve comments in mergestate._makerecords

ryanmce accepted this revision. ryanmce added a comment. so good! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D955 To: mbthomas, #hg-reviewers, ryanmce Cc: ryanmce, mercurial-devel ___ Mercurial-devel mailing list Me

D958: i18n: clean msgcache when encoding changes

ryanmce added a comment. Is there a bugzilla bug where I can see what issue this addresses? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D958 To: quark, #hg-reviewers Cc: ryanmce, lothiraldan, mercurial-devel ___ Merc

D789: merge: add option to abort merge process on failure

ryanmce abandoned this revision. ryanmce added a comment. Replaced by series ending at https://phab.mercurial-scm.org/D953 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce, #hg-reviewers, quark, yuja, mbthomas Cc: mbthomas, yuja, quark, mercurial-d

D789: merge: add option to abort merge process on failure

ryanmce marked an inline comment as done. ryanmce added inline comments. INLINE COMMENTS > markand wrote in configitems.py:302 > Please follow the naming style as defined in the UI Guidelines > . > Therefore it should be **abort

D932: filemerge: introduce functions to halt merge flow

ryanmce added inline comments. INLINE COMMENTS > configitems.py:302 > ) > +coreconfigitem('merge', 'onfailure', > +default='continue', this could be `on-failure`, per the comment on https://phab.mercurial-scm.org/D789 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-sc

D930: merge: add tests to show current behavior on failed filemerges

ryanmce added inline comments. INLINE COMMENTS > quark wrote in test-merge-halt.t:32 > Should we have an `hg resolve -l` here? sounds good > quark wrote in test-merge-halt.t:36 > It feels a bit strange that the text says "works". Maybe use some neutral > words like "Testing onfailure=continue"

D953: merge: use filemerge failure handler in post-filemerge checks checks

ryanmce abandoned this revision. ryanmce added a comment. It turns out this isn't needed -- setting the return to 1 means we catch the failure in the generic handler I added earlier. I fixed up the tests in the previous patch to include the important test changes from here (ie, more testing

D952: merge: additional test cases to show changing behavior

ryanmce updated this revision to Diff 2503. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D952?vs=2455&id=2503 REVISION DETAIL https://phab.mercurial-scm.org/D952 AFFECTED FILES tests/test-merge-halt.t CHANGE DETAILS diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt

D951: merge: allow user to halt merge on merge-tool failures

ryanmce updated this revision to Diff 2502. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D951?vs=2454&id=2502 REVISION DETAIL https://phab.mercurial-scm.org/D951 AFFECTED FILES mercurial/filemerge.py tests/test-merge-halt.t CHANGE DETAILS diff --git a/tests/test-merge-halt.

D931: merge: ensure that we always commit the mergestate

ryanmce updated this revision to Diff 2500. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D931?vs=2412&id=2500 REVISION DETAIL https://phab.mercurial-scm.org/D931 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercur

D932: filemerge: introduce functions to halt merge flow

ryanmce updated this revision to Diff 2501. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D932?vs=2457&id=2501 REVISION DETAIL https://phab.mercurial-scm.org/D932 AFFECTED FILES mercurial/configitems.py mercurial/filemerge.py mercurial/help/config.txt CHANGE DETAILS diff -

D930: merge: add tests to show current behavior on failed filemerges

ryanmce updated this revision to Diff 2499. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D930?vs=2411&id=2499 REVISION DETAIL https://phab.mercurial-scm.org/D930 AFFECTED FILES tests/test-merge-halt.t CHANGE DETAILS diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt

D1001: ui: recommend tweakdefaults in the default hgrc template

ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. yay! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1001 To: durin42, #hg-reviewers, quark, pulkit, ryanmce Cc: ryanmce, quark, mercurial-devel

D1001: ui: recommend tweakdefaults in the default hgrc template

ryanmce added a comment. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1001 To: durin42, #hg-reviewers, quark, pulkit, ryanmce Cc: ryanmce, quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-deve

D1000: contrib: add check-code rule banning use of readlink

ryanmce accepted this revision. ryanmce added a comment. This revision is now accepted and ready to land. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1000 To: durin42, #hg-reviewers, quark, ryanmce Cc: ryanmce, quark, mercurial-devel __

D945: fsmonitor: update to match new dirstate refactor

ryanmce accepted this revision. ryanmce added a comment. queued REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D945 To: durham, #hg-reviewers, quark, yuja, ryanmce Cc: ryanmce, yuja, mercurial-devel ___ Mercurial-devel

D821: unamend: move fb extension unamend to core

ryanmce added inline comments. INLINE COMMENTS > ryanmce wrote in uncommit.py:260 > Test test Tested nested comments, sorry for the spam. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D821 To: pulkit, #hg-reviewers, durham Cc: ryanmce, singhsrb, durham, mercurial

D2577: mdiff: prefer xdiff for diff calculation

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Let's switch to xdiff for its better diff quality and faster performance! bdiff is still used as a fallback for cases xdiff isn't built, or the pure Python ve

D2578: xdiff: enable indent heuristic unconditionally

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Enable the indent heuristic feature unconditionally, since it provides nice visual improvements. See the added test, and [1]. [1]: https://github.com/git/git

D2574: xdiff: add a binary utility that runs xdiff

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Add a simple binary that runs xdiff in a minimal way. This is useful for tweaking xdiff related code. It's also potentially useful in .t tests. TEST PLAN `cd co

D2575: xdiff: add a bdiff hunk mode

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY xdiff generated hunks for the differences (ex. questionmarks in the `@@ -?,? +?,? @@` part from `diff --git` output). However, bdiff generates matched hunks inst

D2576: xdiff: add a python wrapper

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Implement a `mercurial.cext.xdiff` module that exposes the xdiff algorithm. `xdiff.blocks` should be a drop-in replacement for `bdiff.blocks`. In theory we

D2573: xdiff: remove patience and histogram diffs

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY They are greedy algorithms that yields suboptimal results. Patience diff has been advertised as "slower, but generating better results sometimes" for a long time

D2572: xdiff: vendor xdiff library from git

ryanmce added a subscriber: quark. ryanmce added a comment. To be clear, this patch series was created by @quark, but phabricator did not keep the author information from the patches. I've ported it here to generate discussion about this as a path forward. REPOSITORY rHG Mercurial REV

D2589: setup: ignore extension load failures when finding working hg

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, `make local` would fail if any extension was not properly loading. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2589 A

D2577: mdiff: prefer xdiff for diff calculation

ryanmce added inline comments. INLINE COMMENTS > quark wrote in mdiff.py:34 > The diff functions below do not have an `ui` object. Would you be okay if the > config is global? ex. something like > > # mdiff.py > def setdiffalgo(name): > global blocks > if name == 'xdiff': >

D2068: revlog: do not use delta for lfs revisions

ryanmce added inline comments. INLINE COMMENTS > revlog.py:2110 > +# no delta for flag processor revision (see "candelta" for why) > +if flags & REVIDX_KNOWN_FLAGS: > +deltainfo = None Why is this not `candelta()`? REPOSITORY rHG Mercurial REVISION DETAIL https:

D2067: changegroup: do not delta lfs revisions

ryanmce added inline comments. INLINE COMMENTS > revlog.py:746 > +def candelta(self, baserev, rev): > +"""whether two revisions (prev, rev) can be delta-ed or not""" > +# Disable delta if either rev requires a content-changing flag `prev` should be `baserev`? REPOSITORY rH

D2068: revlog: do not use delta for lfs revisions

ryanmce added inline comments. INLINE COMMENTS > quark wrote in revlog.py:2110 > `candelta` takes two revisions. Here there is only one revision. It's > possible to pass a useless revision but that has unnecessary overhead. > > `candelta` also fetches `flags`, here we already know the values `f

D2572: xdiff: vendor xdiff library from git

ryanmce planned changes to this revision. ryanmce added a comment. This existing directory is called `thirdparty` not `third-party`, unfortunately. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2572 To: ryanmce, #hg-reviewers Cc: quark, mercurial-devel ___

D2608: templater: add hint to template parse errors to help locate issues

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we would print the error name and location, but this isn't as helpful as we can be. Let's add a hint that shows the location where we encountered the

D2608: templater: add hint to template parse errors to help locate issues

ryanmce updated this revision to Diff 6484. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2608?vs=6483&id=6484 REVISION DETAIL https://phab.mercurial-scm.org/D2608 AFFECTED FILES mercurial/templater.py tests/test-command-template.t tests/test-exp

D2609: templater: provide hint for multi-line templates with parse errors

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, we punted. Now we "rewrite" the template's newlines to r'\n' and offset the hint appropriately. REPOSITORY rHG Mercurial REVISION DETAIL https://

D2608: templater: add hint to template parse errors to help locate issues

ryanmce updated this revision to Diff 6485. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2608?vs=6484&id=6485 REVISION DETAIL https://phab.mercurial-scm.org/D2608 AFFECTED FILES mercurial/templater.py tests/test-command-template.t tests/test-exp

D2609: templater: provide hint for multi-line templates with parse errors

ryanmce updated this revision to Diff 6487. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2609?vs=6486&id=6487 REVISION DETAIL https://phab.mercurial-scm.org/D2609 AFFECTED FILES mercurial/templater.py tests/test-parse-errors.t CHANGE DETAILS dif

D2619: revsetlang: add a hint for more useful parse errors

ryanmce created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This logic is largely based on the similar logic added to template error messages in https://phab.mercurial-scm.org/D2608 and https://phab.mercurial-scm.org/D2609

D2609: templater: provide hint for multi-line templates with parse errors

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5d1bae328b7d: templater: provide hint for multi-line templates with parse errors (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2609?vs=6487&id=6510#toc

D2608: templater: add hint to template parse errors to help locate issues

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8df20b7a39d2: templater: add hint to template parse errors to help locate issues (authored by ryanmce, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2608?vs=6485&id=6509#toc

D2589: setup: ignore extension load failures when finding working hg

This revision was automatically updated to reflect the committed changes. Closed by commit rHG5f41e3418407: setup: ignore extension load failures when finding working hg (authored by ryanmce, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2

  1   2   >