Mercurial > hg
view tests/test-editor-filename.t @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
parents | f802a75da585 |
children | ac362d5a7893 |
line wrap: on
line source
Test temp file used with an editor has the expected suffix. $ hg init Create an editor that writes its arguments to stdout and set it to $HGEDITOR. $ cat > editor.sh << EOF > echo "\$@" > exit 1 > EOF $ hg add editor.sh $ HGEDITOR="sh $TESTTMP/editor.sh" $ export HGEDITOR Verify that the path for a commit editor has the expected suffix. $ hg commit *.commit.hg.txt (glob) abort: edit failed: sh exited with status 1 [255] Verify that the path for a histedit editor has the expected suffix. $ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > histedit= > EOF $ hg commit --message 'At least one commit for histedit.' $ hg histedit *.histedit.hg.txt (glob) abort: edit failed: sh exited with status 1 [255] Verify that when performing an action that has the side-effect of creating an editor for a diff, the file ends in .diff. $ echo 1 > one $ echo 2 > two $ hg add adding one adding two $ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF > y > e > q > EOF diff --git a/one b/one new file mode 100644 examine changes to 'one'? (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +1 record change 1/2 to 'one'? (enter ? for help) [Ynesfdaq?] e *.diff (glob) editor exited with exit code 1 record change 1/2 to 'one'? (enter ? for help) [Ynesfdaq?] q abort: user quit [255]