D8202: exchange: turn on option that makes concurrent pushes work better

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. I am +1 on this change. I will wait for 3-4 days to see if anyone has concerns before pushing it. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION

D8196: commit: clear resolved mergestate even if working copy is clean

pulkit added a comment. In D8196#121924 , @martinvonz wrote: > I'm fine with still adding the flag to make `hg commit` behave differently from internal calls. Still want me to do that or want me to register merge state as an unfinished

D8134: remotefilelog: add 'changelog' arg to shallowcg1packer.generate (issue6269)

pulkit added a comment. pulkit added a subscriber: durin42. This was meant for stable branch, can we graft it to stable before the upcoming minor release? (cc: @durin42) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8134/new/ REVISION DETAIL

D8196: commit: clear resolved mergestate even if working copy is clean

pulkit added a comment. To me, having a `hg commit` which aborts, doing something seems a bit weird. For the use case of rebase, shelve etc., a function argument or internal config can be better. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D8200: pull: add `--confirm` flag to confirm before writing changes

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This introduces a new flag to pull command `--confirm` and also a config option named `pull.confirm` which if used will prompt user describing changes which are

D8199: scmutil: add option to register summary callbacks as transaction validators

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have a list of summary callbacks which are run after the transaction is closed to show what has changed and what not. This patch makes it possible to register

D8198: transaction: add functionality to have multiple validators

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will help us in adding more validators which can aggregate data from transaction and prompt user whether to commit the transaction or not. The current

D8178: heptapod-ci: also run some test for chg

pulkit added a comment. Any reason why py3-chg is not included? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8178/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8178 To: marmoute, #hg-reviewers Cc: pulkit, mercurial-devel

D8177: hgit: fix some issues spotted by pylint integration with editor

pulkit retitled this revision from "hgit: fix self.gitrepo -> self._git_repo" to "hgit: fix some issues spotted by pylint integration with editor". pulkit updated this revision to Diff 20374. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8177: hgit: fix self.gitrepo -> self._git_repo

pulkit 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/D8177 AFFECTED FILES hgext/git/manifest.py CHANGE DETAILS diff --git

D8118: mergestate: determine if active without looking for state files on disk

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

D8169: tests: use new, use-case-specific methods from merge module

pulkit added inline comments. INLINE COMMENTS > hg.py:1144 > unresolved conflicts.""" > -stats = mergemod.merge(repo[node], force=force, labels=labels,) > +stats = mergemod.merge(repo[node], force=force, labels=labels) > _showstats(repo, stats) This seems like unrelated

D8168: merge: introduce a merge() for that use-case

pulkit added inline comments. INLINE COMMENTS > commands.py:4912 > labels = [b'working copy', b'merge rev'] > -return hg.merge( > -repo, node, force=force, labels=labels > -) > +return hg.merge(repo, node, force=force, labels=labels) > This seems

D8134: remotefilelog: add 'changelog' arg to shallowcg1packer.generate (issue6269)

Closed by commit rHG3cd79f55c1d7: remotefilelog: add changelog arg to shallowcg1packer.generate (issue6269) (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".

D8148: revlog-compression: update the config to be a list

pulkit added a comment. In D8148#121295 , @pulkit wrote: > Looks good to me, can you add an entry to `relnotes/next`? still missing the release notes entry. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D8145: lfutil: provide a hint if the largefiles/lfs cache path cannot be determined

pulkit added a comment. test-check-code.t says hi: --- /home/foobar/repo/pushaccess/tests/test-check-code.t +++ /home/foobar/repo/pushaccess/tests/test-check-code.t.err @@ -32,6 +32,16 @@ Skipping i18n/polib.py it has no-che?k-code (glob) Skipping

D8148: revlog-compression: update the config to be a list

pulkit added a comment. Looks good to me, can you add an entry to `relnotes/next`? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8148/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8148 To: marmoute, #hg-reviewers Cc: pulkit, mercurial-devel

D7932: debugbackupbundle: introduce command to interact with strip backups

pulkit retitled this revision from "debugstripbackups: introduce command to interact with strip backups" to "debugbackupbundle: introduce command to interact with strip backups". pulkit updated this revision to Diff 20288. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8134: remotefilelog: add 'changelog' arg to shallowcg1packer.generate (issue6269)

pulkit updated this revision to Diff 20287. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8134?vs=20258=20287 BRANCH stable CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8134/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8134

D8116: bookmarks: refactor in preparation for next commit

pulkit added a comment. Amended the following in flight to `test-check-format.t` happy: diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -462,9 +462,11 @@ def update(repo, parents, node):

D8133: phabricator: fix a phabsend crash when processing a renamed binary

pulkit added a comment. Converted line endings to unix one in flight. REPOSITORY rHG Mercurial BRANCH stable CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8133/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8133 To: mharbison72, #hg-reviewers, pulkit Cc: Kwan,

D8139: shelve: add test clearly demonstrating that the conflict labels are backwards

pulkit added a comment. This fails to apply on tip of stable branch. Kindly rebase and resend. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8139/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8139 To: spectral,

D8134: remotefilelog: add 'changelog' arg to shallowcg1packer.generate (issue6269)

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This cause traceback on widening using narrow extension when remotefilelog is enabled. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL

D8113: debugmergestate: make templated

pulkit added a comment. Will be nice to add some release notes either in BC section or in features section stating `debugmergestate` now supports templates and can be used by scripts/editors. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8113/new/

D8029: copy: add option to unmark file as copied

pulkit added a comment. The commit message has a mention of `uncopy` which needs to be removed. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8029/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8029 To: martinvonz, #hg-reviewers, durin42,

D7966: remotefilelog: only prefetch history in linkrevfixup

Closed by commit rHG6f1e6e8ed85a: remotefilelog: only prefetch history in linkrevfixup (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 Revision". REPOSITORY rHG Mercurial

D8099: lfs: use str for the open() mode when opening a blob for py3

This revision now requires changes to proceed. pulkit added a comment. pulkit requested changes to this revision. This one fails to apply on tip of stable branch. Can you rebase and resend? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8099/new/

D7972: recover: don't verify by default

pulkit added a comment. pulkit added a subscriber: durin42. Sorry for late reply. By changing the default, I am afraid about the cases where a user has broken repository and we only recover the transaction and don't verify. I am not sure what those cases are. Also I don't know why recover

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

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,

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

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',

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:

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,

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

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

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

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

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

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

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

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

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/

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

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

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

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,

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:

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

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

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

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

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

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

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

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

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

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

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>

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

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

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 =

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

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,

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/

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:

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

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

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

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

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

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

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

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

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

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

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:

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

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

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

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

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

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 +++

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

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/

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'#'): > -

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

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?

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:

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

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

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 >

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

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

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

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:

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

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

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

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

<    1   2   3   4   5   6   7   8   9   10   >