This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6177

histedit: narrow the scope of discarded ui output
ClosedPublic

Authored by rdamazio on Apr 1 2019, 10:02 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG15d2afa31e57: histedit: narrow the scope of discarded ui output
Summary

In 34165875fa5df813bec3a0cd348932b304d44efb, a lot of the output from
histedit was excluded. This slightly adjusts the scope of that exclusion,
to both discard more uninsteresting messages, and ensure that pre-merge-tool
output gets shown before the external merge tool is executed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

rdamazio created this revision.Apr 1 2019, 10:02 PM
rdamazio updated this revision to Diff 14614.Apr 1 2019, 10:17 PM
Closed by commit rHG15d2afa31e57: histedit: narrow the scope of discarded ui output (authored by rdamazio). · Explain WhyApr 2 2019, 6:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14614

hgext/histedit.py

def applychange(self): def applychange(self):
"""Applies the changes from this action's rulectx onto the current """Applies the changes from this action's rulectx onto the current
parentctx, but does not commit them.""" parentctx, but does not commit them."""
repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
repo.ui.pushbuffer(error=True, labeled=True) repo.ui.pushbuffer(error=True, labeled=True)
hg.update(repo, self.state.parentctxnode, quietempty=True) hg.update(repo, self.state.parentctxnode, quietempty=True)
buf = repo.ui.popbuffer()
stats = applychanges(repo.ui, repo, rulectx, {}) stats = applychanges(repo.ui, repo, rulectx, {})
repo.dirstate.setbranch(rulectx.branch()) repo.dirstate.setbranch(rulectx.branch())
if stats.unresolvedcount: if stats.unresolvedcount:
buf = repo.ui.popbuffer()
repo.ui.write(buf)
raise error.InterventionRequired( raise error.InterventionRequired(
_('Fix up the change (%s %s)') % _('Fix up the change (%s %s)') %
(self.verb, node.short(self.node)), (self.verb, node.short(self.node)),
hint=_('hg histedit --continue to resume')) hint=_('hg histedit --continue to resume'))
else:
repo.ui.popbuffer()
def continuedirty(self): def continuedirty(self):
"""Continues the action when changes have been applied to the working """Continues the action when changes have been applied to the working
copy. The default behavior is to commit the dirty changes.""" copy. The default behavior is to commit the dirty changes."""
repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
editor = self.commiteditor() editor = self.commiteditor()
return commitfunc return commitfunc
def applychanges(ui, repo, ctx, opts): def applychanges(ui, repo, ctx, opts):
"""Merge changeset from ctx (only) in the current working directory""" """Merge changeset from ctx (only) in the current working directory"""
wcpar = repo.dirstate.p1() wcpar = repo.dirstate.p1()
if ctx.p1().node() == wcpar: if ctx.p1().node() == wcpar:
# edits are "in place" we do not need to make any merge, # edits are "in place" we do not need to make any merge,
# just applies changes on parent for editing # just applies changes on parent for editing
ui.pushbuffer()
cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
stats = mergemod.updateresult(0, 0, 0, 0) stats = mergemod.updateresult(0, 0, 0, 0)
ui.popbuffer()
else: else:
try: try:
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'histedit') 'histedit')
stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit']) stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit'])
finally: finally:
repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')

tests/test-histedit-arguments.t

| |
o 2 eb57 three o 2 eb57 three
| |
~ ~
$ HGEDITOR=cat hg histedit -r 4 --commands - << EOF $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF
> edit 08d98a8350f3 4 five > edit 08d98a8350f3 4 five
> EOF > EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
reverting alpha
Editing (08d98a8350f3), you may commit or record as needed now. Editing (08d98a8350f3), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg graft --continue $ hg graft --continue
abort: no graft in progress abort: no graft in progress
(continue: hg histedit --continue) (continue: hg histedit --continue)
[255] [255]
Eventually, histedit could perhaps look at `source` extra, Eventually, histedit could perhaps look at `source` extra,
in which case this test should be revisited. in which case this test should be revisited.
$ hg -q up 8cde254db839 $ hg -q up 8cde254db839
$ hg histedit 6f2f0241f119 --commands - <<EOF $ hg histedit 6f2f0241f119 --commands - <<EOF
> pick 8cde254db839 > pick 8cde254db839
> edit 6f2f0241f119 > edit 6f2f0241f119
> EOF > EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
Fix up the change (pick 8cde254db839) Fix up the change (pick 8cde254db839)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue

tests/test-histedit-edit.t

$ cd .. $ cd ..
$ hg clone -qr0 r r0 $ hg clone -qr0 r r0
$ cd r0 $ cd r0
$ hg phase -fdr0 $ hg phase -fdr0
$ hg histedit --commands - 0 2>&1 << EOF $ hg histedit --commands - 0 2>&1 << EOF
> edit cb9a9f314b8b a > $EDITED > edit cb9a9f314b8b a > $EDITED
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding a
Editing (cb9a9f314b8b), you may commit or record as needed now. Editing (cb9a9f314b8b), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ HGEDITOR=true hg histedit --continue $ HGEDITOR=true hg histedit --continue
saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-histedit.hg
$ hg log -G $ hg log -G
@ changeset: 0:0efcea34f18a @ changeset: 0:0efcea34f18a

