Mercurial > dotfiles

annotate lib/hg/hggit_sync.py @ 322:e7fe049b7f8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use UTF8 encoding.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 12 Oct 2015 08:32:35 -0700
parents e40cdce29e5a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
295
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
1 import os
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
2 import os.path
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
3 import sys
322
e7fe049b7f8b Use UTF8 encoding.
Ludovic Chabant <ludovic@chabant.com>
parents: 295
diff changeset
4 import codecs
295
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
5 import subprocess
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
6
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
7
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
8 class CommitInfo(object):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
9 def __init__(self):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
10 self.nodeid = None
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
11 self.timestamp = None
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
12 self.description = None
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
13
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
14
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
15 def parse_commits(text):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
16 commits = []
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
17 cur_commit = None
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
18 for line in text.split('\n'):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
19 if line == '':
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
20 if cur_commit:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
21 commits.append(cur_commit)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
22 cur_commit = None
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
23 continue
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
24 if cur_commit is None:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
25 cur_commit = CommitInfo()
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
26 if cur_commit.nodeid is None:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
27 id_and_date = line.split(' ', 1)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
28 cur_commit.nodeid = id_and_date[0]
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
29 cur_commit.timestamp = int(id_and_date[1].split('.')[0])
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
30 else:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
31 cur_commit.description = line
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
32 return commits
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
33
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
34
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
35 def build_commit_map(commits1, commits2):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
36 commits1 = sorted(commits1, key=lambda c: c.timestamp)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
37 commits2 = sorted(commits2, key=lambda c: c.timestamp)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
38 commit_map = dict(map(lambda c: (c.timestamp, (c, None)), commits1))
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
39 for c in commits2:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
40 entry = commit_map.get(c.timestamp, (None, None))
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
41 entry = (entry[0], c)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
42 commit_map[c.timestamp] = entry
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
43 return commit_map
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
44
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
45
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
46 def main():
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
47 hg_repo = os.getcwd()
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
48 if not os.path.exists(os.path.join(hg_repo, '.hg')):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
49 print "You must run this in the root of a Mercurial repository."
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
50 return 1
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
51
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
52 git_repo = os.path.join(hg_repo, '.hg', 'git')
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
53 if not os.path.exists(git_repo):
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
54 print ("This Mercurial repository doesn't seem to have any Git mirror "
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
55 "to sync with.")
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
56 return 1
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
57
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
58 hg_output = subprocess.check_output([
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
59 'hg', 'log',
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
60 '--template', "{node} {date}\n{firstline(desc)}\n\n"])
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
61 hg_commits = parse_commits(hg_output)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
62
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
63 os.chdir(git_repo)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
64 git_output = subprocess.check_output([
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
65 'git', 'log', '--format=%H %ct%n%s%n%n'])
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
66 git_commits = parse_commits(git_output)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
67 os.chdir(hg_repo)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
68
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
69 commit_map = build_commit_map(git_commits, hg_commits)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
70 for key, val in commit_map.iteritems():
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
71 if val[0] is None:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
72 print ("Mercurial commit '%s' (%s) has no Git mirror yet: %s" %
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
73 (val[1].nodeid, val[1].timestamp, val[1].description))
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
74 if val[1] is None:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
75 print ("Git commit '%s' (%s) is new: %s" %
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
76 (val[0].nodeid, val[0].timestamp, val[0].description))
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
77
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
78 map_file = os.path.join(hg_repo, '.hg', 'git-mapfile')
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
79 if len(sys.argv) > 1:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
80 map_file = sys.argv[1]
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
81 print "Saving map file: %s" % map_file
322
e7fe049b7f8b Use UTF8 encoding.
Ludovic Chabant <ludovic@chabant.com>
parents: 295
diff changeset
82 with codecs.open(map_file, 'w', encoding='utf8') as fp:
295
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
83 for key, val in commit_map.iteritems():
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
84 if val[0] is None or val[1] is None:
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
85 continue
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
86 fp.write(val[0].nodeid)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
87 fp.write(' ')
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
88 fp.write(val[1].nodeid)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
89 fp.write('\n')
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
90
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
91
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
92 if __name__ == '__main__':
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
93 res = main()
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
94 sys.exit(res)
e40cdce29e5a Hacky hg-git sync script.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
95