D6776: bookmarks: validate changes on push (issue6193) (BC)

mjacob added a comment. I agree (with some previous answers) that adding more stuff to `--force` should be avoided. I planned to send a proposal (and patches) after the 5.5 release for adding more detailed options that can be used instead of `--force`. However, due to unexpected reasons

D8843: rebase: fix regression in file change detection introduced by 0ecb3b11fcad

mjacob created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Before 0ecb3b11fcad , `wctx._compact()`, was call

D8842: context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This partially backs out 6a5dcd754842 . The method was and is unused, but a call to

D8770: relnotes: add release notes for relevant changes I did since the 5.4 release

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY After having written the notes, I realized that the added points contain changes that were part of the 5.4.2 release. These were never included in any release

D8769: relnotes: fix indentation

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The two points were written by me. For some reason, I missed the fact that the other points were indented by one space. REPOSITORY rHG Mercurial BRANCH defa

D8768: relnotes: make spacing before new section consistent

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8768 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next b/reln

D8765: absorb: improve message for the case when changeset became empty

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY In changeset f55099982bc5 , I introduced the message "became empty and became ...",

D8749: absorb: make it explicit if empty changeset was created

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY If the config rewrite.empty-successor=skip is set, a message "became empty and was dropped" is shown if the changeset became empty. If the config rewrite.empty-

D8747: rebase: consider rewrite.empty-successor configuration

mjacob created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This adds support for the recently added rewrite.empty-successor configuration. REPOSITORY rHG Mercurial BRANCH default

D8748: absorb: consider rewrite.empty-successor configuration

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This adds support for the recently added rewrite.empty-successor configuration. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercu

D8745: config: add option to control creation of empty successors during rewrite

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The default for many history-rewriting commands (e.g. rebase and absorb) is that changesets which would become empty are not created in the target branch. This

D8746: rewriteutil: add utility to check whether empty successors should be skipped

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8746 AFFECTED FILES mercurial/rewriteutil.py CHANGE DETAILS diff --git a/mercurial

D8733: overlayworkingctx: remove unused `nofilechanges()` and `_compact()` methods

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8733 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/con

D8732: rebase: correctly check for empty commit in in-memory mode

mjacob created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The new code has a small overhead in the empty commit case, as a `memctx` object is always created, but I don’t think it’s j

D8731: memctx: make `parents()` return list of one element if it’s not a merge

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It is part of the contract of `parents()` that non-merges return a list of one element. `self._parents` is always a list of two elements in `memctx`. REPOSITORY

D8729: commit: factor out empty commit check to `committablectx.isempty()`

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This enables reuse in other places, e.g. those dealing with `memctx`. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.or

D8728: overlayworkingctx: rename misleadingly named `isempty()` method

mjacob created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This method is only about whether there are file changes, not about whether the commit will be empty or not. One user o

D8727: rebase: add test case that shows that inmemory rebase does not preserve merges

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8727 AFFECTED FILES tests/test-rebase-inmemory.t CHANGE DETAILS diff --git a/tests

D8724: commit: check branch change on to-be-committed changeset

mjacob created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This makes a difference when a branch name is passed via the `extra` argument, which will be used as the branch name for the created changeset. The empty commit

D8725: rebase: remove now unnecessary logic to allow empty commit when branch changes

mjacob created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was a workaround for a bug in the empty commit check in repo.commit(), where the the parent branch name was incorrectly

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

mjacob added a comment. In D7631#123321 , @mharbison72 wrote: > In D7631#123318 , @mjacob wrote: > >> I like the name `--from` for the option. It would also make sense in combination with a pos

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

mjacob added a comment. I like the name `--from` for the option. It would also make sense in combination with a possible future `--into` option. INLINE COMMENTS > martinvonz wrote in absorb.py:993 > I think we should at least have a TODO about adding them. > > By the way, without the next p