tests/test-histedit-fold-non-commute.t

o changeset: 0:1715188a53c7 o changeset: 0:1715188a53c7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit summary: Initial commit
edit the history edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (fold 42abbb61bede) Fix up the change (fold 42abbb61bede)
(hg histedit --continue to resume) (hg histedit --continue to resume)
fix up fix up
$ echo 'I can haz no commute' > e $ echo 'I can haz no commute' > e
$ hg resolve --mark e $ hg resolve --mark e
o changeset: 0:1715188a53c7 o changeset: 0:1715188a53c7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit summary: Initial commit
edit the history edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (roll 42abbb61bede) Fix up the change (roll 42abbb61bede)
(hg histedit --continue to resume) (hg histedit --continue to resume)
fix up fix up
$ echo 'I can haz no commute' > e $ echo 'I can haz no commute' > e
$ hg resolve --mark e $ hg resolve --mark e

tests/test-histedit-fold.t

o 0:0189ba417d34 1+2+3 o 0:0189ba417d34 1+2+3
$ hg histedit 1 --commands - << EOF $ hg histedit 1 --commands - << EOF
> pick 617f94f13c0f 1 +4 > pick 617f94f13c0f 1 +4
> drop 888f9082bf99 2 +5 > drop 888f9082bf99 2 +5
> fold 251d831eeec5 3 +6 > fold 251d831eeec5 3 +6
> EOF > EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
Fix up the change (fold 251d831eeec5) Fix up the change (fold 251d831eeec5)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
There were conflicts, we keep P1 content. This There were conflicts, we keep P1 content. This
should effectively drop the changes from +6. should effectively drop the changes from +6.
| |
o 0:0189ba417d34 1+2+3 o 0:0189ba417d34 1+2+3
$ hg histedit 1 --commands - << EOF $ hg histedit 1 --commands - << EOF
> pick 617f94f13c0f 1 +4 > pick 617f94f13c0f 1 +4
> drop 888f9082bf99 2 +5 > drop 888f9082bf99 2 +5
> fold 251d831eeec5 3 +6 > fold 251d831eeec5 3 +6
> EOF > EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
Fix up the change (fold 251d831eeec5) Fix up the change (fold 251d831eeec5)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ cat > file << EOF $ cat > file << EOF
> 1 > 1
> 2 > 2
> echo merged foos > \$1 > echo merged foos > \$1
> EOF > EOF
$ HGEDITOR="sh \"$TESTTMP/editor.sh\"" hg histedit 1 --commands - 2>&1 <<EOF | fixbundle $ HGEDITOR="sh \"$TESTTMP/editor.sh\"" hg histedit 1 --commands - 2>&1 <<EOF | fixbundle
> pick 578c7455730c 1 a > pick 578c7455730c 1 a
> pick 0e01aeef5fa8 2 foo1 > pick 0e01aeef5fa8 2 foo1
> fold b7389cc4d66e 3 foo2 > fold b7389cc4d66e 3 foo2
> fold 21679ff7675c 4 foo3 > fold 21679ff7675c 4 foo3
> EOF > EOF
merging foo
$ hg logt $ hg logt
2:e8bedbda72c1 merged foos 2:e8bedbda72c1 merged foos
1:578c7455730c a 1:578c7455730c a
0:79b99e9c8e49 b 0:79b99e9c8e49 b
Editor should have run only once Editor should have run only once
$ cat $TESTTMP/editorlog.txt $ cat $TESTTMP/editorlog.txt
ran editor ran editor
foo1 foo1

tests/test-histedit-merge-tools.t

  • This file was added.
Test histedit extension: Merge tools
====================================
Initialization
---------------
$ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF
> [alias]
> logt = log --template '{rev}:{node|short} {desc|firstline}\n'
> [extensions]
> histedit=
> mockmakedate = $TESTDIR/mockmakedate.py
> [ui]
> pre-merge-tool-output-template='pre-merge message for {node}\n'
> EOF
Merge conflict
--------------
$ hg init r
$ cd r
$ echo foo > file
$ hg add file
$ hg ci -m "First" -d "1 0"
$ echo bar > file
$ hg ci -m "Second" -d "2 0"
$ hg logt --graph
@ 1:2aa920f62fb9 Second
|
o 0:7181f42b8fca First
Invert the order of the commits, but fail the merge.
$ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF | fixbundle
> pick 2aa920f62fb9 Second
> pick 7181f42b8fca First
> EOF
merging file
pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
merging file failed!
Fix up the change (pick 7181f42b8fca)
(hg histedit --continue to resume)
$ hg histedit --abort | fixbundle
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Invert the order of the commits, and pretend the merge succeeded.
$ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle
> pick 2aa920f62fb9 Second
> pick 7181f42b8fca First
> EOF
merging file
pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
7181f42b8fca: skipping changeset (no changes)

