D3437: paper: don't register click handlers with inline javascript (issue5812)

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3437 To: indygreg, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D3436: hgweb: allow Content-Security-Policy header on 304 responses (issue5844)

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3436 To: indygreg, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D2668: rebase: introduce support for automatically rebasing orphan changes

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. Looks like a couple unresolved comments on _possibledestination, plus one nitpick. I think we can clean those things up easily and then land this though. INLINE COMMENTS >

D2394: histedit: make histedit's commands accept revsets (issue5746)

krbullock added a comment. Oh sorry, I see you're already on the case. Carry on! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2394 To: sangeet259, durin42, #hg-reviewers Cc: krbullock, rishabhmadan96, mercurial-devel

D2394: histedit: make histedit's commands accept revsets (issue5746)

krbullock added a comment. Can we get some test coverage on this? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2394 To: sangeet259, durin42, #hg-reviewers Cc: krbullock, rishabhmadan96, mercurial-devel ___

D1808: debugcommands: print out the editor that was searched for (post shlexsplit)

krbullock added a comment. @durin42 Go for it REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1808 To: spectral, #hg-reviewers, krbullock Cc: durin42, krbullock, mercurial-devel ___ Mercurial-devel mailing list

D2057: translate base85.c into rust code

krbullock added a comment. What would be the advantage of taking this? Since we already have the C implementation, it's not likely to gain us any performance. On the other hand, it might make a good test case for integrating Rust and Python, finding the right API boundaries and

D1808: debugcommands: print out the editor that was searched for (post shlexsplit)

krbullock accepted this revision as: krbullock. krbullock added a comment. This LGTM now. I think the executable as interpreted by shlex, but without the added flags, gives enough signal for the user to figure out what might be wrong without confusing things. REPOSITORY rHG Mercurial

D1591: visibility: improve the message when accessing filtered obsolete rev

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. This has new failures in test-obshistory.t and test-directaccess.t, can you rebase? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1591 To:

D1809: tests: switch test from '--config ui.editor=~/foo' to HGEDITOR=~/foo

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1809 To: spectral, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1808: debugcommands: print out the editor that was searched for (post shlexsplit)

krbullock requested changes to this revision. krbullock added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > debugcommands.py:1212 > fm.write('editor', _("checking commit editor... (%s)\n"), editor) > -cmdpath =

D1729: githelp: don't reference 3rd party commands for `git show`

krbullock requested changes to this revision. krbullock added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > githelp.py:883 > +cmd = Command('status') > cmd['--change'] = 'tip' > else: I don't think `tip` is correct here,

D1591: visibility: improve the message when accessing filtered obsolete rev

krbullock accepted this revision. krbullock added a comment. Queued, thanks REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1591 To: lothiraldan, #hg-reviewers, durin42, pulkit, krbullock Cc: krbullock, pulkit, durin42, mercurial-devel

D1745: rebase: don't take out a dirstate guard for in-memory rebase

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Sure, queued. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1745 To: phillco, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1720: debug: add newlines at the end of three locations that appear to need it

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Sure, queued. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1720 To: spectral, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1719: debug: remove an 'if ui.debug()' that is not doing anything

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Seems reasonable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1719 To: spectral, #hg-reviewers, krbullock Cc: krbullock, quark, mercurial-devel

D1591: visibility: improve the message when accessing filtered obsolete rev

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. One nit, otherwise looks nice! INLINE COMMENTS > obsutil.py:780 > +else: > +return 'superseed_split' > + These should be 'superseded' and

D1718: worker: handle interrupt on windows

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Whoops, queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1718 To: wlis, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1717: lfs: fix committing deleted files caused by e0a1b9ee93cd

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued per Matt's review, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1717 To: quark, #hg-reviewers, mharbison72, krbullock Cc: krbullock,

D1713: tests: update expected output of svn encoding test

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. LGTM, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1713 To: durin42, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1710: tests: test-pathconflicts-merge.t requires symlinks

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. LGTM, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1710 To: durin42, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D1698: copies: group wdir-handling in one place

krbullock added inline comments. INLINE COMMENTS > copies.py:206 > +return _chain(a, b, cm, _dirstatecopies(b, match)) > +else: > +return _committedforwardcopies(a, b, match) Post-queue nitpick: unnecessary `else:`. REPOSITORY rHG Mercurial REVISION DETAIL

D1691: debugdiscovery: drop reference to invalid --branch option

krbullock added inline comments. INLINE COMMENTS > debugcommands.py:747 > opts = pycompat.byteskwargs(opts) > -remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), > - opts.get('branch')) > +remoteurl, branches =

D1617: rebase: extract _assignworkingcopy

