D6555: vfs: require use of .seek() or .write() before .tell() on append-mode files

mharbison72 added a comment. I worked around the same bug in Windows in platform.posixfile [1]. Should this be done in the posix layer (which is currently only an alias to `open()`)? It looks like there are uses of posixfile outside of vfs. [1]

D6564: copies: avoid reusing the same variable for two different copy dicts

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY "childcopies" is initally the copies the current changeset to one of its children and then we reassign it with the copies from the start of the chain to the

D6562: filemerge: make last line of prompts <40 english chars (issue6158)

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I've chosen <40 as the target so that other languages that may have a 2x blowup in character count can still have a chance to fit into an 80 column screen.

D6563: patch: use a short, fixed-size message for last line of prompt (issue6158)

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY See issue6158 and the previous commit for examples of what might go wrong if we have some combinations of readline version and terminal and need to wrap the

D6561: copies: simplify merging of copy dicts on merge commits

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY After we removed some filtering in 35d674a3d5db (copies: don't filter out copy

D6560: copies: remove a redundant matcher filtering in _changesetforwardcopies()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We filter before pushing items on the queue, so we don't need to filter after popping. REPOSITORY rHG Mercurial REVISION DETAIL

D6559: copies: delete obsolete comment in _changesetforwardcopies()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY IIRC, the comment applied to the filtering we did before 35d674a3d5db (copies:

[Bug 6160] New: "hg merge --abort" uncleanly aborts an in-progress unshelve

https://bz.mercurial-scm.org/show_bug.cgi?id=6160 Bug ID: 6160 Summary: "hg merge --abort" uncleanly aborts an in-progress unshelve Product: Mercurial Version: 5.0 Hardware: PC OS: Linux Status:

[Bug 6159] New: hg pushes bookmarks pointing to secret revisions

https://bz.mercurial-scm.org/show_bug.cgi?id=6159 Bug ID: 6159 Summary: hg pushes bookmarks pointing to secret revisions Product: Mercurial Version: 5.0 Hardware: PC OS: Linux Status: UNCONFIRMED

[Bug 6158] New: readline may wrap prompts poorly

https://bz.mercurial-scm.org/show_bug.cgi?id=6158 Bug ID: 6158 Summary: readline may wrap prompts poorly Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity:

D6558: cmdutil: updated description for bailifchanged()

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is added to establish a connection between `statemod.checkunfinished()` and `bailifchanged()`. REPOSITORY rHG Mercurial REVISION DETAIL

D6553: shelve: move shelve extension to core

navaneeth.suresh updated this revision to Diff 15621. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6553?vs=15616=15621 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6553/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6553

D6501: state: created new class statecheck to handle unfinishedstates

taapas1128 added a comment. @martinvonz relnotes/next have been updated in D6557 . REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6501/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6501 To: taapas1128,

D6557: relnotes: added description about statemod._statecheck

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6557 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next b/relnotes/next ---

D6554: cleanup: always `seek(0, io.SEEK_END)` after open in append mode before tell()

durin42 added a comment. Note that I mailed a version to the list for stable. This doesn't quite cleanly apply there, so I made the change twice so I could write the next change without waiting for a merge.

D6556: cleanup: use named constants for second arg to .seek()

durin42 created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6556 AFFECTED FILES hgext/fastannotate/revmap.py

[PATCH STABLE] cleanup: always `seek(0, io.SEEK_END)` after open in append mode before tell()

# HG changeset patch # User Augie Fackler # Date 1561049708 14400 # Thu Jun 20 12:55:08 2019 -0400 # Branch stable # Node ID e99fa717419b71a2493fd7211cab5a0de9c86c7c # Parent b6387a65851d4421d5580b1a4db4c55366a94ec8 cleanup: always `seek(0, io.SEEK_END)` after open in append mode before

D6554: cleanup: always `seek(0, io.SEEK_END)` after open in append mode before tell()

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Consider the program: #include int main() { FILE *f = fopen("narf", "w"); fprintf(f, "narf\n"); fclose(f); f =

D6555: vfs: require use of .seek() or .write() before .tell() on append-mode files

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This prevents the bug in the previous change, but avoids an extraneous seek() call in the common case when it's not required. My preference was to ban .seek()

D6553: shelve: move shelve extension to core

navaneeth.suresh created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now,`shelve` was bootstrapped as an extension. This patch adds `shelve` on core. REPOSITORY rHG Mercurial REVISION DETAIL

D6552: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 updated this revision to Diff 15615. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6552?vs=15612=15615 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6552/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6552 AFFECTED

mercurial@42504: 7 new changesets

7 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/089f14dd7df3 changeset: 42498:089f14dd7df3 user:Martin von Zweigbergk date:Tue Jun 18 08:55:23 2019 -0700 summary: relnotes: document template support for `hg root`

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15614. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15610=15614 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6501: state: created new class statecheck to handle unfinishedstates

taapas1128 updated this revision to Diff 15613. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6501?vs=15570=15613 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6501/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6501 AFFECTED

D6501: state: created new class statecheck to handle unfinishedstates

martinvonz added inline comments. INLINE COMMENTS > state.py:154 > +addunfinished( > +'update',fname='updatestate', clearable=True, > +cmdmsg=_('last update was interrupted'), Add space before `fname` REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6503: statecheck: added support for STATES

taapas1128 added inline comments. taapas1128 marked an inline comment as done. INLINE COMMENTS > martinvonz wrote in rebase.py:1954-1955 > It seems like this should also be unified with the new tracking of unfinished > operations. Will you have time to look into that after the current series?

D6551: state: moved cmdutil.afterresolvedstates to statemod

taapas1128 created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This commit moves `cmdutil.afterresolvedstates` and adjoining function to `state.py`.

D6552: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This removes `afterresolvedstates` from `state.py` and adds support for it in