tests/test-histedit-non-commute.t

o changeset: 0:1715188a53c7 o changeset: 0:1715188a53c7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit summary: Initial commit
edit the history edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (pick 39522b764e3d) Fix up the change (pick 39522b764e3d)
(hg histedit --continue to resume) (hg histedit --continue to resume)
abort the edit abort the edit
$ hg histedit --abort 2>&1 | fixbundle $ hg histedit --abort 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
o changeset: 0:1715188a53c7 o changeset: 0:1715188a53c7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit summary: Initial commit
edit the history edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (pick 39522b764e3d) Fix up the change (pick 39522b764e3d)
(hg histedit --continue to resume) (hg histedit --continue to resume)
fix up fix up
$ echo 'I can haz no commute' > e $ echo 'I can haz no commute' > e
$ hg resolve --mark e $ hg resolve --mark e
pick 65a9a84f33fd 3 c pick 65a9a84f33fd 3 c
pick 00f1c5383965 4 d pick 00f1c5383965 4 d
mess 39522b764e3d 7 does not commute with e mess 39522b764e3d 7 does not commute with e
pick 7b4e2f4b7bcd 5 e pick 7b4e2f4b7bcd 5 e
pick 500cac37a696 6 f pick 500cac37a696 6 f
edit the history, this time with a fold action edit the history, this time with a fold action
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (mess 39522b764e3d) Fix up the change (mess 39522b764e3d)
(hg histedit --continue to resume) (hg histedit --continue to resume)
$ echo 'I can haz no commute' > e $ echo 'I can haz no commute' > e
$ hg resolve --mark e $ hg resolve --mark e
(no more unresolved files) (no more unresolved files)

tests/test-histedit-obsolete.t

$ hg up '.^' $ hg up '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r 'children(.)' $ hg log -r 'children(.)'
11:c13eb81022ca f (no-eol) 11:c13eb81022ca f (no-eol)
$ hg histedit -r '.' --commands - <<EOF $ hg histedit -r '.' --commands - <<EOF
> edit b346ab9a313d 6 c > edit b346ab9a313d 6 c
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
Editing (b346ab9a313d), you may commit or record as needed now. Editing (b346ab9a313d), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ echo c >> c $ echo c >> c
$ hg histedit --continue $ hg histedit --continue
1 new orphan changesets 1 new orphan changesets
$ hg log -r 'orphan()' $ hg log -r 'orphan()'
> edit b449568bf7fc 11 f > edit b449568bf7fc 11 f
> pick 6b70183d2492 12 g > pick 6b70183d2492 12 g
> pick 7395e1ff83bd 13 h > pick 7395e1ff83bd 13 h
> pick b605fb7503f2 14 i > pick b605fb7503f2 14 i
> pick 3a6c53ee7f3d 15 j > pick 3a6c53ee7f3d 15 j
> pick ee118ab9fa44 16 k > pick ee118ab9fa44 16 k
> EOF > EOF
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
adding f
Editing (b449568bf7fc), you may commit or record as needed now. Editing (b449568bf7fc), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ echo f >> f $ echo f >> f
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 24:12e89af74238 (secret) k @ 24:12e89af74238 (secret) k
| |
> edit b449568bf7fc 11 f > edit b449568bf7fc 11 f
> pick 6b70183d2492 12 g > pick 6b70183d2492 12 g
> pick 7395e1ff83bd 13 h > pick 7395e1ff83bd 13 h
> pick b605fb7503f2 14 i > pick b605fb7503f2 14 i
> pick 3a6c53ee7f3d 15 j > pick 3a6c53ee7f3d 15 j
> pick ee118ab9fa44 16 k > pick ee118ab9fa44 16 k
> EOF > EOF
0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
adding f
Editing (b449568bf7fc), you may commit or record as needed now. Editing (b449568bf7fc), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ echo f >> f $ echo f >> f
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 24:12e89af74238 (secret) k @ 24:12e89af74238 (secret) k
| |

tests/test-qrecord.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: foo bar summary: foo bar
$ hg histedit tip --commands - 2>&1 <<EOF $ hg histedit tip --commands - 2>&1 <<EOF
> edit ea55e2ae468f foo bar > edit ea55e2ae468f foo bar
> EOF > EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding a
Editing (ea55e2ae468f), you may commit or record as needed now. Editing (ea55e2ae468f), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ echo 'foo bar' > a $ echo 'foo bar' > a
$ hg qrecord -d '0 0' -m aaa a.patch <<EOF $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
> y > y
> y > y
> n > n
> y > y
> y > y
> n > n
> EOF > EOF
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[255] [255]