krbullock added inline comments. INLINE COMMENTS > rebase.py:393 > +def _performrebase(self, tr): > +self._assignworkingcopy() > +repo, ui = self.repo, self.ui Rather than having this method spookily set self.wctx, why not make `_assignworkingcopy` _return_ the wctx (and

D1607: remotenames: rename related file and storage dir to logexchange

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. This doesn't apply cleanly. Can you rebase? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1607 To: pulkit, #hg-reviewers, krbullock Cc:

D1457: workers: don't use backgroundfilecloser in threads

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. Looks okay to me except for Augie's nit. @indygreg ? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1457 To: wlis, #hg-reviewers, indygreg,

D1605: tests: remove {a..h} bashism from remotenames

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

D1063: rebase: enable multidest by default

krbullock added a comment. @quark @martinvonz Ping REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1063 To: quark, #hg-reviewers, durin42 Cc: krbullock, dlax, martinvonz, durin42, mercurial-devel ___ Mercurial-devel

D1224: merge: cache unknown dir checks

krbullock added a comment. Code LGTM, but I haven't done any performance testing on this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1224 To: mbthomas, #hg-reviewers Cc: krbullock, mercurial-devel ___

D1224: merge: cache unknown dir checks

krbullock added a comment. If this mitigates or fixes issue5716, please mention it in the summary line. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1224 To: mbthomas, #hg-reviewers Cc: krbullock, mercurial-devel

D1201: dirstate: clean up when restoring identical backups

krbullock added subscribers: durham, krbullock. krbullock accepted this revision as: krbullock. krbullock added a comment. LGTM but I'd like someone with more familiarity with dirstate to have a look too. Maybe @durham ? REPOSITORY rHG Mercurial REVISION DETAIL

D1191: obsfate: makes successorsetverb takes the markers as argument

krbullock added a comment. Deferring this until after 4.4, because the added `markers` argument isn't used yet. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1191 To: lothiraldan, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D932: filemerge: introduce functions to halt merge flow

krbullock added a subscriber: yuja. krbullock added inline comments. INLINE COMMENTS > ryanmce wrote in filemerge.py:755-756 > I followed the pattern seen elsewhere in this file. > > If you just hit enter, you do get the default, though. > > I can follow-up with a patch to fix all of these

D1191: obsfate: makes successorsetverb takes the markers as argument

krbullock requested changes to this revision. krbullock added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > templater.py:1011 > """Compute obsfate related information based on successors > (EXPERIMENTAL)""" > -if len(args) != 1: > +if len(args)

D1140: localrepo: add a pinnedrevs attribute

krbullock added a comment. We're dropping this stack from 4.4 because it caused unexpected behavior changes in python-hglib (https://buildbot.mercurial-scm.org/builders/python-hglib/builds/654) and elsewhere. Seems to stem from recomputing from the same set on repeated calls to

D1196: tests: add some (?) output lines to catch "helpful" output from Solaris diff

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

D956: test-annotate: fix up expected output for pure

krbullock added a comment. Sure, queued. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D956 To: durin42, #hg-reviewers Cc: krbullock, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

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

krbullock added inline comments. INLINE COMMENTS > test-merge-halt.t:24 > + $ echo onfailure=continue >> $HGRCPATH > + $ hg rebase -s 1 -d 2 --tool false > + rebasing 1:1f28a51c3c9b "c" Why test this with rebase instead of merge? REPOSITORY rHG Mercurial REVISION DETAIL

D932: filemerge: introduce functions to halt merge flow

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. I was initially confused by the description of this change, because the user can already halt (by configuration) after the first failed file merge. But this introduces a

D915: test-devel-warnings: make the test compatible with chg

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D915 To: singhsrb, #hg-reviewers, krbullock Cc: krbullock, quark, mercurial-devel

D894: fsmonitor: warn when fsmonitor could be used

krbullock requested changes to this revision. krbullock added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > mbthomas wrote in merge.py:1739-1743 > I'm not sure if we're planning to work towards PEP8, but it (and I) prefer > using parentheses to break long if

D860: treediscovery: update test expectation

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued these, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D860 To: durin42, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D833: exchange: perform stream clone with clone bundle with --uncompressed

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued these, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D833 To: indygreg, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel

D743: ui: check for progress singleton when clearing progress bar (issue5684)

krbullock added a comment. Queued for stable, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D743 To: mbthomas, #hg-reviewers, durin42, krbullock Cc: durin42, mercurial-devel ___ Mercurial-devel mailing list

D726: uncommit: rename the flag 'empty' to 'keep' which retains empty changeset

krbullock accepted this revision as: krbullock. krbullock added a comment. LGTM, but leaving it for others to review because I know this was a subject of IRC discussion recently. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D726 To: pulkit, #hg-reviewers,

D657: revset: move weight information to predicate

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. I think either expanding the docs or using constants would be fine, but the default weight looks like it's 1, not 10. REPOSITORY rHG Mercurial REVISION DETAIL

D614: registrar: make cmdtype an attribute of the function in registar.command

krbullock requested changes to this revision. krbullock added a comment. This revision now requires changes to proceed. Flagging for revision per Augie's open question. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D614 To: pulkit, #hg-reviewers, durham,

D544: releasenotes: update docstrings with information on additional flags

krbullock requested changes to this revision. krbullock added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > releasenotes.py:556-575 > +along with the changeset ID. For example:: > + > + .. abcd:: > + > + First paragraph under this admonition

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

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

Re: D127: phabricator: add phabupdate command to update status in batch

krbullock added a comment. These all look like they're heading the right direction, but I'm not prepared to land them in 4.3-rc. Let's revisit after the freeze. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D127 EMAIL PREFERENCES

Re: D119: color: add autoterminfo option to prefer terminfo over ansi for non-windows

krbullock added a comment. I like this, but I'd rather not take it right before a freeze. Can we revisit this for 4.4? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D119 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To:

Re: D117: run-tests: warn if --color=always and no pygments installed

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D117 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/

Re: D118: run-tests: remove unnecessary 'with_color' variable

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D118 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/

Re: D114: run-tests: pass color option via test case object , not global var

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D114 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/

Re: D116: run-tests: drop unnecessary check for pygmentspresent

krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D116 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/

Re: D35: phabricator: sanity check Differential Revision from commit message

krbullock accepted this revision. krbullock added a comment. Queued, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D35 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: quark, durin42, phillco, krbullock Cc: