D6613: commit: improve the files field of changelog for merges (RFC)

mharbison72 added a comment. In D6613#96749 , @valentin.gatienbaron wrote: > In D6613#96743 , @mharbison72 wrote: > >> If this goes forward, can this be gated by a config option (even if it is

Re: Why does mercurial.util.username() return None on Windows?

On Mon, 08 Jul 2019 21:00:32 -0400, Matt Harbison wrote: On Mon, 08 Jul 2019 14:58:36 -0400, Augie Fackler wrote: I just tripped on this today: https://www.mercurial-scm.org/repo/hg/file/tip/mercurial/windows.py#l514 It's been that way since at least 2009 when mpm split out the

D6624: tests: update test-commit-interactive.t for no-execbit platforms

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY These changes correspond with f802a75da585 . REPOSITORY rHG Mercurial REVISION

mercurial@42580: 5 new changesets

5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ea6558db1011 changeset: 42576:ea6558db1011 user:Augie Fackler date:Mon Jul 08 14:01:01 2019 -0400 summary: extdata: avoid crashing inside subprocess when we get a revset parse error

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. In D6613#96743 , @mharbison72 wrote: > If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems

D6616: extdata: avoid crashing inside subprocess when we get a revset parse error

yuja added a comment. > if proc: > > - proc.communicate() > > +try: > +proc.communicate() > +except ValueError: > +# This happens if we started iterating src and then > +# get a parse error on a line. It

Re: D6616: extdata: avoid crashing inside subprocess when we get a revset parse error

> if proc: > -proc.communicate() > +try: > +proc.communicate() > +except ValueError: > +# This happens if we started iterating src and then > +# get a parse error on a line. It should be safe to ignore. >

mercurial@42575: 11 new changesets

11 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/4764e8436b2a changeset: 42565:4764e8436b2a parent: 42561:44e99811bea7 user:Kyle Lippincott date:Thu Jun 20 11:40:47 2019 -0700 summary: filemerge: make last line of prompts <40 english chars

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

yuja added a comment. > @@ -16,6 +16,7 @@ > import collections > import contextlib > import errno > +import io > import os > import struct > import zlib > @@ -2306,7 +2307,7 @@ > > try: > with self._datafp() as f: > > - f.seek(0, 2) > > +

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

> @@ -16,6 +16,7 @@ > import collections > import contextlib > import errno > +import io > import os > import struct > import zlib > @@ -2306,7 +2307,7 @@ > > try: > with self._datafp() as f: > -f.seek(0, 2) > +f.seek(0, io.SEEK_END)

[Bug 6169] New: HG Push fails with Key Error: ''

https://bz.mercurial-scm.org/show_bug.cgi?id=6169 Bug ID: 6169 Summary: HG Push fails with Key Error: '' Product: Mercurial Version: 5.0.2 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug

D6613: commit: improve the files field of changelog for merges (RFC)

This revision now requires changes to proceed. mharbison72 added a comment. mharbison72 requested changes to this revision. If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems

mercurial@42564: 3 new changesets (3 on stable)

3 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/97ada9b8d51b changeset: 42562:97ada9b8d51b branch: stable tag: 5.0.2 parent: 42556:93fed084ce36 user:Augie Fackler date:Mon Jul 08 13:12:20 2019 -0400 summary: posix:

D6567: abort: added support for graft

taapas1128 added a comment. amended. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 To: taapas1128, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel

D6566: abort: added logic for of hg abort

taapas1128 marked 3 inline comments as done. taapas1128 updated this revision to Diff 15836. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15802=15836 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL

D6588: abort: added support for merge

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15835. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15808=15835 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL

D6579: abort: added support for unshelve

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15833. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15806=15833 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6582: abort: added support for histedit

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15834. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15807=15834 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL

D6567: abort: added support for graft

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15831. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15804=15831 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL

D6568: abort: added support for rebase

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15832. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15805=15832 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron edited the summary of this revision. valentin.gatienbaron updated this revision to Diff 15830. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6613?vs=15789=15830 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6613/new/

D6568: abort: added support for rebase

pulkit added inline comments. INLINE COMMENTS > rebase.py:1929 > +rbsrt = rebaseruntime(repo, ui) > +rbsrt._prepareabortorcontinue(isabort=True, backup=True, > + suppwarns=False) If I am correct, the call to abort from `hg rebase --abort`

D6567: abort: added support for graft

pulkit added a comment. > This logic is registered to the statesetection API as abortfunc. s/statesection/statedetection > graft currently supports --dry-run flag. This sounds ambiguous. Does this means `hg graft` supports `--dry-run` flag? IIUC, `hg abort` supports `--dry-run`

D6566: abort: added logic for of hg abort

pulkit added a comment. > hg abort currently supports --dry-run/-n flag only. > It is used to dry run hg abort We should specify what does dry run does i.e. it prints the operation which will be aborted if `hg abort` is run. INLINE COMMENTS > commands.py:139 > +def abort(ui, repo,

D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

Closed by commit rHGb8d54f4625cb: merge: disallow merge abort in case of an unfinished operation (issue6160) (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6607?vs=15814=15829#toc

D6622: relnotes: document new range-select mechanism in crecord

Closed by commit rHG9f73620a65fe: relnotes: document new range-select mechanism in crecord (authored by spectral). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6622?vs=15815=15828

D6623: py3: store _origdoc as str

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since __doc__ is str, it seems natural that _origdoc also is. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6623 AFFECTED FILES