1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791
|
#!/usr/bin/python
#
# Copyright (c) 2012 Felipe Contreras
# Copyright (c) 2016 Mark Nauwelaerts
#
# Inspired by Rocco Rutte's hg-fast-export
# Just copy to your ~/bin, or anywhere in your $PATH.
# Then you can clone with:
# git clone hg::/path/to/mercurial/repo/
#
# For remote repositories a local clone is stored in
# "$GIT_DIR/hg/origin/clone/.hg/".
from mercurial import hg, ui, bookmarks, context, encoding
from mercurial import node, error, extensions, discovery, util, scmutil
from mercurial import changegroup
import re
import sys
import os
import json
import shutil
import subprocess
import urllib
import atexit
import urlparse
import hashlib
import time as ptime
#
# If you want to see Mercurial revisions as Git commit notes:
# git config core.notesRef refs/notes/hg
#
# If you are not in hg-git-compat mode and want to disable the tracking of
# named branches:
# git config --global remote-hg.track-branches false
#
# If you want the equivalent of hg's clone/pull--insecure option:
# git config --global remote-hg.insecure true
#
# If you want to switch to hg-git compatibility mode:
# git config --global remote-hg.hg-git-compat true
#
# git:
# Sensible defaults for git.
# hg bookmarks are exported as git branches, hg branches are prefixed
# with 'branches/', HEAD is a special case.
#
# hg:
# Emulate hg-git.
# Only hg bookmarks are exported as git branches.
# Commits are modified to preserve hg information and allow bidirectionality.
#
NAME_RE = re.compile('^([^<>]+)')
AUTHOR_RE = re.compile('^([^<>]+?)? ?[<>]([^<>]*)(?:$|>)')
EMAIL_RE = re.compile(r'([^ \t<>]+@[^ \t<>]+)')
AUTHOR_HG_RE = re.compile('^(.*?) ?<(.*?)(?:>(.*))?$')
RAW_AUTHOR_RE = re.compile('^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)')
VERSION = 2
def die(msg, *args):
sys.stderr.write('ERROR: %s\n' % (msg % args))
sys.exit(1)
def warn(msg, *args):
sys.stderr.write('WARNING: %s\n' % (msg % args))
def gitmode(flags):
return 'l' in flags and '120000' or 'x' in flags and '100755' or '100644'
def gittz(tz):
return '%+03d%02d' % (-tz / 3600, -tz % 3600 / 60)
def hgmode(mode):
m = { '100755': 'x', '120000': 'l' }
return m.get(mode, '')
def hghex(n):
return node.hex(n)
def hgbin(n):
return node.bin(n)
def hgref(ref):
return ref.replace('___', ' ')
def gitref(ref):
return ref.replace(' ', '___')
def check_version(*check):
if not hg_version:
return True
return hg_version >= check
def get_config(config, getall=False):
cmd = ['git', 'config', '--get' if not getall else '--get-all', config]
process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
output, _ = process.communicate()
return output
def get_config_bool(config, default=False):
value = get_config(config).rstrip('\n')
if value == "true":
return True
elif value == "false":
return False
else:
return default
def rev_parse(rev):
cmd = ['git', 'rev-parse', '--verify', '-q', rev]
process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
output, _ = process.communicate()
return output
def get_rev_hg(commit):
cmd = ['git', 'notes', '--ref', 'refs/notes/hg', 'show', commit]
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
hgrev, _ = process.communicate()
return hgrev
class Marks:
def __init__(self, path, repo):
self.path = path
self.repo = repo
self.clear()
self.load()
if self.version < VERSION:
if self.version == 1:
self.upgrade_one()
# upgraded?
if self.version < VERSION:
self.clear()
self.version = VERSION
def clear(self):
self.tips = {}
self.marks = {}
self.rev_marks = {}
self.last_mark = 0
self.version = 0
self.last_note = 0
def load(self):
if not os.path.exists(self.path):
return
tmp = json.load(open(self.path))
self.tips = []
self.marks = tmp['marks']
self.last_mark = tmp['last-mark']
self.version = tmp.get('version', 1)
self.last_note = 0
for rev, mark in self.marks.iteritems():
self.rev_marks[mark] = rev
def upgrade_one(self):
def get_id(rev):
return hghex(self.repo.changelog.node(int(rev)))
self.tips = dict((name, get_id(rev)) for name, rev in self.tips.iteritems())
self.marks = dict((get_id(rev), mark) for rev, mark in self.marks.iteritems())
self.rev_marks = dict((mark, get_id(rev)) for mark, rev in self.rev_marks.iteritems())
self.version = 2
def dict(self):
return { 'tips': self.tips, 'marks': self.marks,
'last-mark': self.last_mark, 'version': self.version,
'last-note': self.last_note }
def store(self):
json.dump(self.dict(), open(self.path, 'w'))
def __str__(self):
return str(self.dict())
def from_rev(self, rev):
return self.marks[rev]
def to_rev(self, mark):
return str(self.rev_marks[mark])
def next_mark(self):
self.last_mark += 1
return self.last_mark
def get_mark(self, rev):
self.last_mark += 1
self.marks[rev] = self.last_mark
return self.last_mark
def new_mark(self, rev, mark):
self.marks[rev] = mark
self.rev_marks[mark] = rev
self.last_mark = mark
def is_marked(self, rev):
return rev in self.marks
class ParserContext:
def __init__(self):
# known context attributes
self.localref = None
self.remoteref = None
self.gitmarks = None
self.hghelper = None
self.revs = []
class Parser:
def __init__(self, repo, cmdstream=sys.stdin, ctx=ParserContext()):
self.repo = repo
self.cmdstream = cmdstream
self.line = self.get_line()
self.context = ctx
def get_line(self):
return self.cmdstream.readline().strip()
def __getitem__(self, i):
return self.line.split()[i]
def check(self, word):
return self.line.startswith(word)
def each_block(self, separator):
while self.line != separator:
yield self.line
self.line = self.get_line()
def __iter__(self):
return self.each_block('')
def next(self):
self.line = self.get_line()
if self.line == 'done':
self.line = None
def get_mark(self):
i = self.line.index(':') + 1
return int(self.line[i:])
def get_data(self):
if not self.check('data'):
return None
i = self.line.index(' ') + 1
size = int(self.line[i:])
return self.cmdstream.read(size)
def get_author(self):
ex = None
m = RAW_AUTHOR_RE.match(self.line)
if not m:
return None
_, name, email, date, tz = m.groups()
if name and 'ext:' in name:
m = re.match('^(.+?) ext:\((.+)\)$', name)
if m:
name = m.group(1)
ex = urllib.unquote(m.group(2))
if email != bad_mail:
if name:
user = '%s <%s>' % (name, email)
else:
user = '<%s>' % (email)
else:
user = name
if ex:
user += ex
tz = int(tz)
tz = ((tz / 100) * 3600) + ((tz % 100) * 60)
return (user, int(date), -tz)
def fix_file_path(path):
path = os.path.normpath(path)
if not os.path.isabs(path):
return path
return os.path.relpath(path, '/')
def export_files(files):
final = []
for f in files:
fid = node.hex(f.filenode())
if fid in filenodes:
mark = filenodes[fid]
else:
mark = marks.next_mark()
filenodes[fid] = mark
d = f.data()
print "blob"
print "mark :%u" % mark
print "data %d" % len(d)
print d
path = fix_file_path(f.path())
final.append((gitmode(f.flags()), mark, path))
return final
def get_filechanges(repo, ctx, parent):
modified = set()
added = set()
removed = set()
# load earliest manifest first for caching reasons
prev = parent.manifest().copy()
cur = ctx.manifest()
for fn in cur:
if fn in prev:
if (cur.flags(fn) != prev.flags(fn) or cur[fn] != prev[fn]):
modified.add(fn)
del prev[fn]
else:
added.add(fn)
removed |= set(prev.keys())
return added | modified, removed
def fixup_user_git(user):
name = mail = None
global remove_username_quotes
if remove_username_quotes:
user = user.replace('"', '')
m = AUTHOR_RE.match(user)
if m:
name = m.group(1)
mail = m.group(2).strip()
else:
m = EMAIL_RE.match(user)
if m:
mail = m.group(1)
else:
m = NAME_RE.match(user)
if m:
name = m.group(1).strip()
return (name, mail)
def fixup_user_hg(user):
def sanitize(name):
# stole this from hg-git
return re.sub('[<>\n]', '?', name.lstrip('< ').rstrip('> '))
m = AUTHOR_HG_RE.match(user)
if m:
name = sanitize(m.group(1))
mail = sanitize(m.group(2))
ex = m.group(3)
if ex:
name += ' ext:(' + urllib.quote(ex) + ')'
else:
name = sanitize(user)
if '@' in user:
mail = name
else:
mail = None
return (name, mail)
def fixup_user(user):
if mode == 'git':
name, mail = fixup_user_git(user)
else:
name, mail = fixup_user_hg(user)
if not name:
name = bad_name
if not mail:
mail = bad_mail
return '%s <%s>' % (name, mail)
def updatebookmarks(repo, peer):
remotemarks = peer.listkeys('bookmarks')
# delete bookmarks locally that disappeared on remote
localmarks = bookmarks.listbookmarks(repo)
remote = set(remotemarks.keys())
local = set(localmarks.keys())
for bmark in local - remote:
bookmarks.pushbookmark(repo, bmark, localmarks[bmark], '')
# also delete private ref
pbookmark = '%s/bookmarks/%s' % (prefix, bmark)
subprocess.call(['git', 'update-ref', '-d', pbookmark])
# now add or update remote bookmarks to local, if any
localmarks = repo._bookmarks
if not remotemarks:
return
# use a higher level API from now on than the lower one below
if check_version(4,6):
for k, v in remotemarks.iteritems():
old = hghex(localmarks.get(k, ''))
bookmarks.pushbookmark(repo, k, old, v)
return
for k, v in remotemarks.iteritems():
localmarks[k] = hgbin(v)
if check_version(3, 6):
lock = tr = None
try:
lock = repo.lock()
tr = repo.transaction('bookmark')
localmarks.recordchange(tr)
tr.close()
finally:
if tr is not None:
tr.release()
if lock is not None:
lock.release()
else:
if hasattr(localmarks, 'write'):
localmarks.write()
else:
bookmarks.write(repo)
def get_repo(url, alias):
global peer
if hasattr(ui.ui, 'load'):
myui = ui.ui.load()
else:
myui = ui.ui()
myui.setconfig('ui', 'interactive', 'off')
myui.fout = sys.stderr
if get_config_bool('remote-hg.insecure'):
myui.setconfig('web', 'cacerts', '')
extensions.loadall(myui)
if hg.islocal(url) and not os.environ.get('GIT_REMOTE_HG_TEST_REMOTE'):
repo = hg.repository(myui, url)
if not os.path.exists(dirname):
os.makedirs(dirname)
else:
shared_path = os.path.join(gitdir, 'hg')
# check and upgrade old organization
hg_path = os.path.join(shared_path, '.hg')
if os.path.exists(shared_path) and not os.path.exists(hg_path):
repos = os.listdir(shared_path)
for x in repos:
local_hg = os.path.join(shared_path, x, 'clone', '.hg')
if not os.path.exists(local_hg):
continue
if not os.path.exists(hg_path):
shutil.move(local_hg, hg_path)
shutil.rmtree(os.path.join(shared_path, x, 'clone'))
# setup shared repo (if not there)
try:
hg.peer(myui, {}, shared_path, create=True)
except error.RepoError:
pass
if not os.path.exists(dirname):
os.makedirs(dirname)
local_path = os.path.join(dirname, 'clone')
if not os.path.exists(local_path):
hg.share(myui, shared_path, local_path, update=False)
else:
# make sure the shared path is always up-to-date
util.writefile(os.path.join(local_path, '.hg', 'sharedpath'), hg_path)
repo = hg.repository(myui, local_path)
try:
peer = hg.peer(repo.ui, {}, url)
except:
die('Repository error')
if check_version(3, 0):
from mercurial import exchange
exchange.pull(repo, peer, heads=None, force=True)
else:
repo.pull(peer, heads=None, force=True)
updatebookmarks(repo, peer)
return repo
def rev_to_mark(rev):
return marks.from_rev(rev.hex())
def mark_to_rev(mark):
return marks.to_rev(mark)
# Walk backwards from revision b to determine which need importing
# For repos with many heads (and loooots of tagging) this walk should
# end as soon as possible, so use all the known revisions are negative.
def revwalk(repo, name, b):
positive = []
pending = set()
if not marks.is_marked(b.hex()):
pending.add(b.rev())
interval = b.rev() / 10
interval = interval if interval > 1000 else 1000
for cur in xrange(b.rev(), -1, -1):
if not pending:
break
if cur in pending:
positive.append(cur)
pending.remove(cur)
parents = [p for p in repo.changelog.parentrevs(cur) if p >= 0]
for p in parents:
if not marks.is_marked(repo[p].hex()):
pending.add(p)
if cur % interval == 0:
print "progress revision walk '%s' (%d/%d)" % (name, (b.rev() - cur), b.rev())
positive.reverse()
return positive
def export_ref(repo, name, kind, head):
ename = '%s/%s' % (kind, name)
revs = revwalk(repo, ename, head)
total = len(revs)
for progress, rev in enumerate(revs):
c = repo[rev]
node = c.node()
(manifest, user, (time, tz), files, desc, extra) = repo.changelog.read(node)
rev_branch = extra['branch']
author = "%s %d %s" % (fixup_user(user), time, gittz(tz))
if 'committer' in extra:
try:
cuser, ctime, ctz = extra['committer'].rsplit(' ', 2)
committer = "%s %s %s" % (fixup_user(cuser), ctime, gittz(int(ctz)))
except ValueError:
cuser = extra['committer']
committer = "%s %d %s" % (fixup_user(cuser), time, gittz(tz))
else:
committer = author
parents = [repo[p] for p in repo.changelog.parentrevs(rev) if p >= 0]
if len(parents) == 0:
modified = c.manifest().keys()
removed = []
else:
modified, removed = get_filechanges(repo, c, parents[0])
desc += '\n'
if mode == 'hg':
extra_msg = ''
if rev_branch != 'default':
extra_msg += 'branch : %s\n' % rev_branch
renames = []
for f in c.files():
if f not in c.manifest():
continue
rename = c.filectx(f).renamed()
if rename:
renames.append((rename[0], f))
for e in renames:
extra_msg += "rename : %s => %s\n" % e
for key, value in extra.iteritems():
if key in ('author', 'committer', 'encoding', 'message', 'branch', 'hg-git'):
continue
else:
extra_msg += "extra : %s : %s\n" % (key, urllib.quote(value))
if extra_msg:
desc += '\n--HG--\n' + extra_msg
if len(parents) == 0:
print 'reset %s/%s' % (prefix, ename)
modified_final = export_files(c.filectx(f) for f in modified)
print "commit %s/%s" % (prefix, ename)
print "mark :%d" % (marks.get_mark(c.hex()))
print "author %s" % (author)
print "committer %s" % (committer)
print "data %d" % (len(desc))
print desc
if len(parents) > 0:
print "from :%s" % (rev_to_mark(parents[0]))
if len(parents) > 1:
print "merge :%s" % (rev_to_mark(parents[1]))
for f in removed:
print "D %s" % (fix_file_path(f))
for f in modified_final:
print "M %s :%u %s" % f
print
if (progress % 100 == 0):
print "progress revision %d '%s' (%d/%d)" % (rev, name, progress, total)
# make sure the ref is updated
print "reset %s/%s" % (prefix, ename)
print "from :%u" % rev_to_mark(head)
print
pending_revs = set(revs) - notes
if pending_revs:
desc = "Notes for %s\n" % (name)
update_notes([repo[rev].hex() for rev in pending_revs], desc, False)
notes.update(pending_revs)
def export_tag(repo, tag):
export_ref(repo, tag, 'tags', scmutil.revsingle(repo, hgref(tag)))
def export_bookmark(repo, bmark):
head = bmarks[hgref(bmark)]
export_ref(repo, bmark, 'bookmarks', head)
def export_branch(repo, branch):
tip = get_branch_tip(repo, branch)
head = repo[tip]
export_ref(repo, branch, 'branches', head)
def export_head(repo):
export_ref(repo, g_head[0], 'bookmarks', g_head[1])
def do_capabilities(parser):
print "import"
if capability_push:
print "push"
else:
print "export"
print "refspec refs/heads/branches/*:%s/branches/*" % prefix
print "refspec refs/heads/*:%s/bookmarks/*" % prefix
print "refspec refs/tags/*:%s/tags/*" % prefix
path = os.path.join(marksdir, 'marks-git')
if os.path.exists(path):
print "*import-marks %s" % path
print "*export-marks %s" % path
print "option"
# nothing really depends on the private refs being up to date
# (export is limited anyway by the current git marks)
# and they are not always updated correctly (dry-run, bookmark delete, ...)
# (might resolve some dry-run breakage also)
print "no-private-update"
print
def branch_tip(branch):
return branches[branch][-1]
def get_branch_tip(repo, branch):
heads = branches.get(hgref(branch), None)
if not heads:
return None
# verify there's only one head
if (len(heads) > 1):
warn("Branch '%s' has more than one head, consider merging" % branch)
return branch_tip(hgref(branch))
return heads[0]
def list_head(repo, cur):
global g_head, fake_bmark
if 'default' not in branches:
# empty repo
return
node = repo[branch_tip('default')]
head = 'master' if 'master' not in bmarks else 'default'
fake_bmark = head
bmarks[head] = node
head = gitref(head)
print "@refs/heads/%s HEAD" % head
g_head = (head, node)
def do_list(parser):
repo = parser.repo
for bmark, node in bookmarks.listbookmarks(repo).iteritems():
bmarks[bmark] = repo[node]
cur = repo.dirstate.branch()
orig = peer if peer else repo
for branch, heads in orig.branchmap().iteritems():
# only open heads
heads = [h for h in heads if 'close' not in repo.changelog.read(h)[5]]
if heads:
branches[branch] = heads
list_head(repo, cur)
ignore_ref = get_config('remote-hg.ignore-name', True)
ignore_re = []
for exp in ignore_ref.splitlines():
if exp:
try:
#warn("checking %s" % (
ignore_re.append(re.compile(exp.strip()))
except:
warn("Invalid regular expression '%s'" % (exp))
def ignore(kind, name):
for r in ignore_re:
if r.search(name):
warn("Ignoring matched %s %s" % (kind, name))
return True
return False
# for export command a ref's old_sha1 is taken from private namespace ref
# for push command a fake one is provided
# that avoids having the ref status reported as a new branch/tag
# (though it will be marked as FETCH_FIRST prior to push,
# but that's ok as we will provide proper status)
for_push = (parser.line.find('for-push') >= 0)
sha1 = 'f' * 40 if (capability_push and for_push) else '?'
if track_branches:
for branch in branches:
if not ignore('branch', branch):
print "%s refs/heads/branches/%s" % (sha1, gitref(branch))
for bmark in bmarks:
if bmarks[bmark].hex() == '0' * 40:
warn("Ignoring invalid bookmark '%s'", bmark)
elif not ignore('bookmark', bmark):
print "%s refs/heads/%s" % (sha1, gitref(bmark))
for tag, node in repo.tagslist():
if tag == 'tip':
continue
if not ignore('tag', tag):
print "%s refs/tags/%s" % (sha1, gitref(tag))
print
def do_import(parser):
repo = parser.repo
path = os.path.join(marksdir, 'marks-git')
print "feature done"
if os.path.exists(path):
print "feature import-marks=%s" % path
print "feature export-marks=%s" % path
print "feature force"
sys.stdout.flush()
tmp = encoding.encoding
encoding.encoding = 'utf-8'
# lets get all the import lines
while parser.check('import'):
ref = parser[1]
if (ref == 'HEAD'):
export_head(repo)
elif ref.startswith('refs/heads/branches/'):
branch = ref[len('refs/heads/branches/'):]
export_branch(repo, branch)
elif ref.startswith('refs/heads/'):
bmark = ref[len('refs/heads/'):]
export_bookmark(repo, bmark)
elif ref.startswith('refs/tags/'):
tag = ref[len('refs/tags/'):]
export_tag(repo, tag)
parser.next()
encoding.encoding = tmp
print 'done'
def parse_blob(parser):
parser.next()
mark = parser.get_mark()
parser.next()
data = parser.get_data()
blob_marks[mark] = data
parser.next()
def get_file_metadata(repo, p1, files):
for e in files:
f = files[e]
if 'rename' in f and 'mode' not in f:
old = f['rename']
ctx = repo[p1][old]
f['mode'] = ctx.flags()
f['data'] = ctx.data()
def get_merge_files(repo, p1, p2, files):
for e in repo[p1].files():
if e not in files:
if e not in repo[p1].manifest():
continue
f = { 'ctx': repo[p1][e] }
files[e] = f
def split_line_pathnames(line):
if line[2] != '"':
return line.split(' ', 2)
else:
t = line[0]
p = 3
while p >= 0:
if line[p] == '"' and line[p - 1] != '\\':
return line[0], line[2:p+1], line[p+2:]
p = line.find('"', p + 1)
# hm, should not happen
die('Malformed file command: %s' % (line))
def c_style_unescape(string):
if string[0] == string[-1] == '"':
return string.decode('string-escape')[1:-1]
return string
# sigh; handle context creation for various (incompatible) versions
def make_memfilectx(repo, memctx, path, data, is_link, is_exec, *args):
if check_version(4, 5):
return context.memfilectx(repo, memctx, path, data, is_link, is_exec, *args)
if check_version(3, 1):
return context.memfilectx(repo, path, data, is_link, is_exec, *args)
else:
return context.memfilectx(path, data, is_link, is_exec, *args)
def parse_commit(parser):
from_mark = merge_mark = None
remoteref = parser.context.remoteref
ref = parser[1] if not remoteref else remoteref
parser.next()
commit_mark = parser.get_mark()
parser.next()
author = parser.get_author()
parser.next()
committer = parser.get_author()
parser.next()
data = parser.get_data()
parser.next()
if parser.check('from'):
from_mark = parser.get_mark()
parser.next()
if parser.check('merge'):
merge_mark = parser.get_mark()
parser.next()
if parser.check('merge'):
die('octopus merges are not supported yet')
# fast-export adds an extra newline
if data[-1] == '\n':
data = data[:-1]
files = {}
for line in parser:
if parser.check('M'):
t, m, mark_ref, path = line.split(' ', 3)
if m == '160000':
# This is a submodule -- there is no reasonable
# way to import it.
blob_data = "[git-remote-hg: skipped import of submodule at %s]" % mark_ref
else:
mark = int(mark_ref[1:])
blob_data = blob_marks[mark]
f = { 'mode': hgmode(m), 'data': blob_data }
elif parser.check('D'):
t, path = line.split(' ', 1)
f = { 'deleted': True }
elif parser.check('R'):
t, old, path = split_line_pathnames(line)
old = c_style_unescape(old)
f = { 'rename': old }
# also mark old deleted
files[old] = { 'deleted': True }
elif parser.check('C'):
t, old, path = split_line_pathnames(line)
f = { 'rename': c_style_unescape(old) }
else:
die('Unknown file command: %s' % line)
path = c_style_unescape(path)
files[path] = files.get(path, {})
files[path].update(f)
# only export the commits if we are on an internal proxy repo
if dry_run and not peer:
parsed_refs[ref] = None
return
# check if this is an hg commit we have in some other repo
gitmarks = parser.context.gitmarks
if gitmarks:
gitcommit = gitmarks.to_rev(commit_mark)
hgrev = get_rev_hg(gitcommit)
if hgrev:
hghelper = parser.context.hghelper
if not hghelper:
print "error %s rejected not pushing hg based commit %s" % (ref, gitcommit)
raise UserWarning("check-hg-commits")
# must be in some local repo
# find it and push it to the target local repo
# (rather than making a commit into it)
# probably not already in target repo, but let's make sure
if hgrev not in parser.repo:
srepo = hghelper.githgrepo.find_hg_repo(hgrev)
if not srepo:
# pretty bad, if identified as hg revision, we should have it somewhere
# but is possible if the originating repo has been removed now
# warn elaborately and fail given the current settings
description = "\n" \
"commit %s corresponds \nto hg revision %s,\n" \
"but could not find latter in any fetched hg repo.\n" \
"Please resolve the inconsistency or disable pushing hg commits" \
% (gitcommit, hgrev)
die(description)
warn('Pushing hg changeset %s for %s' % (hgrev, gitcommit))
# target is local repo so should have a root
# force push since otherwise forcibly commit anyway
# (and needed for multiple head case etc)
push(srepo, hg.peer(srepo.ui, {}, parser.repo.root), [hgbin(hgrev)], True)
else:
# could already be present, particularly in shared proxy repo
warn('Using hg changeset %s for %s' % (hgrev, gitcommit))
# track mark and are done here
parsed_refs[ref] = hgrev
marks.new_mark(hgrev, commit_mark)
return
def getfilectx(repo, memctx, f):
of = files[f]
if 'deleted' in of:
if check_version(3, 2):
return None
else:
raise IOError
if 'ctx' in of:
if mode == 'hg':
ctx = of['ctx']
is_exec = ctx.isexec()
is_link = ctx.islink()
return make_memfilectx(repo, memctx, f, ctx.data(), is_link, is_exec)
else:
return of['ctx']
is_exec = of['mode'] == 'x'
is_link = of['mode'] == 'l'
rename = of.get('rename', None)
return make_memfilectx(repo, memctx, f, of['data'], is_link, is_exec, rename)
repo = parser.repo
user, date, tz = author
extra = {}
if committer != author:
extra['committer'] = "%s %u %u" % committer
if from_mark:
p1 = mark_to_rev(from_mark)
else:
p1 = '0' * 40
if merge_mark:
p2 = mark_to_rev(merge_mark)
else:
p2 = '0' * 40
#
# If files changed from any of the parents, hg wants to know, but in git if
# nothing changed from the first parent, nothing changed.
#
if merge_mark:
get_merge_files(repo, p1, p2, files)
# need to obtain file metadata for copied and renamed files that have
# no filemodify line; let's get that from the old file in parent revision
if from_mark:
get_file_metadata(repo, p1, files)
# Check if the ref is supposed to be a named branch
if ref.startswith('refs/heads/branches/'):
branch = ref[len('refs/heads/branches/'):]
extra['branch'] = hgref(branch)
if mode == 'hg':
i = data.find('\n--HG--\n')
if i >= 0:
tmp = data[i + len('\n--HG--\n'):].strip()
for k, v in [e.split(' : ', 1) for e in tmp.split('\n')]:
if k == 'rename':
old, new = v.split(' => ', 1)
files[new]['rename'] = old
elif k == 'branch':
extra[k] = v
elif k == 'extra':
ek, ev = v.split(' : ', 1)
extra[ek] = urllib.unquote(ev)
data = data[:i]
ctx = context.memctx(repo, (p1, p2), data,
files.keys(), getfilectx,
user, (date, tz), extra)
tmp = encoding.encoding
encoding.encoding = 'utf-8'
node = hghex(repo.commitctx(ctx))
encoding.encoding = tmp
parsed_refs[ref] = node
marks.new_mark(node, commit_mark)
parser.context.revs.append(node)
def parse_reset(parser):
remoteref = parser.context.remoteref
ref = parser[1] if not remoteref else remoteref
parser.next()
# ugh
if parser.check('commit'):
parse_commit(parser)
return
if not parser.check('from'):
return
from_mark = parser.get_mark()
parser.next()
try:
rev = mark_to_rev(from_mark)
except KeyError:
rev = None
parsed_refs[ref] = rev
def parse_tag(parser):
name = parser[1]
parser.next()
from_mark = parser.get_mark()
parser.next()
tagger = parser.get_author()
parser.next()
data = parser.get_data()
parser.next()
parsed_tags[name] = (tagger, data)
def write_tag(repo, tag, node, msg, author):
branch = repo[node].branch()
tip = branch_tip(branch)
tip = repo[tip]
def getfilectx(repo, memctx, f):
try:
fctx = tip.filectx(f)
data = fctx.data()
except error.ManifestLookupError:
data = ""
content = data + "%s %s\n" % (node, tag)
return make_memfilectx(repo, memctx, f, content, False, False, None)
p1 = tip.hex()
p2 = '0' * 40
if author:
user, date, tz = author
date_tz = (date, tz)
else:
cmd = ['git', 'var', 'GIT_COMMITTER_IDENT']
process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
output, _ = process.communicate()
m = re.match('^.* <.*>', output)
if m:
user = m.group(0)
else:
user = repo.ui.username()
date_tz = None
ctx = context.memctx(repo, (p1, p2), msg,
['.hgtags'], getfilectx,
user, date_tz, {'branch': branch})
tmp = encoding.encoding
encoding.encoding = 'utf-8'
tagnode = repo.commitctx(ctx)
encoding.encoding = tmp
return (tagnode, branch)
def checkheads_bmark(repo, ref, ctx, force):
bmark = ref[len('refs/heads/'):]
if bmark not in bmarks:
# new bmark
return True
ctx_old = bmarks[bmark]
ctx_new = ctx
if not ctx.rev():
print "error %s unknown" % ref
return False
# replaced around Mercurial 4.7
isancestor = repo.changelog.isancestorrev if hasattr(repo.changelog, 'isancestorrev') \
else repo.changelog.descendant
if not isancestor(ctx_old.rev(), ctx_new.rev()):
if force:
print "ok %s forced update" % ref
else:
print "error %s non-fast forward" % ref
return False
return True
def checkheads(repo, remote, p_revs, force):
remotemap = remote.branchmap()
if not remotemap:
# empty repo
return True
new = {}
ret = True
for node, ref in p_revs.iteritems():
ctx = repo[node]
branch = ctx.branch()
if branch not in remotemap:
# new branch
continue
if not ref.startswith('refs/heads/branches'):
if ref.startswith('refs/heads/'):
if not checkheads_bmark(repo, ref, ctx, force):
ret = False
# only check branches
continue
new.setdefault(branch, []).append(ctx.rev())
for branch, heads in new.iteritems():
old = [repo.changelog.rev(x) for x in remotemap[branch]]
for rev in heads:
if check_version(2, 3):
ancestors = repo.changelog.ancestors([rev], stoprev=min(old))
else:
ancestors = repo.changelog.ancestors(rev)
found = False
for x in old:
if x in ancestors:
found = True
break
if found:
continue
node = repo.changelog.node(rev)
ref = p_revs[node]
if force:
print "ok %s forced update" % ref
else:
print "error %s non-fast forward" % ref
ret = False
return ret
def push_unsafe(repo, remote, p_revs, force):
fci = discovery.findcommonincoming
commoninc = fci(repo, remote, force=force)
common, _, remoteheads = commoninc
fco = discovery.findcommonoutgoing
outgoing = fco(repo, remote, onlyheads=list(p_revs), commoninc=commoninc, force=force)
# nice to know about this rather than assume a bogus error
# also, some remote peertypes might otherwise be surprised further down
if not outgoing.missing:
return None
if check_version(4, 0):
if hasattr(changegroup, 'getlocalchangegroup'):
cg = changegroup.getlocalchangegroup(repo, 'push', outgoing)
else:
# as of about version 4.4
cg = changegroup.makechangegroup(repo, outgoing, '01', 'push')
elif check_version(3, 2):
cg = changegroup.getchangegroup(repo, 'push', heads=list(p_revs), common=common)
elif check_version(3, 0):
cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common)
else:
cg = repo.getbundle('push', heads=list(p_revs), common=common)
unbundle = remote.capable('unbundle')
if unbundle:
if force:
remoteheads = ['force']
ret = remote.unbundle(cg, remoteheads, 'push')
else:
ret = remote.addchangegroup(cg, 'push', repo.url())
phases = remote.listkeys('phases')
if phases:
for head in p_revs:
# update to public
remote.pushkey('phases', hghex(head), '1', '0')
return ret
def push(repo, remote, p_revs, force):
if hasattr(remote, 'canpush') and not remote.canpush():
print "error cannot push"
if not p_revs:
# nothing to push
return
lock = None
unbundle = remote.capable('unbundle')
if not unbundle:
lock = remote.lock()
try:
ret = push_unsafe(repo, remote, p_revs, force)
finally:
if lock is not None:
lock.release()
return ret
def do_export(parser):
do_push_hg(parser)
print
def do_push_hg(parser):
global parsed_refs, parsed_tags
p_bmarks = []
p_revs = {}
parsed_refs = {}
parsed_tags = {}
parser.next()
remoteref = parser.context.remoteref
if remoteref and not parser.line:
# if remoteref is in past exported
# git-fast-export might not produce anything at all
# that is ok'ish, we will determine parsed_ref another way
localref = parser.context.localref
hgrev = get_rev_hg(localref)
if not hgrev:
# maybe the notes are not updated
# happens only on fetch for now ... let's ask for that
print "error %s fetch first" % remoteref
return False
parsed_refs[remoteref] = hgrev
# now make parser happy
parser.line = 'done'
for line in parser.each_block('done'):
if parser.check('blob'):
parse_blob(parser)
elif parser.check('commit'):
parse_commit(parser)
elif parser.check('reset'):
parse_reset(parser)
elif parser.check('tag'):
parse_tag(parser)
elif parser.check('feature'):
pass
else:
die('unhandled export command: %s' % line)
for ref, node in parsed_refs.iteritems():
bnode = hgbin(node) if node else None
if ref.startswith('refs/heads/branches'):
branch = ref[len('refs/heads/branches/'):]
if branch in branches and bnode in branches[branch]:
# up to date
print "ok %s up to date" % ref
continue
p_revs[bnode] = ref
print "ok %s" % ref
elif ref.startswith('refs/heads/'):
bmark = ref[len('refs/heads/'):]
new = node
old = bmarks[bmark].hex() if bmark in bmarks else ''
if old == new:
print "ok %s up to date" % ref
continue
print "ok %s" % ref
if bmark != fake_bmark and \
not (bmark == 'master' and bmark not in parser.repo._bookmarks):
p_bmarks.append((ref, bmark, old, new))
p_revs[bnode] = ref
elif ref.startswith('refs/tags/'):
if dry_run:
print "ok %s" % ref
continue
tag = ref[len('refs/tags/'):]
tag = hgref(tag)
author, msg = parsed_tags.get(tag, (None, None))
if mode == 'git':
if not msg:
msg = 'Added tag %s for changeset %s' % (tag, node[:12])
tagnode, branch = write_tag(parser.repo, tag, node, msg, author)
p_revs[tagnode] = 'refs/heads/branches/' + gitref(branch)
else:
if hasattr(parser.repo, 'opener'):
fp = parser.repo.opener('localtags', 'a')
else:
try:
fp = parser.repo.vfs('localtags', 'r+')
except IOError:
fp = parser.repo.vfs('localtags', 'a')
fp.write('%s %s\n' % (node, tag))
fp.close()
p_revs[bnode] = ref
print "ok %s" % ref
else:
# transport-helper/fast-export bugs
continue
if dry_run:
if peer and not force_push:
checkheads(parser.repo, peer, p_revs, force_push)
return
success = True
if peer:
if not checkheads(parser.repo, peer, p_revs, force_push):
return False
ret = push(parser.repo, peer, p_revs, force_push)
# None ok: nothing to push
if ret != None and not ret:
# do not update bookmarks
return
# update remote bookmarks
remote_bmarks = peer.listkeys('bookmarks')
for ref, bmark, old, new in p_bmarks:
if force_push:
old = remote_bmarks.get(bmark, '')
if not peer.pushkey('bookmarks', bmark, old, new):
success = False
print "error %s" % ref
else:
# update local bookmarks
for ref, bmark, old, new in p_bmarks:
if not bookmarks.pushbookmark(parser.repo, bmark, old, new):
success = False
print "error %s" % ref
return success
def delete_bookmark(parser, ref):
bmark = ref[len('refs/heads/'):]
if bmark == fake_bmark:
return False
# delete local (proxy or target)
old = bmarks[bmark].hex() if bmark in bmarks else ''
if not old:
return False
ok = False
if old:
ok = bookmarks.pushbookmark(parser.repo, bmark, old, '')
# propagate to peer if appropriate
if ok and peer:
remote_bmarks = peer.listkeys('bookmarks')
old = remote_bmarks.get(bmark, '')
ok = peer.pushkey('bookmarks', bmark, old, '')
# delete private ref
if ok:
pbookmark = '%s/heads/%s' % (prefix, bmark)
subprocess.call(['git', 'update-ref', '-d', pbookmark])
return ok
def do_push_refspec(parser, refspec, revs):
global force_push
force = (refspec[0] == '+')
refs = refspec.strip('+').split(':')
# check for delete
if (not refs[0]) and refs[1].startswith('refs/heads') and \
not refs[1].startswith('refs/heads/branches'):
if not dry_run and not delete_bookmark(parser, refs[1]):
print "error %s could not delete"% (refs[1])
else:
print "ok %s" % (refs[1])
return
# sanity check on remote ref
if not (refs[1].startswith('refs/heads') or refs[1].startswith('refs/tags')):
print "error %s refspec not supported " % refs[1]
return
ctx = ParserContext()
if refs[0] != refs[1]:
# would work and tag as requested, but pushing to a hg permanent branch
# based on a rename rather than a git branch is probably not a good idea
if refs[1].startswith('refs/heads/branches'):
print "error %s not allowed for permanent branch" % refs[1]
return
ctx.remoteref = refs[1]
ctx.localref = refs[0]
# ok, fire up git-fast-export and process it
cmd = ['git', 'fast-export', '--use-done-feature']
fast_export_options = get_config('remote-hg.fast-export-options')
if not fast_export_options:
fast_export_options = '-M -C'
cmd.extend(fast_export_options.strip().split())
marks = os.path.join(marksdir, 'marks-git')
if os.path.exists(marks):
cmd.append('--import-marks=%s' % marks)
# optionally reuse existing hg commits in local repos
check_hg_commits = get_config('remote-hg.check-hg-commits').strip()
use_hg_commits = check_hg_commits in ('fail', 'push')
# no commit of marks if dry_run
# and only commit if all went ok,
# otherwise some commits may no longer be exported next time/try around
tmpmarks = ''
if use_hg_commits or not dry_run:
tmpmarks = os.path.join(marksdir, 'marks-git-%d' % (os.getpid()))
cmd.append('--export-marks=%s' % tmpmarks)
cmd.append(refs[0])
# a parameter would obviously be nicer here ...
force_push = force
ok = False
tmpfastexport = None
try:
if use_hg_commits:
# we need the mapping from marks to commit
# so store the output first to a file (and marks get saved also),
# and then process that file
tmpfastexport = open(os.path.join(marksdir, 'git-fast-export-%d' % (os.getpid())), 'w+b')
subprocess.check_call(cmd, stdin=None, stdout=tmpfastexport)
try:
import imp
sys.dont_write_bytecode = True
ctx.hghelper = imp.load_source('hghelper', \
os.path.join(os.path.dirname(__file__), 'git-hg-helper'))
ctx.hghelper.init_git(gitdir)
ctx.gitmarks = ctx.hghelper.GitMarks(tmpmarks)
# let processing know it should not bother pushing if not requested
if check_hg_commits != 'push':
ctx.hghelper = None
except:
die("check-hg-commits setup failed; is git-hg-helper also installed?")
tmpfastexport.seek(0)
try:
nparser = Parser(parser.repo, tmpfastexport, ctx)
ok = do_push_hg(nparser)
except UserWarning:
ok = False
else:
# simply feed fast-export directly to processing
export = subprocess.Popen(cmd, stdin=None, stdout=subprocess.PIPE)
nparser = Parser(parser.repo, export.stdout, ctx)
ok = do_push_hg(nparser)
finally:
if tmpmarks and os.path.exists(tmpmarks):
if ok and not dry_run:
# the commits made it through, now we can commit
os.rename(tmpmarks, marks)
revs[:] = nparser.context.revs
else:
os.remove(tmpmarks)
if tmpfastexport and os.path.exists(tmpfastexport.name):
tmpfastexport.close()
os.remove(tmpfastexport.name)
def update_notes(revs, desc, run_import):
if not revs:
return
if run_import:
# spin up fast-import
gitmarks = os.path.join(marksdir, 'marks-git')
# marks should exist by now
# no export of marks since notes commits are not relevant
proc = subprocess.Popen(['git', 'fast-import', '--done', '--quiet',
'--import-marks=%s' % gitmarks], stdin=subprocess.PIPE, stdout=sys.stderr)
# now feed fast-import
dest = proc.stdin
else:
proc = None
dest = sys.stdout
note_mark = marks.next_mark()
ref = "refs/notes/hg"
dest.write("commit %s\n" % ref)
dest.write("mark :%d\n" % (note_mark))
dest.write("committer remote-hg <> %d %s\n" % (ptime.time(), gittz(ptime.timezone)))
dest.write("data %d\n" % (len(desc)))
dest.write(desc + '\n')
# continue incrementally on current notes branch (whenever possible)
# to avoid wiping out present content upon fetch of new repo
# but track along with the previous ref (e.g. as import goes along)
current_note = rev_parse(ref)
if current_note and not marks.last_note:
dest.write('from %s^0\n' % (ref))
elif marks.last_note:
dest.write('from :%u\n' % (marks.last_note))
for rev in revs:
dest.write("N inline :%u\n" % marks.from_rev(rev))
dest.write("data %d\n" % (len(rev)))
dest.write(rev + '\n')
dest.write('\n')
marks.last_note = note_mark
if proc:
dest.write('done\n')
dest.flush()
proc.wait()
# fail hard if this fails
# that prevents the marks file from being written
# so we can have a fresh look with a fetch
if proc.returncode:
die('notes update failed with return %d; recover with git fetch' %
(proc.returncode))
def do_push(parser):
if os.environ.get('GIT_REMOTE_HG_DEBUG_PUSH'):
dump = ''
for line in parser:
dump += line + '\n'
die('DEBUG push:\n%s' % (dump))
revs = []
for line in parser:
if parser.check('push'):
localrevs = []
do_push_refspec(parser, line.lstrip('push '), localrevs)
revs.extend(localrevs)
else:
die('unhandled push command: %s' % (line))
print
# at this stage, all external processes are done, marks files written
# so we can use those to update notes
# do so unconditionally because we can and should ....
update_notes(revs, "Update notes on push", True)
def do_option(parser):
global dry_run, force_push
_, key, value = parser.line.split(' ')
if key == 'dry-run':
dry_run = (value == 'true')
print 'ok'
elif key == 'force':
force_push = (value == 'true')
print 'ok'
else:
print 'unsupported'
def fix_path(alias, repo, orig_url):
url = urlparse.urlparse(orig_url, 'file')
if url.scheme != 'file' or os.path.isabs(os.path.expanduser(url.path)):
return
abs_url = urlparse.urljoin("%s/" % os.getcwd(), orig_url)
cmd = ['git', 'config', 'remote.%s.url' % alias, "hg::%s" % abs_url]
subprocess.call(cmd)
def select_private_refs(alias):
show_private_refs = get_config_bool('remote-hg.show-private-refs', False)
# selection is easy, but let's also clean the refs of the alternative
# in any case, will be recreated along the way as and when needed
if show_private_refs:
path = "%s/refs" % (dirname)
if os.path.exists(path):
shutil.rmtree(path, True)
# in refs space
return 'refs/hg/%s' % alias
else:
refs = subprocess.Popen(['git', 'for-each-ref', \
'--format=delete %(refname)', 'refs/hg'], stdout=subprocess.PIPE)
update = subprocess.Popen(['git', 'update-ref', '--stdin'], stdin=refs.stdout)
refs.stdout.close() # helps with SIGPIPE
update.communicate()
# keep private implementation refs really private
return 'hg/%s/refs' % alias
def select_marks_dir(alias, gitdir, migrate):
dirname = os.path.join(gitdir, 'hg', alias)
private_gm = os.path.join(dirname, 'marks-git')
shared_dir = os.path.join(gitdir, 'hg')
shared_gm = os.path.join(shared_dir, 'marks-git')
shared_hgm = os.path.join(shared_dir, 'marks-hg')
# not good in either case
if os.path.exists(private_gm) and os.path.exists(shared_gm):
die('found both %s and %s' % (private_gm, shared_gm))
# retrieve setting
shared_marks = get_config('remote-hg.shared-marks').strip()
# standardize to True, False or None
shared_marks = get_config_bool('remote-hg.shared-marks', False) \
if shared_marks else None
# if no specific setting, select one here (favouring shared for new installation)
if shared_marks == None:
# select one automagically, favouring shared for new installation
if os.path.exists(private_gm):
shared_marks = False
elif not os.path.exists(shared_gm) and os.path.exists(shared_dir):
# not a fresh clone, but no shared setup, so use private
shared_marks = False
else:
shared_marks = True
# only migrate with explicit setting
migrate = False
# otherwise, there is not much to decide
# but a migration from one setup to the other might be needed
l = os.listdir(shared_dir) if os.path.exists(shared_dir) and migrate else []
if shared_marks and migrate:
# make sure all local ones are cleaned up
# use one of these (preferably origin) to seed the shared
seen_file = False
while l:
d = l.pop()
gitm = os.path.join(shared_dir, d, 'marks-git')
hgm = os.path.join(shared_dir, d, 'marks-hg')
# move marks to shared if no such yet (if origin or last one in line)
if os.path.exists(gitm) and os.path.exists(hgm) and \
not os.path.exists(shared_gm) and not os.path.exists(shared_hgm) and \
(d == 'origin' or not l):
warn('using marks of remote %s as shared marks' % (d))
seen_file = True
os.rename(gitm, shared_gm)
os.rename(hgm, shared_hgm)
for p in (gitm, hgm):
if os.path.exists(p):
seen_file = True
os.remove(p)
# all private marks removed, should have shared
if seen_file and (not os.path.exists(shared_gm) or not os.path.exists(shared_hgm)):
die('migration to shared marks failed; perform fetch to recover')
elif migrate:
if not os.path.exists(shared_gm) or not os.path.exists(shared_hgm):
l = []
for d in l:
if not os.path.isdir(os.path.join(shared_dir, d)) or d == '.hg':
continue
gitm = os.path.join(shared_dir, d, 'marks-git')
hgm = os.path.join(shared_dir, d, 'marks-hg')
for p in ((shared_gm, gitm), (shared_hgm, hgm)):
if os.path.exists(p[0]):
shutil.copyfile(p[0], p[1])
# try to run helper gc
# only really important for a local repo (without proxy)
warn('seeded marks of %s with shared; performing gc' % d)
try:
subprocess.check_call(['git-hg-helper', 'gc', '--check-hg', d],
stdout=sys.stderr)
except:
warn('gc for %s failed' % d)
for p in (shared_gm, shared_hgm):
if os.path.exists(p):
os.remove(p)
if shared_marks:
# force proxy for local repo
os.environ['GIT_REMOTE_HG_TEST_REMOTE'] = 'y'
return shared_dir
return dirname
def main(args):
global prefix, gitdir, dirname, branches, bmarks
global marks, blob_marks, parsed_refs
global peer, mode, bad_mail, bad_name
global track_branches, force_push, is_tmp
global parsed_tags
global filenodes
global fake_bmark, hg_version
global dry_run
global notes, alias
global capability_push
global remove_username_quotes
global marksdir
marks = None
is_tmp = False
gitdir = os.environ.get('GIT_DIR', None)
if len(args) < 3:
die('Not enough arguments.')
if not gitdir:
die('GIT_DIR not set')
alias = args[1]
url = args[2]
peer = None
hg_git_compat = get_config_bool('remote-hg.hg-git-compat')
track_branches = get_config_bool('remote-hg.track-branches', True)
capability_push = get_config_bool('remote-hg.capability-push', True)
remove_username_quotes = get_config_bool('remote-hg.remove-username-quotes', True)
force_push = False
if hg_git_compat:
mode = 'hg'
bad_mail = 'none@none'
bad_name = ''
else:
mode = 'git'
bad_mail = 'unknown'
bad_name = 'Unknown'
if alias[4:] == url:
is_tmp = True
alias = hashlib.sha1(alias).hexdigest()
dirname = os.path.join(gitdir, 'hg', alias)
branches = {}
bmarks = {}
blob_marks = {}
filenodes = {}
fake_bmark = None
try:
version, _, extra = util.version().partition('+')
version = list(int(e) for e in version.split('.'))
if extra:
version[-1] += 1
hg_version = tuple(version)
except:
hg_version = None
dry_run = False
notes = set()
if not capability_push:
warn('capability_push is disabled, only do so when really sure')
warn('various enhanced features might fail in subtle ways')
prefix = select_private_refs(alias)
marksdir = select_marks_dir(alias, gitdir, True)
repo = get_repo(url, alias)
if not is_tmp:
fix_path(alias, peer or repo, url)
marks_path = os.path.join(marksdir, 'marks-hg')
marks = Marks(marks_path, repo)
if sys.platform == 'win32':
import msvcrt
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
parser = Parser(repo)
for line in parser:
if parser.check('capabilities'):
do_capabilities(parser)
elif parser.check('list'):
do_list(parser)
elif parser.check('import'):
do_import(parser)
elif parser.check('export'):
do_export(parser)
elif parser.check('push'):
do_push(parser)
elif parser.check('option'):
do_option(parser)
else:
die('unhandled command: %s' % line)
sys.stdout.flush()
marks.store()
def bye():
if is_tmp:
shutil.rmtree(dirname)
if __name__ == '__main__':
atexit.register(bye)
sys.exit(main(sys.argv))
|