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)
35 lines
617 B
Perl
35 lines
617 B
Perl
https://bz.mercurial-scm.org/612
|
|
|
|
$ hg init
|
|
$ mkdir src
|
|
$ echo a > src/a.c
|
|
$ hg ci -Ama
|
|
adding src/a.c
|
|
|
|
$ hg mv src source
|
|
moving src/a.c to source/a.c
|
|
|
|
$ hg ci -Ammove
|
|
|
|
$ hg co -C 0
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo new > src/a.c
|
|
$ echo compiled > src/a.o
|
|
$ hg ci -mupdate
|
|
created new head
|
|
|
|
$ hg status
|
|
? src/a.o
|
|
|
|
$ hg merge
|
|
merging src/a.c and source/a.c to source/a.c
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg status
|
|
M source/a.c
|
|
R src/a.c
|
|
? src/a.o
|
|
|