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
|
# verify.py - verify Mercurial revisions
#
# Copyright 2014 Facebook.
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
import stat
from mercurial import error
from mercurial.i18n import _
from dulwich import diff_tree
from dulwich.objects import Commit, S_IFGITLINK
from . import git2hg
def verify(ui, repo, hgctx):
'''verify that a Mercurial rev matches the corresponding Git rev
Given a Mercurial revision that has a corresponding Git revision in the
map, this attempts to answer whether that revision has the same contents as
the corresponding Git revision.
'''
handler = repo.githandler
gitsha = handler.map_git_get(hgctx.hex())
if not gitsha:
# TODO deal better with commits in the middle of octopus merges
raise error.Abort(
_(b'no git commit found for rev %s') % hgctx,
hint=_(
b'if this is an octopus merge, ' b'verify against the last rev'
),
)
try:
gitcommit = handler.git.get_object(gitsha)
except KeyError:
raise error.Abort(
_(b'git equivalent %s for rev %s not found!') % (gitsha, hgctx)
)
except Exception:
ui.traceback()
raise error.Abort(
_(b'git equivalent %s for rev %s is corrupt!') % (gitsha, hgctx),
hint=b're-run with --traceback for details',
)
if not isinstance(gitcommit, Commit):
raise error.Abort(
_(b'git equivalent %s for rev %s is not a commit!')
% (gitsha, hgctx)
)
ui.status(_(b'verifying rev %s against git commit %s\n') % (hgctx, gitsha))
failed = False
# TODO check commit message and other metadata
dirkind = stat.S_IFDIR
hgfiles = set(hgctx)
gitfiles = set()
with ui.makeprogress(b'verify', total=len(hgfiles)) as progress:
for gitfile, dummy in diff_tree.walk_trees(
handler.git.object_store, gitcommit.tree, None
):
if gitfile.mode == dirkind:
continue
# TODO deal with submodules
if (
gitfile.mode == S_IFGITLINK
or gitfile.path == b'.hgsubstate'
or gitfile.path == b'.hgsub'
):
continue
progress.increment()
gitfiles.add(gitfile.path)
try:
fctx = hgctx[gitfile.path]
except error.LookupError:
# we'll deal with this at the end
continue
hgflags = fctx.flags()
gitflags = git2hg.convert_git_int_mode(gitfile.mode)
if hgflags != gitflags:
ui.write(
_(b"file has different flags: %s (hg '%s', git '%s')\n")
% (gitfile.path, hgflags, gitflags)
)
failed = True
if fctx.data() != handler.git[gitfile.sha].data:
ui.write(_(b'difference in: %s\n') % gitfile.path)
failed = True
# TODO: we should actually verify submodules & subrepos, but for
# now, we'll just not report an error
hgfiles.discard(b'.hgsubstate')
hgfiles.discard(b'.hgsub')
gitfiles.discard(b'.gitmodules')
if hgfiles != gitfiles:
failed = True
missing = gitfiles - hgfiles
for f in sorted(missing):
ui.write(_(b'file found in git but not hg: %s\n') % f)
unexpected = hgfiles - gitfiles
for f in sorted(unexpected):
ui.write(_(b'file found in hg but not git: %s\n') % f)
if failed:
return 1
else:
return 0
|
