[Bug 6332] New: fold can create merge with ancestor

https://bz.mercurial-scm.org/show_bug.cgi?id=6332 Bug ID: 6332 Summary: fold can create merge with ancestor Product: Mercurial Version: default branch Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity:

D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This avoids some pointless copying. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8566 AFFECTED FILES

D8570: rebase: use context to load mergestate instead of loading it directly

durin42 created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8570 AFFECTED FILES hgext/rebase.py CHANGE

D8568: overlayworkingctx: implement mergestate() using in-memory mergestate

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will allow `hg fix` to use the mergestate() method without regressing. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8569: merge: get mergestate from context instead of directly

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This causes `hg fix` (and probably others) to use the new in-memory mergestate object instead of the on-disk one, which may incidentally correct some defects.

D8563: localrepo: get mergestate via context

durin42 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/D8563 AFFECTED FILES mercurial/localrepo.py CHANGE DETAILS diff --git

D8567: mergestate: implement trivial in-memory mergestate

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is the dumbest possible "mergestate" implementation: it doesn't actually handle conflict storage in the slightest, but for the current in-memory merge

D8565: mergestate: optimize unresolvedcount() a little bit

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY It struck me as wasteful to make this extra list copy of a generator. I was hoping to manage to return a bool instead of an int (and thus avoid traversing the

D8564: fakemergerecord: get mergestate via context

durin42 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/D8564 AFFECTED FILES tests/fakemergerecord.py CHANGE DETAILS diff --git

D8562: shelve: get mergestate via context

durin42 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/D8562 AFFECTED FILES mercurial/shelve.py CHANGE DETAILS diff --git

D8561: hg: get mergestate via context

durin42 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/D8561 AFFECTED FILES mercurial/hg.py CHANGE DETAILS diff --git a/mercurial/hg.py

D8556: commands: get mergestate via context

durin42 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/D8556 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git

D8559: revset: get mergestate via context

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Happily, this resolves an import cycle! REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8559 AFFECTED FILES

D8560: templatekw: get mergestate via context

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Happily, this resolves an import cycle! REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8560 AFFECTED FILES

D8557: debugcommands: get mergestate via context

durin42 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/D8557 AFFECTED FILES mercurial/debugcommands.py CHANGE DETAILS diff --git

D8558: fileset: get mergestate via context

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Happily, this resolves an import cycle! REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8558 AFFECTED FILES

D8555: cmdutil: get mergestate via context

durin42 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/D8555 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git

D8553: histedit: use context to load mergestate instead of loading it directly

durin42 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/D8553 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git

D8551: context: implement mergestate() method

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will let us have the mergestate storage be controlled by the context. In particular, for working contexts we should use the existing mergestate, but for

D8554: strip: get mergestate via context

durin42 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/D8554 AFFECTED FILES hgext/strip.py CHANGE DETAILS diff --git a/hgext/strip.py

D8552: fix: use context to fetch mergestate instead of loading it directly

durin42 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/D8552 AFFECTED FILES hgext/fix.py CHANGE DETAILS diff --git a/hgext/fix.py

D8353: debugcommands: create new debugantivirusrunning command

Herald added a subscriber: mercurial-patches. durin42 updated this revision to Diff 21426. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8353?vs=20929=21426 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8353/new/ REVISION

D8549: relnotes: add API change note per request in D8502

durin42 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/D8549 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next

D8548: tests: add coverage for repo.changelog.children() in the git extension

durin42 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/D8548 AFFECTED FILES tests/test-git-interop.t CHANGE DETAILS diff --git

D8547: tests: add coverage for repo.changelog.findmissing() in test-git-interop.t

durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This at least does a basic test of the method. It's not super-complete, but it's better than the nothing we'd otherwise have. REPOSITORY rHG Mercurial

D8546: relnotes: copy "next" to "5.4" and clear "next"

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is the same thing as we've done for the previous few releases. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL