mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
fa1c4e5ebe
Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around.
74 lines
1.7 KiB
Perl
74 lines
1.7 KiB
Perl
$ echo '[extensions]' >> $HGRCPATH
|
|
$ echo 'mq =' >> $HGRCPATH
|
|
|
|
$ 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
|
|
|
|
$ 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
|
|
(branches are permanent and global, did you want a bookmark?)
|
|
$ echo "Rev 2" >rev
|
|
$ hg commit -m "With branch."
|
|
|
|
$ hg export 0 > ../r0.patch
|
|
$ hg export 1 > ../r1.patch
|
|
$ cd ..
|
|
|
|
$ if python findbranch.py < r0.patch; then
|
|
> echo "Export of default branch revision has Branch header" 1>&2
|
|
> exit 1
|
|
> fi
|
|
|
|
$ if python findbranch.py < r1.patch; then
|
|
> : # 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
|
|
$ hg import ../r0.patch
|
|
applying ../r0.patch
|
|
$ hg import ../r1.patch
|
|
applying ../r1.patch
|
|
$ cd ..
|
|
|
|
$ hg init c
|
|
$ cd c
|
|
$ hg import --exact ../r0.patch
|
|
applying ../r0.patch
|
|
$ hg import --exact ../r1.patch
|
|
applying ../r1.patch
|
|
|
|
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
|
|
|
|
$ cd ..
|