Mercurial > hg
annotate hgext/convert/p4.py @ 31070:ebd14a4b03fc
color: merge two identical 'for' loops
The previous changeset made it clear that we are iterating twice on the same
items. We gather the two loops into a single one.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 16 Feb 2017 10:52:27 +0100 |
parents | 1d0e4832e616 |
children | 78ac8acfc4bd |
rev | line source |
---|---|
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
1 # Perforce source for convert extension. |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
2 # |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
3 # Copyright 2009, Frank Kingswood <frank@kingswood-consulting.co.uk> |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
4 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
10263 | 6 # GNU General Public License version 2 or any later version. |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
7 from __future__ import absolute_import |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
8 |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
9 import marshal |
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
10 import re |
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
11 |
29205
a0939666b836
py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara <yuya@tcha.org>
parents:
28371
diff
changeset
|
12 from mercurial.i18n import _ |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
13 from mercurial import ( |
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
14 error, |
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
15 util, |
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
16 ) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
17 |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
18 from . import common |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
19 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
20 def loaditer(f): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
21 "Yield the dictionary objects generated by p4" |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
22 try: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
23 while True: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
24 d = marshal.load(f) |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
25 if not d: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
26 break |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
27 yield d |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
28 except EOFError: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
29 pass |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
30 |
25788
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
31 def decodefilename(filename): |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
32 """Perforce escapes special characters @, #, *, or % |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
33 with %40, %23, %2A, or %25 respectively |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
34 |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
35 >>> decodefilename('portable-net45%252Bnetcore45%252Bwp8%252BMonoAndroid') |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
36 'portable-net45%2Bnetcore45%2Bwp8%2BMonoAndroid' |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
37 >>> decodefilename('//Depot/Directory/%2525/%2523/%23%40.%2A') |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
38 '//Depot/Directory/%25/%23/#@.*' |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
39 """ |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
40 replacements = [('%2A', '*'), ('%23', '#'), ('%40', '@'), ('%25', '%')] |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
41 for k, v in replacements: |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
42 filename = filename.replace(k, v) |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
43 return filename |
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
44 |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
45 class p4_source(common.converter_source): |
25748
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
46 def __init__(self, ui, path, revs=None): |
25884
b810b59eca62
convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents:
25882
diff
changeset
|
47 # avoid import cycle |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
48 from . import convcmd |
25884
b810b59eca62
convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents:
25882
diff
changeset
|
49 |
25748
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
50 super(p4_source, self).__init__(ui, path, revs=revs) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
51 |
8829
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
52 if "/" in path and not path.startswith('//'): |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
53 raise common.NoRepo(_('%s does not look like a P4 repository') % |
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
54 path) |
7973
db3a68fd9387
convert: attempt to check repo type before checking for tool
Matt Mackall <mpm@selenic.com>
parents:
7905
diff
changeset
|
55 |
28371
630f5f04bc74
convert: p4 use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
56 common.checktool('p4', abort=False) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
57 |
30601
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
58 self.revmap = {} |
25884
b810b59eca62
convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents:
25882
diff
changeset
|
59 self.encoding = self.ui.config('convert', 'p4.encoding', |
b810b59eca62
convert: when converting from Perforce use original local encoding by default
Eugene Baranov <eug.baranov@gmail.com>
parents:
25882
diff
changeset
|
60 default=convcmd.orig_encoding) |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
61 self.re_type = re.compile( |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
62 "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)" |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
63 "(\+\w+)?$") |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
64 self.re_keywords = re.compile( |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
65 r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)" |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
66 r":[^$\n]*\$") |
8829
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
67 self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$") |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
68 |
25748
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
69 if revs and len(revs) > 1: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25884
diff
changeset
|
70 raise error.Abort(_("p4 source does not support specifying " |
25748
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
71 "multiple revisions")) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
72 |
30601
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
73 def setrevmap(self, revmap): |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
74 """Sets the parsed revmap dictionary. |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
75 |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
76 Revmap stores mappings from a source revision to a target revision. |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
77 It is set in convertcmd.convert and provided by the user as a file |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
78 on the commandline. |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
79 |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
80 Revisions in the map are considered beeing present in the |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
81 repository and ignored during _parse(). This allows for incremental |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
82 imports if a revmap is provided. |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
83 """ |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
84 self.revmap = revmap |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
85 |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
86 def _parse_view(self, path): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
87 "Read changes affecting the path" |
11347
18680b0e20a7
Fix shell quoting on p4 conversion
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
11134
diff
changeset
|
88 cmd = 'p4 -G changes -s submitted %s' % util.shellquote(path) |
9474
6ea653272c09
convert: fix marshalling in P4 convert extension to use a binary stream
Peter Ingebretson <pingebre@yahoo.com>
parents:
8843
diff
changeset
|
89 stdout = util.popen(cmd, mode='rb') |
30629
e92776c00ffd
convert: use return value in parse_view() instead of manipulating state
David Soria Parra <davidsp@fb.com>
parents:
30617
diff
changeset
|
90 p4changes = {} |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
91 for d in loaditer(stdout): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
92 c = d.get("change", None) |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
93 if c: |
30629
e92776c00ffd
convert: use return value in parse_view() instead of manipulating state
David Soria Parra <davidsp@fb.com>
parents:
30617
diff
changeset
|
94 p4changes[c] = True |
e92776c00ffd
convert: use return value in parse_view() instead of manipulating state
David Soria Parra <davidsp@fb.com>
parents:
30617
diff
changeset
|
95 return p4changes |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
96 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
97 def _parse(self, ui, path): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
98 "Prepare list of P4 filenames and revisions to import" |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
99 p4changes = {} |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
100 changeset = {} |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
101 files_map = {} |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
102 copies_map = {} |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
103 localname = {} |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
104 depotname = {} |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
105 heads = [] |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
106 |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
107 ui.status(_('reading p4 views\n')) |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
108 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
109 # read client spec or view |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
110 if "/" in path: |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
111 p4changes.update(self._parse_view(path)) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
112 if path.startswith("//") and path.endswith("/..."): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
113 views = {path[:-3]:""} |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
114 else: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
115 views = {"//": ""} |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
116 else: |
11347
18680b0e20a7
Fix shell quoting on p4 conversion
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
11134
diff
changeset
|
117 cmd = 'p4 -G client -o %s' % util.shellquote(path) |
9474
6ea653272c09
convert: fix marshalling in P4 convert extension to use a binary stream
Peter Ingebretson <pingebre@yahoo.com>
parents:
8843
diff
changeset
|
118 clientspec = marshal.load(util.popen(cmd, mode='rb')) |
7869
bc027d72c289
cleanup: remove all trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7823
diff
changeset
|
119 |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
120 views = {} |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
121 for client in clientspec: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
122 if client.startswith("View"): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
123 sview, cview = clientspec[client].split() |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
124 p4changes.update(self._parse_view(sview)) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
125 if sview.endswith("...") and cview.endswith("..."): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
126 sview = sview[:-3] |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
127 cview = cview[:-3] |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
128 cview = cview[2:] |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
129 cview = cview[cview.find("/") + 1:] |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
130 views[sview] = cview |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
131 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
132 # list of changes that affect our source files |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
133 p4changes = p4changes.keys() |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
134 p4changes.sort(key=int) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
135 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
136 # list with depot pathnames, longest first |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
137 vieworder = views.keys() |
9039 | 138 vieworder.sort(key=len, reverse=True) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
139 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
140 # handle revision limiting |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
141 startrev = self.ui.config('convert', 'p4.startrev', default=0) |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
142 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
143 # now read the full changelists to get the list of file revisions |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
144 ui.status(_('collecting p4 changelists\n')) |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
145 lastid = None |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
146 for change in p4changes: |
30597
fa2d2c8ac398
convert: don't use long list comprehensions
David Soria Parra <davidsp@fb.com>
parents:
29205
diff
changeset
|
147 if startrev and int(change) < int(startrev): |
fa2d2c8ac398
convert: don't use long list comprehensions
David Soria Parra <davidsp@fb.com>
parents:
29205
diff
changeset
|
148 continue |
fa2d2c8ac398
convert: don't use long list comprehensions
David Soria Parra <davidsp@fb.com>
parents:
29205
diff
changeset
|
149 if self.revs and int(change) > int(self.revs[0]): |
fa2d2c8ac398
convert: don't use long list comprehensions
David Soria Parra <davidsp@fb.com>
parents:
29205
diff
changeset
|
150 continue |
30601
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
151 if change in self.revmap: |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
152 # Ignore already present revisions, but set the parent pointer. |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
153 lastid = change |
d47a01bf0059
convert: allow passing in a revmap
David Soria Parra <davidsp@fb.com>
parents:
30600
diff
changeset
|
154 continue |
30597
fa2d2c8ac398
convert: don't use long list comprehensions
David Soria Parra <davidsp@fb.com>
parents:
29205
diff
changeset
|
155 |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
156 if lastid: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
157 parents = [lastid] |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
158 else: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
159 parents = [] |
7869
bc027d72c289
cleanup: remove all trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7823
diff
changeset
|
160 |
30603
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
161 d = self._fetch_revision(change) |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
162 c = self._construct_commit(d, parents) |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
163 |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
164 shortdesc = c.desc.splitlines(True)[0].rstrip('\r\n') |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
165 t = '%s %s' % (c.rev, repr(shortdesc)[1:-1]) |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
166 ui.status(util.ellipsis(t, 80) + '\n') |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
167 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
168 files = [] |
25751
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
169 copies = {} |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
170 copiedfiles = [] |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
171 i = 0 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
172 while ("depotFile%d" % i) in d and ("rev%d" % i) in d: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
173 oldname = d["depotFile%d" % i] |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
174 filename = None |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
175 for v in vieworder: |
25776
809c3e4a9e31
convert: ignore case changes in vieworder for Perforce
Eugene Baranov <eug.baranov@gmail.com>
parents:
25775
diff
changeset
|
176 if oldname.lower().startswith(v.lower()): |
25788
a36fd0993522
convert: unescape Perforce-escaped special characters in filenames
Eugene Baranov <eug.baranov@gmail.com>
parents:
25776
diff
changeset
|
177 filename = decodefilename(views[v] + oldname[len(v):]) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
178 break |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
179 if filename: |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
180 files.append((filename, d["rev%d" % i])) |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
181 depotname[filename] = oldname |
25751
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
182 if (d.get("action%d" % i) == "move/add"): |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
183 copiedfiles.append(filename) |
30630
3830f8806094
convert: move localname state to function scope
David Soria Parra <davidsp@fb.com>
parents:
30629
diff
changeset
|
184 localname[oldname] = filename |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
185 i += 1 |
25751
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
186 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
187 # Collect information about copied files |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
188 for filename in copiedfiles: |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
189 oldname = depotname[filename] |
25751
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
190 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
191 flcmd = 'p4 -G filelog %s' \ |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
192 % util.shellquote(oldname) |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
193 flstdout = util.popen(flcmd, mode='rb') |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
194 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
195 copiedfilename = None |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
196 for d in loaditer(flstdout): |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
197 copiedoldname = None |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
198 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
199 i = 0 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
200 while ("change%d" % i) in d: |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
201 if (d["change%d" % i] == change and |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
202 d["action%d" % i] == "move/add"): |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
203 j = 0 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
204 while ("file%d,%d" % (i, j)) in d: |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
205 if d["how%d,%d" % (i, j)] == "moved from": |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
206 copiedoldname = d["file%d,%d" % (i, j)] |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
207 break |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
208 j += 1 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
209 i += 1 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
210 |
30630
3830f8806094
convert: move localname state to function scope
David Soria Parra <davidsp@fb.com>
parents:
30629
diff
changeset
|
211 if copiedoldname and copiedoldname in localname: |
3830f8806094
convert: move localname state to function scope
David Soria Parra <davidsp@fb.com>
parents:
30629
diff
changeset
|
212 copiedfilename = localname[copiedoldname] |
25751
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
213 break |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
214 |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
215 if copiedfilename: |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
216 copies[filename] = copiedfilename |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
217 else: |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
218 ui.warn(_("cannot find source for copied file: %s@%s\n") |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
219 % (filename, change)) |
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
220 |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
221 changeset[change] = c |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
222 files_map[change] = files |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
223 copies_map[change] = copies |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
224 lastid = change |
7869
bc027d72c289
cleanup: remove all trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7823
diff
changeset
|
225 |
30631
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
226 if lastid and len(changeset) > 0: |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
227 heads = [lastid] |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
228 |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
229 return { |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
230 'changeset': changeset, |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
231 'files': files_map, |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
232 'copies': copies_map, |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
233 'heads': heads, |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
234 'depotname': depotname, |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
235 } |
c2be48e56d59
convert: return calculated values from parse() instead of manpulating state
David Soria Parra <davidsp@fb.com>
parents:
30630
diff
changeset
|
236 |
30632
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
237 @util.propertycache |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
238 def _parse_once(self): |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
239 return self._parse(self.ui, self.path) |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
240 |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
241 @util.propertycache |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
242 def copies(self): |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
243 return self._parse_once['copies'] |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
244 |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
245 @util.propertycache |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
246 def files(self): |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
247 return self._parse_once['files'] |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
248 |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
249 @util.propertycache |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
250 def changeset(self): |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
251 return self._parse_once['changeset'] |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
252 |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
253 @util.propertycache |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
254 def heads(self): |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
255 return self._parse_once['heads'] |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
256 |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
257 @util.propertycache |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
258 def depotname(self): |
1d0e4832e616
convert: parse perforce data on-demand
David Soria Parra <davidsp@fb.com>
parents:
30631
diff
changeset
|
259 return self._parse_once['depotname'] |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
260 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
261 def getheads(self): |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
262 return self.heads |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
263 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
264 def getfile(self, name, rev): |
11348
ad0a334eef16
p4: fix long line and bad spacing around %
Martin Geisler <mg@aragost.com>
parents:
11347
diff
changeset
|
265 cmd = 'p4 -G print %s' \ |
ad0a334eef16
p4: fix long line and bad spacing around %
Martin Geisler <mg@aragost.com>
parents:
11347
diff
changeset
|
266 % util.shellquote("%s#%s" % (self.depotname[name], rev)) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
267 |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
268 lasterror = None |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
269 while True: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
270 stdout = util.popen(cmd, mode='rb') |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
271 |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
272 mode = None |
25882
97a9f7602014
convert: when getting file from Perforce concatenate data at the end
Eugene Baranov <eug.baranov@gmail.com>
parents:
25805
diff
changeset
|
273 contents = [] |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
274 keywords = None |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
275 |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
276 for d in loaditer(stdout): |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
277 code = d["code"] |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
278 data = d.get("data") |
8829
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
279 |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
280 if code == "error": |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
281 # if this is the first time error happened |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
282 # re-attempt getting the file |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
283 if not lasterror: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
284 lasterror = IOError(d["generic"], data) |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
285 # this will exit inner-most for-loop |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
286 break |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
287 else: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
288 raise lasterror |
8843
eb7b247a98ea
kill trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8829
diff
changeset
|
289 |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
290 elif code == "stat": |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
291 action = d.get("action") |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
292 if action in ["purge", "delete", "move/delete"]: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
293 return None, None |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
294 p4type = self.re_type.match(d["type"]) |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
295 if p4type: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
296 mode = "" |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
297 flags = ((p4type.group(1) or "") |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
298 + (p4type.group(3) or "")) |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
299 if "x" in flags: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
300 mode = "x" |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
301 if p4type.group(2) == "symlink": |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
302 mode = "l" |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
303 if "ko" in flags: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
304 keywords = self.re_keywords_old |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
305 elif "k" in flags: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
306 keywords = self.re_keywords |
8843
eb7b247a98ea
kill trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8829
diff
changeset
|
307 |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
308 elif code == "text" or code == "binary": |
25882
97a9f7602014
convert: when getting file from Perforce concatenate data at the end
Eugene Baranov <eug.baranov@gmail.com>
parents:
25805
diff
changeset
|
309 contents.append(data) |
25775
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
310 |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
311 lasterror = None |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
312 |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
313 if not lasterror: |
220d9ae6a9a8
convert: if getting a file from Perforce fails try to get it one more time
Eugene Baranov <eug.baranov@gmail.com>
parents:
25760
diff
changeset
|
314 break |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
315 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
316 if mode is None: |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
22294
diff
changeset
|
317 return None, None |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
318 |
25882
97a9f7602014
convert: when getting file from Perforce concatenate data at the end
Eugene Baranov <eug.baranov@gmail.com>
parents:
25805
diff
changeset
|
319 contents = ''.join(contents) |
97a9f7602014
convert: when getting file from Perforce concatenate data at the end
Eugene Baranov <eug.baranov@gmail.com>
parents:
25805
diff
changeset
|
320 |
8829
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
321 if keywords: |
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
322 contents = keywords.sub("$\\1$", contents) |
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
323 if mode == "l" and contents.endswith("\n"): |
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
324 contents = contents[:-1] |
ce4b92f5cea7
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
8225
diff
changeset
|
325 |
11134
33010ff1fd6f
convert: merge sources getmode() into getfile()
Patrick Mezard <pmezard@gmail.com>
parents:
10939
diff
changeset
|
326 return contents, mode |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
327 |
22300
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
22296
diff
changeset
|
328 def getchanges(self, rev, full): |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
22296
diff
changeset
|
329 if full: |
26779
aaa33ec3c951
grammar: use does instead of do where appropriate
timeless@mozdev.org
parents:
26587
diff
changeset
|
330 raise error.Abort(_("convert from p4 does not support --full")) |
25751
17a9da909186
convert: handle copies when converting from Perforce (issue4744)
Eugene Baranov <eug.baranov@gmail.com>
parents:
25748
diff
changeset
|
331 return self.files[rev], self.copies[rev], set() |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
332 |
30603
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
333 def _construct_commit(self, obj, parents=None): |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
334 """ |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
335 Constructs a common.commit object from an unmarshalled |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
336 `p4 describe` output |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
337 """ |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
338 desc = self.recode(obj.get("desc", "")) |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
339 date = (int(obj["time"]), 0) # timezone not set |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
340 if parents is None: |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
341 parents = [] |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
342 |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
343 return common.commit(author=self.recode(obj["user"]), |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
344 date=util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2'), |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
345 parents=parents, desc=desc, branch=None, rev=obj['change'], |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
346 extra={"p4": obj['change'], "convert_revision": obj['change']}) |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
347 |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
348 def _fetch_revision(self, rev): |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
349 """Return an output of `p4 describe` including author, commit date as |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
350 a dictionary.""" |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
351 cmd = "p4 -G describe -s %s" % rev |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
352 stdout = util.popen(cmd, mode='rb') |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
353 return marshal.load(stdout) |
db9e883566e8
convert: encapsulate commit data fetching and commit object creation
David Soria Parra <davidsp@fb.com>
parents:
30602
diff
changeset
|
354 |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
355 def getcommit(self, rev): |
30604
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
356 if rev in self.changeset: |
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
357 return self.changeset[rev] |
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
358 elif rev in self.revmap: |
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
359 d = self._fetch_revision(rev) |
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
360 return self._construct_commit(d, parents=None) |
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
361 raise error.Abort( |
b654112a0119
convert: return commit objects for revisions in the revmap
David Soria Parra <davidsp@fb.com>
parents:
30603
diff
changeset
|
362 _("cannot find %s in the revmap or parsed changesets") % rev) |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
363 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
364 def gettags(self): |
30599
902c89df94e3
convert: remove unused dictionaries
David Soria Parra <davidsp@fb.com>
parents:
30598
diff
changeset
|
365 return {} |
7823
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
366 |
11efa41037e2
convert: Perforce source for conversion to Mercurial
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
367 def getchangedfiles(self, rev, i): |
8209
a1a5a57efe90
replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents:
8066
diff
changeset
|
368 return sorted([x[0] for x in self.files[rev]]) |