This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9545

status: disable morestatus when using -0
ClosedPublic

Authored by martinvonz on Dec 8 2020, 4:39 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG7a2b67e6b680: status: disable morestatus when using -0
Summary

Without this patch, you get something like this:

M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc)

# Unresolved merge conflicts:
#
#     a
#
# To mark files as resolved:  hg resolve --mark FILE

# To continue:    hg commit
# To abort:       hg merge --abort

That doesn't seem like something one would ever want. I considered
making it an error to combine -0 with morestatus, but it seems very
likely that that would just make the user spend time trying to figure
out how to disable morestatus, so it feels like we might as well just
do it for them.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Dec 8 2020, 4:39 PM
mharbison72 accepted this revision.Dec 8 2020, 10:10 PM
This revision is now accepted and ready to land.Dec 8 2020, 10:10 PM
martinvonz added a commit: rHG7a2b67e6b680: status: disable morestatus when using -0.Dec 8 2020, 10:15 PM
Closed by commit rHG7a2b67e6b680: status: disable morestatus when using -0 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)
Mtests/test-conflict.t (2 lines)

Diff 24124

mercurial/commands.py

opts.get(b'all') opts.get(b'all')
or opts.get(b'copies') or opts.get(b'copies')
or ui.configbool(b'ui', b'statuscopies') or ui.configbool(b'ui', b'statuscopies')
) and not opts.get(b'no_status'): ) and not opts.get(b'no_status'):
copy = copies.pathcopies(ctx1, ctx2, m) copy = copies.pathcopies(ctx1, ctx2, m)
morestatus = None morestatus = None
if ( if (
ui.verbose or ui.configbool(b'commands', b'status.verbose') (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
) and not ui.plain(): and not ui.plain()
and not opts.get(b'print0')
):
morestatus = cmdutil.readmorestatus(repo) morestatus = cmdutil.readmorestatus(repo)
ui.pager(b'status') ui.pager(b'status')
fm = ui.formatter(b'status', opts) fm = ui.formatter(b'status', opts)
fmt = b'%s' + end fmt = b'%s' + end
showchar = not opts.get(b'no_status') showchar = not opts.get(b'no_status')
for state, char, files in changestates: for state, char, files in changestates:

tests/test-conflict.t

}, },
{ {
"itemtype": "morestatus", "itemtype": "morestatus",
"unfinished": "merge", "unfinished": "merge",
"unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort" "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort"
} }
] ]
$ hg status -0
M a\x00? a.orig\x00 (no-eol) (esc)
$ cat a $ cat a
Small Mathematical Series. Small Mathematical Series.
1 1
2 2
3 3
<<<<<<< working copy: 618808747361 - test: branch2 <<<<<<< working copy: 618808747361 - test: branch2
6 6
8 8