issue5727 was reported specifically for mq on using qrefresh. On investigating further,
I realized that it was a check in patch.py that resulting in the abort. I may be wrong.
On interactive mode, gp.mode was not None. I added a check in _applydiff() not to
abort when gp.mode is None or ui.interactive is True.
Details
- Reviewers
baymax - Group Reviewers
hg-reviewers
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
Event Timeline
tests/test-mq-qrefresh.t | ||
---|---|---|
570 | does this prompt ended here? it didn't show changes in 'foo.h'? |
tests/test-mq-qrefresh.t | ||
---|---|---|
570 | i think that's usual here as the file foo.h is empty. i have the following case running successfully with this patch: $ echo foo > foo.h $ hg add foo.h $ hg qrefresh -i --config ui.interactive=true <<EOF > y > y > n > EOF diff --git a/foo.h b/foo.h new file mode 100644 examine changes to 'foo.h'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +foo record this change to 'foo.h'? [Ynesfdaq?] y |
tests/test-mq-qrefresh.t | ||
---|---|---|
570 | I don't see the output which asks for record this change to foo.h here in the test. |
tests/test-mq-qrefresh.t | ||
---|---|---|
570 | IIUC, the current scenario is running into abort: cannot create foo.h: destination already exists if an empty file has been added. This means that the test case in my previous comment works fine without running into an error. I tested with hg (version 4.9+3-b70b7c585ee9) by adding a file with contents by running one command after another in my command line and got the same output. The interactive UI prompted me with only two queries. For an empty file, it should be only one as there are no changes to record. This might be the case for qrefresh. I'm not sure about this though. |
There seems to have been no activities on this Diff for the past 3 Months.
By policy, we are automatically moving it out of the need-review state.
Please, move it back to need-review without hesitation if this diff should still be discussed.
:baymax:need-review-idle:
does this prompt ended here? it didn't show changes in 'foo.h'?