test-impexp-branch.t
73 lines
| 1.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-impexp-branch.t
|
r16475 | $ echo '[extensions]' >> $HGRCPATH | ||
|
r20115 | $ echo 'strip =' >> $HGRCPATH | ||
|
r16475 | |||
|
r12119 | $ cat >findbranch.py <<EOF | ||
> import re, sys | ||||
> | ||||
> head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') | ||||
> | ||||
> for line in sys.stdin: | ||||
> hmatch = head_re.match(line) | ||||
> if not hmatch: | ||||
> sys.exit(1) | ||||
> if hmatch.group(1) == 'Branch': | ||||
> sys.exit(0) | ||||
> sys.exit(1) | ||||
> EOF | ||||
|
r14126 | |||
|
r12119 | $ hg init a | ||
$ cd a | ||||
$ echo "Rev 1" >rev | ||||
$ hg add rev | ||||
$ hg commit -m "No branch." | ||||
$ hg branch abranch | ||||
marked working directory as branch abranch | ||||
|
r15615 | (branches are permanent and global, did you want a bookmark?) | ||
|
r12119 | $ echo "Rev 2" >rev | ||
$ hg commit -m "With branch." | ||||
|
r14126 | |||
$ hg export 0 > ../r0.patch | ||||
$ hg export 1 > ../r1.patch | ||||
$ cd .. | ||||
$ if python findbranch.py < r0.patch; then | ||||
|
r12119 | > echo "Export of default branch revision has Branch header" 1>&2 | ||
> exit 1 | ||||
> fi | ||||
|
r14126 | |||
$ if python findbranch.py < r1.patch; then | ||||
|
r12119 | > : # Do nothing | ||
> else | ||||
> echo "Export of branch revision is missing Branch header" 1>&2 | ||||
> exit 1 | ||||
> fi | ||||
Make sure import still works with branch information in patches. | ||||
$ hg init b | ||||
$ cd b | ||||
|
r14126 | $ hg import ../r0.patch | ||
applying ../r0.patch | ||||
$ hg import ../r1.patch | ||||
applying ../r1.patch | ||||
|
r12119 | $ cd .. | ||
|
r14126 | |||
$ hg init c | ||||
$ cd c | ||||
$ hg import --exact ../r0.patch | ||||
applying ../r0.patch | ||||
$ hg import --exact ../r1.patch | ||||
applying ../r1.patch | ||||
|
r16475 | |||
Test --exact and patch header separators (issue3356) | ||||
$ hg strip --no-backup . | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
>>> import re | ||||
>>> p = file('../r1.patch', 'rb').read() | ||||
>>> p = re.sub(r'Parent\s+', 'Parent ', p) | ||||
>>> file('../r1-ws.patch', 'wb').write(p) | ||||
$ hg import --exact ../r1-ws.patch | ||||
applying ../r1-ws.patch | ||||
|
r16913 | |||
$ cd .. | ||||