projects
/
invirt/scripts/git-migration.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-migration updates for openais, corosync, xvm-host-setup-notes.
[invirt/scripts/git-migration.git]
/
rules.mako
diff --git
a/rules.mako
b/rules.mako
index
f04eccd
..
849321b
100644
(file)
--- a/
rules.mako
+++ b/
rules.mako
@@
-4,12
+4,13
@@
packages = svn['packages']
trunks = svn['trunks']
scripts = svn['scripts']
packages = svn['packages']
trunks = svn['trunks']
scripts = svn['scripts']
+ third = svn['third']
quashes = svn['quashes']
repos = ['packages/%s' % package for package in packages]
repos += ['scripts/%s' % script for script in scripts]
repos += ['doc/xvm', 'scripts/osx-update', 'scripts/install-invirt']
quashes = svn['quashes']
repos = ['packages/%s' % package for package in packages]
repos += ['scripts/%s' % script for script in scripts]
repos += ['doc/xvm', 'scripts/osx-update', 'scripts/install-invirt']
- repos += ['third']
+ repos += ['third/%s' % t for t in third]
for package in packages:
if 'merge' in packages[package]:
for package in packages:
if 'merge' in packages[package]:
@@
-25,7
+26,7
@@
return packages[package]['branch']
if 'merge' in packages[package]:
return get_branch(packages[package]['merge'])
return packages[package]['branch']
if 'merge' in packages[package]:
return get_branch(packages[package]['merge'])
- return 'master'
+ return 'prod'
def get_tag_prefix(package):
if 'merge' in packages[package]:
def get_tag_prefix(package):
if 'merge' in packages[package]:
@@
-65,7
+66,8
@@
end match
match /package_tags/${package}/([^/~]+)/${package}/
repository ${get_repo(package)}
match /package_tags/${package}/([^/~]+)/${package}/
repository ${get_repo(package)}
- branch tags/${get_tag_prefix(package)}\1
+ branch refs/tags/${get_tag_prefix(package)}\1
+ annotated true
max revision ${packages[package]['undouble'][0] - 1}
end match
max revision ${packages[package]['undouble'][0] - 1}
end match
@@
-91,9
+93,15
@@
match /trunk/packages/${package}/
% endif
end match
% endif
end match
+match /package_branches/${package}/([^/~]+)/
+ repository ${get_repo(package)}
+ branch ${get_tag_prefix(package)}\1
+end match
+
match /package_tags/${package}/([^/~]+)/
repository ${get_repo(package)}
match /package_tags/${package}/([^/~]+)/
repository ${get_repo(package)}
- branch tags/${get_tag_prefix(package)}\1
+ branch refs/tags/${get_tag_prefix(package)}\1
+ annotated true
% if 'undouble' in packages[package]:
min revision ${packages[package]['undouble'][1]}
% endif
% if 'undouble' in packages[package]:
min revision ${packages[package]['undouble'][1]}
% endif
@@
-101,7
+109,8
@@
end match
match /package_tags/${package}/([^/~]+)~([^/~]+)/
repository ${get_repo(package)}
match /package_tags/${package}/([^/~]+)~([^/~]+)/
repository ${get_repo(package)}
- branch tags/${get_tag_prefix(package)}\1_\2
+ branch refs/tags/${get_tag_prefix(package)}\1_\2
+ annotated true
% if 'undouble' in packages[package]:
min revision ${packages[package]['undouble'][1]}
% endif
% if 'undouble' in packages[package]:
min revision ${packages[package]['undouble'][1]}
% endif
@@
-165,12
+174,20
@@
match /trunk/scripts/
max revision 1863
end match
max revision 1863
end match
-match /trunk/third/
- repository third.git
+% for t in third:
+match /trunk/third/${t}/
+ repository third/${t}.git
branch master
end match
branch master
end match
-% for rev in [803, 804, 925, 926, 928, 1537, 1566]:
+match /third_tags/${t}/([^/~]+)/
+ repository third/${t}.git
+ branch refs/tags/\1
+ annotated true
+end match
+% endfor
+
+% for rev in [803, 804, 925, 926, 928, 1537, 1566, 3024]:
match /trunk/
repository doc/xvm.git
branch master
match /trunk/
repository doc/xvm.git
branch master