mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
7d8bebd9c1
# skip-blame because this was mechanically rewritten the following script. I
ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t
ones appear to be, and they run without addition failures on both Windows and
Linux.
import argparse
import os
import re
ap = argparse.ArgumentParser()
ap.add_argument('path', nargs='+')
opts = ap.parse_args()
globre = re.compile(r'^(.*) \(glob\)(.*)$')
for p in opts.path:
tmp = p + '.tmp'
with open(p, 'rb') as src, open(tmp, 'wb') as dst:
for line in src:
m = globre.match(line)
if not m or '$LOCALIP' in line or '*' in line:
dst.write(line)
continue
if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'):
dst.write(line)
continue
dst.write(m.group(1) + m.group(2) + '\n')
os.unlink(p)
os.rename(tmp, p)
208 lines
3.8 KiB
Perl
208 lines
3.8 KiB
Perl
$ cat >> $HGRCPATH<<EOF
|
|
> [extensions]
|
|
> rebase=
|
|
> drawdag=$TESTDIR/drawdag.py
|
|
> EOF
|
|
|
|
$ hg init non-merge
|
|
$ cd non-merge
|
|
$ hg debugdrawdag<<'EOS'
|
|
> F
|
|
> |
|
|
> E
|
|
> |
|
|
> D
|
|
> |
|
|
> B C
|
|
> |/
|
|
> A
|
|
> EOS
|
|
|
|
$ for i in C D E F; do
|
|
> hg bookmark -r $i -i BOOK-$i
|
|
> done
|
|
|
|
$ hg debugdrawdag<<'EOS'
|
|
> E
|
|
> |
|
|
> D
|
|
> |
|
|
> B
|
|
> EOS
|
|
|
|
$ hg log -G -T '{rev} {desc} {bookmarks}'
|
|
o 7 E
|
|
|
|
|
o 6 D
|
|
|
|
|
| o 5 F BOOK-F
|
|
| |
|
|
| o 4 E BOOK-E
|
|
| |
|
|
| o 3 D BOOK-D
|
|
| |
|
|
| o 2 C BOOK-C
|
|
| |
|
|
o | 1 B
|
|
|/
|
|
o 0 A
|
|
|
|
With --keep, bookmark should move
|
|
|
|
$ hg rebase -r 3+4 -d E --keep
|
|
rebasing 3:e7b3f00ed42e "D" (BOOK-D)
|
|
note: rebase of 3:e7b3f00ed42e created no changes to commit
|
|
rebasing 4:69a34c08022a "E" (BOOK-E)
|
|
note: rebase of 4:69a34c08022a created no changes to commit
|
|
$ hg log -G -T '{rev} {desc} {bookmarks}'
|
|
o 7 E BOOK-D BOOK-E
|
|
|
|
|
o 6 D
|
|
|
|
|
| o 5 F BOOK-F
|
|
| |
|
|
| o 4 E
|
|
| |
|
|
| o 3 D
|
|
| |
|
|
| o 2 C BOOK-C
|
|
| |
|
|
o | 1 B
|
|
|/
|
|
o 0 A
|
|
|
|
Move D and E back for the next test
|
|
|
|
$ hg bookmark BOOK-D -fqir 3
|
|
$ hg bookmark BOOK-E -fqir 4
|
|
|
|
Bookmark is usually an indication of a head. For changes that are introduced by
|
|
an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally
|
|
still introduced by an ancestor of changeset on B-NEW. In the below case,
|
|
"BOOK-D", and "BOOK-E" include changes introduced by "C".
|
|
|
|
$ hg rebase -s 2 -d E
|
|
rebasing 2:dc0947a82db8 "C" (BOOK-C C)
|
|
rebasing 3:e7b3f00ed42e "D" (BOOK-D)
|
|
note: rebase of 3:e7b3f00ed42e created no changes to commit
|
|
rebasing 4:69a34c08022a "E" (BOOK-E)
|
|
note: rebase of 4:69a34c08022a created no changes to commit
|
|
rebasing 5:6b2aeab91270 "F" (BOOK-F F)
|
|
saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
|
|
$ hg log -G -T '{rev} {desc} {bookmarks}'
|
|
o 5 F BOOK-F
|
|
|
|
|
o 4 C BOOK-C BOOK-D BOOK-E
|
|
|
|
|
o 3 E
|
|
|
|
|
o 2 D
|
|
|
|
|
o 1 B
|
|
|
|
|
o 0 A
|
|
|
|
Merge and its ancestors all become empty
|
|
|
|
$ hg init $TESTTMP/merge1
|
|
$ cd $TESTTMP/merge1
|
|
|
|
$ hg debugdrawdag<<'EOS'
|
|
> E
|
|
> /|
|
|
> B C D
|
|
> \|/
|
|
> A
|
|
> EOS
|
|
|
|
$ for i in C D E; do
|
|
> hg bookmark -r $i -i BOOK-$i
|
|
> done
|
|
|
|
$ hg debugdrawdag<<'EOS'
|
|
> H
|
|
> |
|
|
> D
|
|
> |
|
|
> C
|
|
> |
|
|
> B
|
|
> EOS
|
|
|
|
$ hg rebase -r '(A::)-(B::)-A' -d H
|
|
rebasing 2:dc0947a82db8 "C" (BOOK-C)
|
|
note: rebase of 2:dc0947a82db8 created no changes to commit
|
|
rebasing 3:b18e25de2cf5 "D" (BOOK-D)
|
|
note: rebase of 3:b18e25de2cf5 created no changes to commit
|
|
rebasing 4:86a1f6686812 "E" (BOOK-E E)
|
|
note: rebase of 4:86a1f6686812 created no changes to commit
|
|
saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
|
|
|
|
$ hg log -G -T '{rev} {desc} {bookmarks}'
|
|
o 4 H BOOK-C BOOK-D BOOK-E
|
|
|
|
|
o 3 D
|
|
|
|
|
o 2 C
|
|
|
|
|
o 1 B
|
|
|
|
|
o 0 A
|
|
|
|
Part of ancestors of a merge become empty
|
|
|
|
$ hg init $TESTTMP/merge2
|
|
$ cd $TESTTMP/merge2
|
|
|
|
$ hg debugdrawdag<<'EOS'
|
|
> G
|
|
> /|
|
|
> E F
|
|
> | |
|
|
> B C D
|
|
> \|/
|
|
> A
|
|
> EOS
|
|
|
|
$ for i in C D E F G; do
|
|
> hg bookmark -r $i -i BOOK-$i
|
|
> done
|
|
|
|
$ hg debugdrawdag<<'EOS'
|
|
> H
|
|
> |
|
|
> F
|
|
> |
|
|
> C
|
|
> |
|
|
> B
|
|
> EOS
|
|
|
|
$ hg rebase -r '(A::)-(B::)-A' -d H
|
|
rebasing 2:dc0947a82db8 "C" (BOOK-C)
|
|
note: rebase of 2:dc0947a82db8 created no changes to commit
|
|
rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
|
|
rebasing 4:03ca77807e91 "E" (BOOK-E E)
|
|
rebasing 5:ad6717a6a58e "F" (BOOK-F)
|
|
note: rebase of 5:ad6717a6a58e created no changes to commit
|
|
rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
|
|
saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
|
|
|
|
$ hg log -G -T '{rev} {desc} {bookmarks}'
|
|
o 7 G BOOK-G
|
|
|\
|
|
| o 6 E BOOK-E
|
|
| |
|
|
o | 5 D BOOK-D BOOK-F
|
|
|/
|
|
o 4 H BOOK-C
|
|
|
|
|
o 3 F
|
|
|
|
|
o 2 C
|
|
|
|
|
o 1 B
|
|
|
|
|
o 0 A
|
|
|