This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10882

histedit: don't swallow errors that happen when updating the working copy
ClosedPublic

Authored by martinvonz on Jun 18 2021, 5:56 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe9fbf8fd5f33: histedit: don't swallow errors that happen when updating the working copy
Summary

Commit 34165875fa5d (histedit: limit updated and merging output to
important updates, 2016-02-03) added a call to
ui.pushbuffer(labeled=True, errors=True). I don't know if there was
a reason for the errors=True (nor the labeled=True bit, which I
removed in the previous commit). It seems bad to just discard the
errors, so let's not do that. By not doing that, we can also remove a
workaround for the lack of errors from test-removeemptydirs.t.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)
Mtests/test-removeemptydirs.t (15 lines)

Diff 28639

hgext/histedit.py

self.continuedirty() self.continuedirty()
return self.continueclean() return self.continueclean()
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) repo.ui.pushbuffer()
hg.update(repo, self.state.parentctxnode, quietempty=True) hg.update(repo, self.state.parentctxnode, quietempty=True)
repo.ui.popbuffer() 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:
raise error.InterventionRequired( raise error.InterventionRequired(
_(b'Fix up the change (%s %s)') % (self.verb, short(self.node)), _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
hint=_(b'hg histedit --continue to resume'), hint=_(b'hg histedit --continue to resume'),

tests/test-removeemptydirs.t

$ cat > histedit_commands <<EOF $ cat > histedit_commands <<EOF
> pick 89079fab8aee 0 r0 > pick 89079fab8aee 0 r0
> pick e6d271df3142 1 r1 > pick e6d271df3142 1 r1
> pick 89e25aa83f0f 3 migrating_revision > pick 89e25aa83f0f 3 migrating_revision
> pick b550aa12d873 2 r2 > pick b550aa12d873 2 r2
> EOF > EOF
$ cd $TESTTMP/hghistedit/somedir $ cd $TESTTMP/hghistedit/somedir
$ hg --config extensions.histedit= histedit -q --commands ../histedit_commands $ hg --config extensions.histedit= histedit -q --commands ../histedit_commands
current directory was removed
(consider changing to repo root: $TESTTMP/hghistedit)
histedit doesn't output anything when the current diretory is removed. We rely
on the tests being commonly run on machines where the current directory
disappearing from underneath us actually has an observable effect, such as an
error or no files listed
#if linuxormacos
$ isfile foo
no
#endif
$ cd $TESTTMP/hghistedit/somedir
$ isfile foo
yes
$ cd $TESTTMP/hghistedit $ cd $TESTTMP/hghistedit
$ cat > histedit_commands <<EOF $ cat > histedit_commands <<EOF
> pick 89079fab8aee 0 r0 > pick 89079fab8aee 0 r0
> pick 7c7a22c6009f 3 migrating_revision > pick 7c7a22c6009f 3 migrating_revision
> pick e6d271df3142 1 r1 > pick e6d271df3142 1 r1
> pick 40a53c2d4276 2 r2 > pick 40a53c2d4276 2 r2
> EOF > EOF
#if rmcwd #if rmcwd
$ hg histedit --commands - <<EOF $ hg histedit --commands - <<EOF
> pick 6274c77c93c3 1 add bar > pick 6274c77c93c3 1 add bar
> pick ff70a87b588f 0 add foo > pick ff70a87b588f 0 add foo
> fold 9992bb0ac0db 2 add baz > fold 9992bb0ac0db 2 add baz
> EOF > EOF
current directory was removed
(consider changing to repo root: $TESTTMP/issue5826_withrm)
abort: $ENOENT$ abort: $ENOENT$
[255] [255]
Go back to the repo root after losing it as part of that operation: Go back to the repo root after losing it as part of that operation:
$ cd $TESTTMP/issue5826_withrm $ cd $TESTTMP/issue5826_withrm
Note the lack of a non-zero exit code from this function - it exits Note the lack of a non-zero exit code from this function - it exits
successfully, but doesn't really do anything. successfully, but doesn't really do anything.