mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +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)
44 lines
1.2 KiB
Perl
44 lines
1.2 KiB
Perl
https://bz.mercurial-scm.org/1502
|
|
|
|
Initialize repository
|
|
|
|
$ hg init foo
|
|
$ touch foo/a && hg -R foo commit -A -m "added a"
|
|
adding a
|
|
|
|
$ hg clone foo foo1
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
|
|
$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
|
|
$ hg -R foo1 pull
|
|
pulling from $TESTTMP/foo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 273d008d6e8e
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hg -R foo1 book branchy
|
|
$ hg -R foo1 book
|
|
* branchy 1:e3e522925eff
|
|
|
|
Pull. Bookmark should not jump to new head.
|
|
|
|
$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
|
|
$ hg -R foo1 pull
|
|
pulling from $TESTTMP/foo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 84a798d48b17
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hg -R foo1 book
|
|
* branchy 1:e3e522925eff
|