Mercurial > hg
comparison tests/test-import.t @ 32940:75be14993fda
cleanup: use $PYTHON to run python in many more tests
Spotted one of these, then wrote a check-code rule that caught them
all. It will be the next change.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 20 Jun 2017 09:45:02 -0400 |
| parents | cf1e15f91c90 |
| children | d39639fb840e |
comparison
equal
deleted
inserted
replaced
| 32939:cad62cb3c84c | 32940:75be14993fda |
|---|---|
| 62 adding manifests | 62 adding manifests |
| 63 adding file changes | 63 adding file changes |
| 64 added 1 changesets with 2 changes to 2 files | 64 added 1 changesets with 2 changes to 2 files |
| 65 updating to branch default | 65 updating to branch default |
| 66 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 66 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 67 $ HGEDITOR=cat hg --config ui.patch='python ../dummypatch.py' --cwd b import --edit ../exported-tip.patch | 67 $ HGEDITOR=cat hg --config ui.patch='$PYTHON ../dummypatch.py' --cwd b import --edit ../exported-tip.patch |
| 68 applying ../exported-tip.patch | 68 applying ../exported-tip.patch |
| 69 second change | 69 second change |
| 70 | 70 |
| 71 | 71 |
| 72 HG: Enter commit message. Lines beginning with 'HG:' are removed. | 72 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
| 292 adding manifests | 292 adding manifests |
| 293 adding file changes | 293 adding file changes |
| 294 added 1 changesets with 2 changes to 2 files | 294 added 1 changesets with 2 changes to 2 files |
| 295 updating to branch default | 295 updating to branch default |
| 296 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 296 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 297 $ python mkmsg.py diffed-tip.patch msg.patch | 297 $ $PYTHON mkmsg.py diffed-tip.patch msg.patch |
| 298 $ hg --cwd b import ../msg.patch | 298 $ hg --cwd b import ../msg.patch |
| 299 applying ../msg.patch | 299 applying ../msg.patch |
| 300 $ hg --cwd b tip | grep email | 300 $ hg --cwd b tip | grep email |
| 301 user: email patcher | 301 user: email patcher |
| 302 summary: email patch | 302 summary: email patch |
| 354 adding manifests | 354 adding manifests |
| 355 adding file changes | 355 adding file changes |
| 356 added 1 changesets with 2 changes to 2 files | 356 added 1 changesets with 2 changes to 2 files |
| 357 updating to branch default | 357 updating to branch default |
| 358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 359 $ python mkmsg.py exported-tip.patch msg.patch | 359 $ $PYTHON mkmsg.py exported-tip.patch msg.patch |
| 360 $ cat msg.patch | hg --cwd b import - | 360 $ cat msg.patch | hg --cwd b import - |
| 361 applying patch from stdin | 361 applying patch from stdin |
| 362 $ hg --cwd b tip | grep second | 362 $ hg --cwd b tip | grep second |
| 363 summary: second change | 363 summary: second change |
| 364 $ rm -r b | 364 $ rm -r b |
| 385 adding manifests | 385 adding manifests |
| 386 adding file changes | 386 adding file changes |
| 387 added 1 changesets with 2 changes to 2 files | 387 added 1 changesets with 2 changes to 2 files |
| 388 updating to branch default | 388 updating to branch default |
| 389 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 389 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 390 $ python mkmsg2.py diffed-tip.patch msg.patch | 390 $ $PYTHON mkmsg2.py diffed-tip.patch msg.patch |
| 391 $ cat msg.patch | hg --cwd b import - | 391 $ cat msg.patch | hg --cwd b import - |
| 392 applying patch from stdin | 392 applying patch from stdin |
| 393 $ hg --cwd b tip --template '{desc}\n' | 393 $ hg --cwd b tip --template '{desc}\n' |
| 394 email patch | 394 email patch |
| 395 | 395 |