D7221: hghave: fix bytes/string issue on Python 3

pulkit added a comment. This has already been pushed as https://www.mercurial-scm.org/repo/hg-committed/rev/c3bca833cb92 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7221/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7221 To: durin42, #hg-

D7198: lock: refactor in preparation for next commit

pulkit added a comment. pulkit added subscribers: marmoute, pulkit. @marmoute can you have a look at these two patches? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7198/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7198 To: valentin.gatien

D7441: match: remove explicitdir attribute

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. Queued the series, many thanks! Thanks @Alphare for reviewing :) REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7441/new/ REVISION

D7462: py3: make doc strings containing the deprected '\.' escape sequence raw strings

pulkit added a comment. Applied the following diff to commit message as `test-check-commit.t` was complaining: --- a/changeset-description +++ b/changeset-description @@ -1,3 +1,3 @@ -py3: make doc strings containing the deprected '\.' escape sequence raw strings +py3:

D7521: amend: check for file modifications when updating dirstate (issue6233)

pulkit added a comment. I get the following test failure: --- /home/pulkit/repo/hgpush/tests/test-amend.t +++ /home/pulkit/repo/hgpush/tests/test-amend.t#obsstore-off.err @@ -505,4 +505,23 @@

D7556: tests: remove hardcoded errno values

pulkit added a comment. This is for stable branch or default? REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7556/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7556 To: jcristau, #hg-reviewers, pulkit Cc: mercurial-devel ___

D7521: amend: check for file modifications when updating dirstate (issue6233)

