facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

metaedit: fix the tests for the --batch option on OSX

Browse Source 
Summary:
D15188668 added the `--batch` option to the `metaedit` command along
with updating the tests. Unfortunately, the test is broken on OSX. This commit
fixes the test to be compatible with OSX.

Differential Revision: D15273960

fbshipit-source-id: 57a67b9d7ab2b471ee205db4fdfc7f3e6e2e553b
This commit is contained in:
Saurabh Singh 2019-05-08 20:46:53 -07:00 committed by Facebook Github Bot
parent d150a1273b
commit 145ef2b991
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/test-amend-metaedit.t
View File

@ -405,7 +405,8 @@ Test empty commit
|
o 0:426bada5c675@default(draft) A
Test editing multiple commits in batch (--batch)
Create some commits for testing the editing of commits in batch using `--batch`
option
$ newrepo multi-commits
$ drawdag << 'EOS'
@ -416,6 +417,24 @@ Test editing multiple commits in batch (--batch)
> A1
> EOS
Editing a single commit using `--batch` uses the single-commit template
$ HGEDITOR=cat hg metaedit --batch -r 'tip'
HG: Commit message of changeset dad6906767c0
A3
HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit.
HG: --
HG: user: test
HG: branch 'default'
HG: added A3
nothing changed
[1]
Test editing mutiple commits in a batch (--batch)
$ HGEDITOR=cat hg metaedit --batch -r 'all()'
HG: Editing 3 commits in batch. Do not change lines starting with 'HG:'.
HG: Begin of commit b008d5d798a3
@ -440,6 +459,19 @@ Test editing multiple commits in batch (--batch)
#if no-osx
Test actually editing the commits
- Test editing a single commit
(BSD-flavored sed has an incompatible -'i')
$ HGEDITOR="s'e'd -i 's/A/B/g'" hg metaedit --batch -r 'tip'
$ hg log -Gr 'all()' -T '{desc}'
o B3
|
o A2
|
o A1
- Test editing multiple commits
(BSD-flavored sed has an incompatible -'i')
$ HGEDITOR="s'e'd -i 's/A/B/g'" hg metaedit --batch -r 'all()'
$ hg log -Gr 'all()' -T '{desc}'
@ -450,20 +482,3 @@ Test editing multiple commits in batch (--batch)
o B1
#endif
Editing a single commit using --batch uses the single-commit template
$ HGEDITOR=cat hg metaedit --batch -r tip
HG: Commit message of changeset 758b5e8264f6
B3
HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit.
HG: --
HG: user: test
HG: branch 'default'
HG: added A3
nothing changed
[1]