This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8000

mq: don't tell user to commit merge that we already committed
ClosedPublic

Authored by martinvonz on Jan 24 2020, 7:16 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4152183acedd: mq: don't tell user to commit merge that we already committed

Diff Detail

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

Event Timeline

martinvonz created this revision.Jan 24 2020, 7:16 PM
durin42 accepted this revision.Jan 29 2020, 6:09 PM
This revision is now accepted and ready to land.Jan 29 2020, 6:09 PM
pulkit accepted this revision.Jan 30 2020, 9:34 AM

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (2 lines)
Mtests/test-mq-merge.t (1 line)

Diff 19591

hgext/mq.py

self.ui.warn(_(b"patch didn't work out, merging %s\n") % patch) self.ui.warn(_(b"patch didn't work out, merging %s\n") % patch)
# apply failed, strip away that rev and merge. # apply failed, strip away that rev and merge.
hg.clean(repo, head) hg.clean(repo, head)
strip(self.ui, repo, [n], update=False, backup=False) strip(self.ui, repo, [n], update=False, backup=False)
ctx = repo[rev] ctx = repo[rev]
ret = hg.merge(ctx) ret = hg.merge(ctx, remind=False)
if ret: if ret:
raise error.Abort(_(b"update returned %d") % ret) raise error.Abort(_(b"update returned %d") % ret)
n = newcommit(repo, None, ctx.description(), ctx.user(), force=True) n = newcommit(repo, None, ctx.description(), ctx.user(), force=True)
if n is None: if n is None:
raise error.Abort(_(b"repo commit failed")) raise error.Abort(_(b"repo commit failed"))
try: try:
ph = patchheader(mergeq.join(patch), self.plainmode) ph = patchheader(mergeq.join(patch), self.plainmode)
except Exception: except Exception:

tests/test-mq-merge.t

merging with queue at: $TESTTMP/t2/.hg/refqueue merging with queue at: $TESTTMP/t2/.hg/refqueue
applying patcha applying patcha
patching file a patching file a
Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
fuzz found when applying patch, stopping fuzz found when applying patch, stopping
patch didn't work out, merging patcha patch didn't work out, merging patcha
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
applying patcha2 applying patcha2
now at: patcha2 now at: patcha2
Check patcha is still a git patch: Check patcha is still a git patch:
$ cat .hg/patches/patcha $ cat .hg/patches/patcha
# HG changeset patch # HG changeset patch
# Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4 # Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4