pulkit added a comment. Looks like I forgot to drop this from my queue and pushed it. :( REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7521/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7521 To: spectral, #hg-reviewers, mharbison72, pulkit C

D7557: annotate: describe --skip as taking a revset

pulkit added a comment. Isn't it that where ever we says `revisions` we imply `revsets`? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7557/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7557 To: durin42, #hg-reviewers Cc: pulkit, mjpieters,

D7595: status: outputting structured unfinished-operation information

pulkit added inline comments. pulkit added subscribers: yuja, pulkit. INLINE COMMENTS > configitems.py:247 > coreconfigitem( > +b'commands', b'status.morestatus-item', default=False, > +) IMO the whole morestatus functionality is already behind a config option, so lets not have a config op

D7524: rust-dirs-multiset: use `AsRef` instead of concrete types when possible

pulkit added a comment. This one fails to apply on default. Skipping pushing this and it's accepted children. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7524/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7524 To: Alphar

D7593: status: split morestatus data loading from display

pulkit added a comment. pulkit added a subscriber: martinvonz. I pushed @martinvonz D7591 , so these need to be rebased. Thanks! REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7593/new/ REVISION

D7506: phabricator: add a "phabstatus" show view

This revision now requires changes to proceed. pulkit added a comment. pulkit requested changes to this revision. `test-check-module-imports.t` says hi! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7506/new/ REVISION DETAIL https://phab.mercurial-s

D7601: fuzz: fix test-fuzz-targets.t to run with python3

pulkit added inline comments. INLINE COMMENTS > mharbison72 wrote in mpatch_corpus.py:53 > Doesn't `__repr__` have to return `str` on py3? It looks like there are few > other instances of this. ha, yep. @spectral can you send a follow-up for this? REPOSITORY rHG Mercurial CHANGES SINCE LAS

D7605: formatting: fix some recent formatting regressions

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. Thanks for this. I installed black now, so I hope I will catch these next time before pushing changes. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab

D7595: status: outputting structured unfinished-operation information

pulkit added a comment. Applying this on top of D7605 failed. So unfortunately you have to rebase again and resend. Also, I think you are `pip install black` away from preventing such conflicts. REPOSITORY rHG Mercurial BRANCH default CHANGES SINC

D7606: fuzz: fix mpatch_corpus to not have an overridden __repr__ on py3

pulkit added a comment. Amended following diff to make test-check-format.t happy: diff --git a/contrib/fuzz/mpatch_corpus.py b/contrib/fuzz/mpatch_corpus.py --- a/contrib/fuzz/mpatch_corpus.py +++ b/contrib/fuzz/mpatch_corpus.py @@ -16,11 +16,15 @@ args = ap.parse_args()

D7632: graft: reuse cmdutl.resolvecommitoptions()

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. After this, if both `--currentuser` and `--user` are passed, `--currentuser` takes precedence, which is not the behavior right now. But the new behavior is better and consistent with other

D7633: clone: extract helper for checking mutually exclusive args

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in cmdutil.py:263 > I don't think I'd be able to guess what a function by that name did either. > `check_at_most_one_argument` seems clearer, but maybe too long. I'll wait a > bit for other ideas before I change anything. I agre

D7637: pathbomb: use cmdutil.check_at_most_one_arg()

pulkit added a comment. Renaming `pathbomb` to `patchbomb` in message title. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7637/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7637 To: martinvonz, #hg-reviewers, pulkit Cc: me

D7641: rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run

pulkit added inline comments. INLINE COMMENTS > cmdutil.py:272 > if previous: > raise error.Abort( > _(b'cannot specify both --%s and --%s') % (previous, x) Spotted in a later patch, need to replace `_` back to `-` before printing output. REPO

D7679: windows: if username(uid=None) is loaded, just use getpass

This revision is now accepted and ready to land. pulkit added inline comments. pulkit accepted this revision. INLINE COMMENTS > windows.py:566 > > If uid is None, return the name of the current user.""" > +if not uid: Nice, seems like the old documentation was wrong. REPOSITORY rHG

D7627: config: drop debug messages saying where config was read from

pulkit added a comment. After recent iteration, commit message needs to be reworked. Maybe I am biased because I know what the old version was and is still parsing the commit message that way. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7627/new/

D7624: rcutil: don't check if defaultrc/ is a directory -- we know it is

pulkit added a comment. I am unable to find some code or understand the reasoning behind `-- we know this` part. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7624/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7624 To: martinvonz, #hg-revie

D7652: test: extract some generic data and utility from test-rust-ancestor.py

pulkit added inline comments. INLINE COMMENTS > revlog.py:34 > +cparsers is None, > +"The C Extension parsers module tests relies on is not available", > +) this and next message requires an oxford comma to help understand better. > test-rust-ancestor.py:34 > @unittest.skipIf( > -r

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added a comment. Can you describe the feature a bit in the commit message. Specific things which I feel are missing: - what happens to wdir changes - what happens if source is a commit is not a head I understand them but after reading the tests, so might be worth to add them

D7641: rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run

pulkit added a comment. In D7641#113027 , @yuja wrote: >>> Spotted in a later patch, need to replace `_` back to `-` before printing output. >> >> Strings are immutable in Python, so it wasn't actually replaced, right? Or do I misunderstan

D7644: rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans

pulkit added inline comments. INLINE COMMENTS > test-rebase-obsolete.t:2057 >$ hg rebase --stop --dry-run > - abort: cannot specify both --dry-run and --stop > + abort: cannot specify both --stop and --dry-run >[255] Unrelated change? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACT

D7667: status: make morestatus call out unresolved conflicts after update

pulkit added a comment. This PR is doing more than one thing. I can see following independent things: - rename of `inmergestate` to `activemerge` - introduction of `_formattedpaths` which is used in next patch and not related to this one - what the commit message says Can we spli

D7668: status: make unresolved files always be in the morestatus structured output

pulkit added inline comments. INLINE COMMENTS > cmdutil.py:876 > +# have been in one of the states that were not requested for > +# display, so it could be anything. > +fm.data(itemtype=b'file', path=f, unresolved=True) IIUC, if it's in one of the

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added inline comments. INLINE COMMENTS > absorb.py:1113 > +absorb analyzes each change in your working directory (or the revision > given > +to `--rev`, if one is specified) and attempts to amend the changed lines > +into the changesets in your stack that first introduced thos

D7699: cmdutil: allow native string as input to check_at_most_one_arg()

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. I hope one day we have a clear understanding of what is bytes and what is not in core. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.o

D7667: status: extract active-merge state for reuse

pulkit added a comment. Amended the following in flight to make black happy: diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -879,11 +879,8 @@ def readmorestatus(repo): if activemerge: unr

D7649: match: make sure `root` argument is always an absolute path

pulkit added a comment. I am bit confused with `/repo` everywhere that whether that's the only valid or other forms can be valid also. I will prefer making existing root passed as absolute instead of replacing them with `/repo` (provided I understood correctly). Also I am not sure, but does

D7650: match: normalize `cwd` early

pulkit added inline comments. INLINE COMMENTS > match.py:232 > assert os.path.isabs(root) > +cwd = os.path.normpath(os.path.join(root, cwd)) > normalize = _donormalize `util.normpath` instead of `os.path.normpath` REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://pha

D7618: fix: correct the clang-format example hgrc so that it actually works

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. > Remove -i from command, it causes fix to eat your file and empty it out We should add a prompt/warning in `hg fix` when it empties the file. REPOSITORY rHG Mercurial BRANCH defau

D7619: fix: convert clang-format-ignorelist to use wildcards

pulkit added inline comments. INLINE COMMENTS > clang-format-ignorelist:6 > # Vendored code that we should never format: > -contrib/python-zstandard/c-ext/bufferutil.c > -contrib/python-zstandard/c-ext/compressionchunker.c > -contrib/python-zstandard/c-ext/compressiondict.c > -contrib/python-zst

D7617: fix: make example fix hgrc work in subdirs

pulkit added a comment. This fails to apply on current tip of default, needs rebase. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7617/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7617 To: spectral, #hg-reviewers, pulkit

D7649: match: make sure `root` argument is always an absolute path

pulkit added a comment. In D7649#113454 , @martinvonz wrote: > In D7649#113440 , @pulkit wrote: > >> I am bit confused with `/repo` everywhere that whether that's the only valid or other forms

D7652: test: extract some generic data and utility from test-rust-ancestor.py

pulkit added a comment. Amended the following in flight to make `test-check-code.t` happy. diff --git a/tests/test-rust-ancestor.py b/tests/test-rust-ancestor.py --- a/tests/test-rust-ancestor.py +++ b/tests/test-rust-ancestor.py @@ -33,12 +33,12 @@ except ImportError: @

D7708: lfs: add a switch to `hg verify` to ignore the content of blobs

pulkit added inline comments. INLINE COMMENTS > __init__.py:408 > +@eh.wrapcommand( > +b'verify', opts=[(b'', b'no-lfs', None, _(b'skip all lfs blob content'))] > +) IIUC, we can have a `--lfs` flag and `--no-lfs` will work. Also by default, we may not want to verify large files content? R

D7723: tests: update test-releasenotes-formatting.t output

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The output seems to be left outdated because running this test requires fuzzy-wuzzy which is not generally installed. REPOSITORY rHG Mercurial BRANCH default

D7732: convert: refactor authormap into separate function for outside use

pulkit added inline comments. INLINE COMMENTS > convcmd.py:479 > def readauthormap(self, authorfile): > -afile = open(authorfile, b'rb') > -for line in afile: > - > -line = line.strip() > -if not line or line.startswith(b'#'): > -contin

D7803: tests: split out another ~1/2 of test-graft.t

pulkit added inline comments. INLINE COMMENTS > test-graft-rename.t:70 > >$ hg init ../graftmove >$ cd ../graftmove Now that repo is created at start of test, we should drop `../` REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7803/new/ REVISI

D7807: hgrc: introduce HGRCSKIPREPO to skip reading the hgrc's repository

pulkit added a comment. > hgrc: introduce HGRCSKIPREPO to skip reading the hgrc's repository s/ hgrc's repository/repository's hgrc REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7807/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7807 To

D7785: remotefilelog: actually fix (and test this time) a bytes vs str issue

pulkit added inline comments. INLINE COMMENTS > test-remotefilelog-prefetch.t:253 > + > repo.fileservice.prefetch([(b'somefile.txt', hexid)]) > + > except: > + > pass `test-check-code.t` fails now: --- /home/pulkitg/repo/hgpush/tests/test-check-code.t +++

D7732: convert: refactor authormap into separate function for outside use

pulkit added inline comments. INLINE COMMENTS > convcmd.py:58 > > +def readauthormap(ui, authorfile, authors={}): > +with open(authorfile, b'rb') as afile: We disallow usage of default mutable arguments. Hence `test-check-code.t` says hi. + hgext/convert/convcmd.py:58: + > def rea

D7723: tests: update test-releasenotes-formatting.t output

Closed by commit rHGdf470e764770: tests: update test-releasenotes-formatting.t output (authored by pulkit). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHAN

D7799: merge: remove unused keepparent argument for graft()

pulkit added a comment. > but no code was ever added to either core or evolve to pass the option It seems like evolve does use this option. https://www.mercurial-scm.org/repo/evolve/file/tip/hgext3rd/evolve/evolvecmd.py#l1104 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https:

D7728: rebase: add test to demonstrate issue6180

pulkit added inline comments. INLINE COMMENTS > test-rebase-conflicts.t:438 > + > [alias] > + > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" > + > EOF You don't need to redefine it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D772

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

pulkit added a comment. Unrelated to the fix, we need better way to skip commits during rebasing. Pruning manually is not a good option, IIRC git rebase have a `--skip` flag. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7730/new/ REVISION DETAIL h

D7492: localrepo: also fastpath access to working copy parents when possible

pulkit added a comment. How's the perf number mining going? It will be nice to get this pushed before upcoming release candidate. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7492/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7492 To: marm

D7824: tests: add test of rebase with conflict in merge commit

pulkit added inline comments. INLINE COMMENTS > test-rebase-conflicts.t:460 > +It's weird that the current parents are not 7 and 8 since that's what we're > +merging > + $ hg tglog I think it will be weird to have current parents as 7 and 8. Rebase copies commit, so if there is a merge commit,

D7630: absorb: make the absorbed changeset be automatically "evolved"

pulkit added a comment. This results in an empty commit which is not similar to what rebase or evolve will generally result in after `D7631` unless `ui.allowemptycommit=True` is set. I think good behavior is to obsolete the absorbed changeset in favour of either it's parent or one of the rev

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added inline comments. INLINE COMMENTS > rdamazio wrote in absorb.py:993 > Done. Notice that *technically* the user could do such an absorb while in the > middle of a merge, but it sounds like a bad idea and inviting troubles, so > I'm letting it also disallow that case. I'll be surprise

D7812: examples: specify rustfmt nightly using a $() construct

pulkit added a comment. @gracinet Does this looks good to you? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7812/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7812 To: durin42, #hg-reviewers Cc: pulkit, quark, gracinet, mercurial-devel

D7575: hg-core: vendor Facebook's configparser crate

pulkit added a comment. The C bindings need to be dropped in this patch. Queued the previous patches, many thanks for importing things! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7575/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7575 To

D7574: hg-core: add utils::path to project

This revision now requires changes to proceed. pulkit added a comment. pulkit requested changes to this revision. This one fails to apply with conflicts in `Cargo.lock`. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7574/new/ REVISION DETAIL https:/

D7630: absorb: make the absorbed changeset be automatically "evolved"

pulkit added a comment. >>>! In D7630#115300 , @pulkit wrote: >> This results in an empty commit which is not similar to what rebase or evolve will generally result in after `D7631` unless `ui.allowemptycommit=True` is set. I think good behav

D7816: tests: stabilize test-subrepo-svn.t on Windows

pulkit added a comment. The test mow fails on linux. --- /home/pulkit/repo/hgpush/tests/test-subrepo-svn.t +++ /home/pulkit/repo/hgpush/tests/test-subrepo-svn.t.err @@ -87,10 +87,10 @@ $ hg debugsub path s

D7848: hashutil: new package for hashing-related features

pulkit added a comment. Absorbing the following into this patch to make `test-check-module-imports.t` happy. diff --git a/mercurial/utils/hashutil.py b/mercurial/utils/hashutil.py --- a/mercurial/utils/hashutil.py +++ b/mercurial/utils/hashutil.py @@ -3,7 +3,7 @@ from __futu

D7862: dirstate: move rust fast-path calling code to its own method

pulkit added a comment. Absorbing the following diff to make `test-check-format.t` happy: diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -1089,9 +1089,7 @@ class dirstate(object): # how to rea

D7865: rust-fmt: run cargo fmt

pulkit added a comment. This one fails to apply. Please rebase and resend. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7865/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7865 To: Alphare, #hg-reviewers, pulkit Cc: durin42

D7492: localrepo: also fastpath access to working copy parents when possible

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. Amending the perf numbers in commit message and fixed some spellings. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7492/new/ REV

D7494: localrepo: fastpath access to "."

pulkit added a comment. > "." is just an aliast for `p1(wdir()`, "." is just an alias for `p1(wdir())`, in flight. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7494/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7494 To: marmoute,

D7498: localrepo: also fast past the parents of working copies parents

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. > There are a descent odds that their will be needed too. There are descent odds that they will be needed too. made the above edit in flight. REPOSITORY rHG Mercurial BRANCH d

D7732: convert: refactor authormap into separate function for outside use

pulkit added a comment. Amending the following in flight to make `test-check-format.t` (or black) happy: diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -55,6 +55,7 @@ svn_source = subversion.s

D7932: [RFC]debugbackups: introduce command to interact with strip backups

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This vendors backups extension from hg-experimental. Listing backups and having some utility to apply them is nice. I know we have obsmarkers now, but this wil

D7941: py3: wallpaper over demand importer differences on Python 3.5

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. > I added a `|| false` to normalize the exit code. s/false/true in flight REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7941/

D7940: py3: make flush() line optional

pulkit added inline comments. INLINE COMMENTS > test-ssh-proto.t:114 >capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset > getbundle known lookup protocaps pushkey > streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN > unbundlehash > - o> flush()

D7950: verify: avoid spurious integrity warnings in verbose mode (issue6172)

pulkit added a comment. TBH it feels not correct that some code path of `hg verify` needs unfiltered repository and that too around renames. Reading tests, I first thought it's some bug in unamend and then checked the issue to realize it's a general problem. REPOSITORY rHG Mercurial CHAN

D7952: rust: add a README

pulkit added inline comments. pulkit added subscribers: gracinet, pulkit. INLINE COMMENTS > README.rst:25 > > -To build the Rust components:: > + $ HGWITHRUSTEXT=cpython make local # to use ./hg > + $ HGWITHRUSTEXT=cpython make tests # to run all tests IIRC, it's now possible to use `HGMODUL

D7965: py3: catch AttributeError too with ImportError

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Looks like py3 raises AttributeError instead of ImportError. This is caught on windows. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://pha

D7966: remotefilelog: only prefetch history in linkrevfixup

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The linknode is part of the history, not the data, no need to force prefetch the blobs. The commit is copied from https://github.com/facebookexperimental/ed

D7967: exchange: recognize changegroup3 bundles in `getbundlespec()`

pulkit added inline comments. pulkit added subscribers: joerg.sonnenberger, pulkit. INLINE COMMENTS > exchange.py:321 > +): > +version = b'v2' > else: Should not this be `v3`? I believe this is what @joerg.sonnenberger is also trying to point

D7964: cext: change two more vars to Py_ssize_t in manifest.c

pulkit added a comment. pulkit added subscribers: martinvonz, durin42, pulkit. This should go to stable branch right? cc: @martinvonz @durin42 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7964/new/ REVISION DETAIL https://phab.mercurial-scm.org/D

D7898: merge: don't call update hook when using in-memory context

pulkit added a comment. Do we have user-facing documentation for these behavior? I tried to find documentation related to hooks but was unable to find any. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7898/new/ REVISION DETAIL https://phab.mercuri

D7972: recover: don't verify by default

pulkit added a comment. I also have experience with C-c thing. Will a config option which enables `--no-verify` by default will work for you? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7972/new/ REVISION DETAIL https://phab.mercurial-scm.org/D79

D7900: merge: avoid a negation in the definition of updatedirstate

pulkit added inline comments. INLINE COMMENTS > merge.py:2291 > ) > # If we're doing a partial update, we need to skip updating > # the dirstate, so make a note of any partial-ness to the This comment now looks misplaced. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACT

D7733: hgext: initial version of fastexport extension

pulkit added a comment. pulkit added subscribers: martinvonz, pulkit. The logic looks fine, the code needs to be polished a bit and need some documentation. I left inline comments/nits. It will be nice to have the next version of this patch py3 compatible. INLINE COMMENTS > fastexport.py:5

D7996: merge: don't auto-pick destination with `hg merge 'wdir()'`

pulkit added a comment. Looks like we don't have tests for `hg merge 'wdir()'`. Also I am not sure what should be the correct behavior in that case. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7996/new/ REVISION DETAIL https://phab.mercurial-scm.

D8010: phabricator: fix a crash when submitting binaries (issue6260)

pulkit added a comment. Converted line endings in `tests/phabricator/phabsend-binary.json` to unix ones in flight. REPOSITORY rHG Mercurial BRANCH stable CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8010/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8010 To: mh

D7906: rebase: define base in only place in defineparents()

pulkit added inline comments. INLINE COMMENTS > rebase.py:1811 > +newps[0], newps[i] = newps[i], newps[0] > +bases[0], bases[i] = bases[i], bases[0] > + I am not sure why we are doing `bases[i] = bases[0]` here? (TBH I didn't try to understand the whole logic, mostly

D8021: chg: switch to using global `environ` instead of envp from main

pulkit added a comment. I don't know about the code which this series touch, but since D7550 already made to 5.3rc, should this series be targeted for stable branch? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/

D8029: uncopy: add new `hg uncopy` command

pulkit added inline comments. INLINE COMMENTS > cmdutil.py:1698 > +def uncopy(ui, repo, pats, opts): > +ctx = repo[None] > + generally we refer to `repo[None]` as `wctx` right? > commands.py:7502 > +) > +def uncopy(ui, repo, *pats, **opts): > +"""unmark files as copied""" We should add

D8030: uncopy: add support for unmarking committed copies

pulkit added a comment. I don't feel very good with this because this makes `hg uncopy` a history editing command. Something like `hg uncopy --after` which makes the changes in wdir which can be committed afterwards sounds best, but I am not sure if that's possible. REPOSITORY rHG Mercuri

D8041: revset: add a revset for parents in merge state

pulkit added inline comments. INLINE COMMENTS > revset.py:1866 > + > +If "merge" here includes merge conflicts from e.g. 'hg rebase' or > +'hg graft'. The sentence looks incomplete. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/ REVISI

D7974: merge: when rename was made on both sides, use ancestor as merge base

pulkit added a comment. `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new

D7974: merge: when rename was made on both sides, use ancestor as merge base

pulkit added a comment. I am seeing this failure, hope it helps: (vm)~/repo/hgpush/tests$ ./run-tests.py test-rename-merge1.t running 1 tests using 1 parallel processes

D8057: rebase: abort if the user tries to rebase the working copy

pulkit added inline comments. INLINE COMMENTS > test-rebase-parameters.t:100 > + $ hg rebase --source 'wdir()' --dest 6 > + nothing to rebase - empty destination > + [1] hm, the destination is not empty here. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.

D8055: absorb: graduate -i flag from experimental

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. The whole absorb extension is experimental, so even if we want to change `-i` somehow in future, this looks fine. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION h

D8011: heptapod-ci: add a basic file to be able to run tests with heptapod

pulkit added a comment. @marmoute wants the series to be pushed for stable so that the yaml files are present on that branch and heptapod can run tests for that too. That seems okay to me, however I will wait for 3-4 days to see if anyone has objections. REPOSITORY rHG Mercurial CHANGES S

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

pulkit added a comment. In D7730#117268 , @marmoute wrote: > I think is would be simpler and sfare to prevent unrelated operation during rebase. If the user cannot prune here we won't have to deal with it. This woudl also apply to other opera

D7932: debugstripbackups: introduce command to interact with strip backups

pulkit edited the summary of this revision. pulkit retitled this revision from "[RFC]debugbackups: introduce command to interact with strip backups" to "debugstripbackups: introduce command to interact with strip backups". pulkit updated this revision to Diff 19868. REPOSITORY rHG Mercurial C

D7965: py3: catch AttributeError too with ImportError

Closed by commit rHG9a92b29cf930: py3: catch AttributeError too with ImportError (authored by pulkit). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES S

D8092: hghave: cache the result of gethgversion

pulkit added a comment. This is fixing some debian packaging issue, so is it targeted for stable branch? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8092/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8092 To: jcristau, #hg-reviewers, marm

D7922: rust-matchers: add function to generate a regex matcher function

pulkit added a comment. This one failed to apply on latest default, needs rebase. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7922/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7922 To: Alphare, #hg-reviewers, pulkit Cc:

D8096: purge: add -i flag to delete ignored files instead of untracked files

pulkit added a comment. Nice! Looks good to me. Can you add a releasenotes entry in `relnotes/next`? INLINE COMMENTS > purge.py:51 > (b'', b'all', None, _(b'purge ignored files too')), > +(b'i', b'ignored', None, _(b'purge only ignored files')), > (b'', b'dirs', None

D8096: purge: add -i flag to delete ignored files instead of untracked files

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. In D8096#120082 , @valentin.gatienbaron wrote: > I thought it was generally preferred to have the `False` in the code, for extensions that

D8102: remotefilelog-test: glob some flacky output line (issue6083)

pulkit added a comment. Is this and next one targeted for stable branch? I see a mention about that in next patch. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8102/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8102 To: marmoute, #hg-revie

D8050: rust-dirstatemap: update call sites from Python

pulkit added a comment. In D8050#120043 , @Alphare wrote: > In D8050#119795 , @marmoute wrote: > >> This is straightforward, however having some performance number would be great. > > This i

  1   2   3   4   5   6   7   8   9   10   >