author | Yuya Nishihara <yuya@tcha.org> |
Sun, 26 Mar 2017 19:06:48 +0900 | |
changeset 31655 | 23391acfc421 |
parent 29612 | a234b32b744a |
child 34488 | 6bda8a9d8431 |
permissions | -rw-r--r-- |
8250
1b60efdb8bc5
convert: add copyright and license headers to back-ends
Martin Geisler <mg@lazybytes.net>
parents:
8166
diff
changeset
|
1 |
# bzr.py - bzr support for the convert extension |
1b60efdb8bc5
convert: add copyright and license headers to back-ends
Martin Geisler <mg@lazybytes.net>
parents:
8166
diff
changeset
|
2 |
# |
1b60efdb8bc5
convert: add copyright and license headers to back-ends
Martin Geisler <mg@lazybytes.net>
parents:
8166
diff
changeset
|
3 |
# Copyright 2008, 2009 Marek Kubica <marek@xivilization.net> and others |
1b60efdb8bc5
convert: add copyright and license headers to back-ends
Martin Geisler <mg@lazybytes.net>
parents:
8166
diff
changeset
|
4 |
# |
1b60efdb8bc5
convert: add copyright and license headers to back-ends
Martin Geisler <mg@lazybytes.net>
parents:
8166
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. |
8250
1b60efdb8bc5
convert: add copyright and license headers to back-ends
Martin Geisler <mg@lazybytes.net>
parents:
8166
diff
changeset
|
7 |
|
7053 | 8 |
# This module is for handling 'bzr', that was formerly known as Bazaar-NG; |
9 |
# it cannot access 'bar' repositories, but they were never used very much |
|
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
10 |
from __future__ import absolute_import |
7053 | 11 |
|
12 |
import os |
|
29205
a0939666b836
py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara <yuya@tcha.org>
parents:
28479
diff
changeset
|
13 |
|
a0939666b836
py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara <yuya@tcha.org>
parents:
28479
diff
changeset
|
14 |
from mercurial.i18n import _ |
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
15 |
from mercurial import ( |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
16 |
demandimport, |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
17 |
error |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
18 |
) |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
19 |
from . import common |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
20 |
|
7053 | 21 |
# these do not work with demandimport, blacklist |
22 |
demandimport.ignore.extend([ |
|
23 |
'bzrlib.transactions', |
|
24 |
'bzrlib.urlutils', |
|
10560
9134725caf1d
Add ElementPath to the list of package ignored by demand import
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
10394
diff
changeset
|
25 |
'ElementPath', |
7053 | 26 |
]) |
27 |
||
28 |
try: |
|
29 |
# bazaar imports |
|
28479
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
30 |
import bzrlib.bzrdir |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
31 |
import bzrlib.errors |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
32 |
import bzrlib.revision |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
33 |
import bzrlib.revisionspec.RevisionSpec |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
34 |
bzrdir = bzrlib.bzrdir |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
35 |
errors = bzrlib.errors |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
36 |
revision = bzrlib.revision |
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
37 |
revisionspec = bzrlib.revisionspec |
7053 | 38 |
except ImportError: |
39 |
pass |
|
40 |
||
8045
e09a2f2ef85d
convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents:
8035
diff
changeset
|
41 |
supportedkinds = ('file', 'symlink') |
e09a2f2ef85d
convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents:
8035
diff
changeset
|
42 |
|
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
43 |
class bzr_source(common.converter_source): |
7053 | 44 |
"""Reads Bazaar repositories by using the Bazaar Python libraries""" |
45 |
||
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): |
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
47 |
super(bzr_source, self).__init__(ui, path, revs=revs) |
7053 | 48 |
|
7973
db3a68fd9387
convert: attempt to check repo type before checking for tool
Matt Mackall <mpm@selenic.com>
parents:
7060
diff
changeset
|
49 |
if not os.path.exists(os.path.join(path, '.bzr')): |
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
50 |
raise common.NoRepo(_('%s does not look like a Bazaar repository') |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
51 |
% path) |
7973
db3a68fd9387
convert: attempt to check repo type before checking for tool
Matt Mackall <mpm@selenic.com>
parents:
7060
diff
changeset
|
52 |
|
7053 | 53 |
try: |
54 |
# access bzrlib stuff |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
55 |
bzrdir |
7053 | 56 |
except NameError: |
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
57 |
raise common.NoRepo(_('Bazaar modules could not be loaded')) |
7053 | 58 |
|
59 |
path = os.path.abspath(path) |
|
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
60 |
self._checkrepotype(path) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
61 |
try: |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
62 |
self.sourcerepo = bzrdir.BzrDir.open(path).open_repository() |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
63 |
except errors.NoRepositoryPresent: |
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
64 |
raise common.NoRepo(_('%s does not look like a Bazaar repository') |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
65 |
% path) |
7053 | 66 |
self._parentids = {} |
67 |
||
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
68 |
def _checkrepotype(self, path): |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
69 |
# Lightweight checkouts detection is informational but probably |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
70 |
# fragile at API level. It should not terminate the conversion. |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
71 |
try: |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
72 |
dir = bzrdir.BzrDir.open_containing(path)[0] |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
73 |
try: |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
74 |
tree = dir.open_workingtree(recommend_upgrade=False) |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
75 |
branch = tree.branch |
12063
516b000fbb7e
cleanup: remove unused variables
Brodie Rao <brodie@bitheap.org>
parents:
11134
diff
changeset
|
76 |
except (errors.NoWorkingTree, errors.NotLocalUrl): |
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
77 |
tree = None |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
78 |
branch = dir.open_branch() |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
79 |
if (tree is not None and tree.bzrdir.root_transport.base != |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
80 |
branch.bzrdir.root_transport.base): |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
81 |
self.ui.warn(_('warning: lightweight checkouts may cause ' |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
82 |
'conversion failures, try with a regular ' |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
83 |
'branch instead.\n')) |
16689
f366d4c2ff34
cleanup: replace naked excepts with except Exception: ...
Brodie Rao <brodie@sf.io>
parents:
16099
diff
changeset
|
84 |
except Exception: |
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
85 |
self.ui.note(_('bzr source type could not be determined\n')) |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
86 |
|
7053 | 87 |
def before(self): |
88 |
"""Before the conversion begins, acquire a read lock |
|
89 |
for all the operations that might need it. Fortunately |
|
90 |
read locks don't block other reads or writes to the |
|
91 |
repository, so this shouldn't have any impact on the usage of |
|
92 |
the source repository. |
|
93 |
||
94 |
The alternative would be locking on every operation that |
|
95 |
needs locks (there are currently two: getting the file and |
|
96 |
getting the parent map) and releasing immediately after, |
|
97 |
but this approach can take even 40% longer.""" |
|
98 |
self.sourcerepo.lock_read() |
|
99 |
||
100 |
def after(self): |
|
101 |
self.sourcerepo.unlock() |
|
102 |
||
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
103 |
def _bzrbranches(self): |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
104 |
return self.sourcerepo.find_branches(using=True) |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
105 |
|
7053 | 106 |
def getheads(self): |
25748
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
107 |
if not self.revs: |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
108 |
# Set using=True to avoid nested repositories (see issue3254) |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
109 |
heads = sorted([b.last_revision() for b in self._bzrbranches()]) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
110 |
else: |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
111 |
revid = None |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
112 |
for branch in self._bzrbranches(): |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
113 |
try: |
28479
d62b00318c19
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
28411
diff
changeset
|
114 |
r = revisionspec.RevisionSpec.from_string(self.revs[0]) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
115 |
info = r.in_history(branch) |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
116 |
except errors.BzrError: |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
117 |
pass |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
118 |
revid = info.rev_id |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
119 |
if revid is None: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25748
diff
changeset
|
120 |
raise error.Abort(_('%s is not a valid revision') |
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25748
diff
changeset
|
121 |
% self.revs[0]) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
122 |
heads = [revid] |
16061
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
123 |
# Empty repositories return 'null:', which cannot be retrieved |
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
124 |
heads = [h for h in heads if h != 'null:'] |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
125 |
return heads |
7053 | 126 |
|
127 |
def getfile(self, name, rev): |
|
128 |
revtree = self.sourcerepo.revision_tree(rev) |
|
8783
6556d4145122
bzr convert: restore paths to source encoding. Closes issue1692.
Brendan Cully <brendan@kublai.com>
parents:
8423
diff
changeset
|
129 |
fileid = revtree.path2id(name.decode(self.encoding or 'utf-8')) |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
130 |
kind = None |
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
131 |
if fileid is not None: |
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
132 |
kind = revtree.kind(fileid) |
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
133 |
if kind not in supportedkinds: |
7053 | 134 |
# the file is not available anymore - was deleted |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
17424
diff
changeset
|
135 |
return None, None |
11134
33010ff1fd6f
convert: merge sources getmode() into getfile()
Patrick Mezard <pmezard@gmail.com>
parents:
10939
diff
changeset
|
136 |
mode = self._modecache[(name, rev)] |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
137 |
if kind == 'symlink': |
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
138 |
target = revtree.get_symlink_target(fileid) |
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
139 |
if target is None: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25748
diff
changeset
|
140 |
raise error.Abort(_('%s.%s symlink has no target') |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
141 |
% (name, rev)) |
11134
33010ff1fd6f
convert: merge sources getmode() into getfile()
Patrick Mezard <pmezard@gmail.com>
parents:
10939
diff
changeset
|
142 |
return target, mode |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
143 |
else: |
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
144 |
sio = revtree.get_file(fileid) |
11134
33010ff1fd6f
convert: merge sources getmode() into getfile()
Patrick Mezard <pmezard@gmail.com>
parents:
10939
diff
changeset
|
145 |
return sio.read(), mode |
7053 | 146 |
|
22300
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
22296
diff
changeset
|
147 |
def getchanges(self, version, full): |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
22296
diff
changeset
|
148 |
if full: |
26779
aaa33ec3c951
grammar: use does instead of do where appropriate
timeless@mozdev.org
parents:
26587
diff
changeset
|
149 |
raise error.Abort(_("convert from cvs does not support --full")) |
7053 | 150 |
self._modecache = {} |
151 |
self._revtree = self.sourcerepo.revision_tree(version) |
|
152 |
# get the parentids from the cache |
|
153 |
parentids = self._parentids.pop(version) |
|
154 |
# only diff against first parent id |
|
155 |
prevtree = self.sourcerepo.revision_tree(parentids[0]) |
|
24395
216fa1ba9993
convert: optimize convert of files that are unmodified from p2 in merges
Mads Kiilerich <madski@unity3d.com>
parents:
22300
diff
changeset
|
156 |
files, changes = self._gettreechanges(self._revtree, prevtree) |
216fa1ba9993
convert: optimize convert of files that are unmodified from p2 in merges
Mads Kiilerich <madski@unity3d.com>
parents:
22300
diff
changeset
|
157 |
return files, changes, set() |
7053 | 158 |
|
159 |
def getcommit(self, version): |
|
160 |
rev = self.sourcerepo.get_revision(version) |
|
161 |
# populate parent id cache |
|
162 |
if not rev.parent_ids: |
|
163 |
parents = [] |
|
164 |
self._parentids[version] = (revision.NULL_REVISION,) |
|
165 |
else: |
|
166 |
parents = self._filterghosts(rev.parent_ids) |
|
167 |
self._parentids[version] = parents |
|
168 |
||
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
169 |
branch = self.recode(rev.properties.get('branch-nick', u'default')) |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
170 |
if branch == 'trunk': |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
171 |
branch = 'default' |
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
172 |
return common.commit(parents=parents, |
8305
7a0fcdd3828f
convert/bzr: handle Bazaar timestamps correctly (issue1652).
Greg Ward <greg-hg@gerg.ca>
parents:
8250
diff
changeset
|
173 |
date='%d %d' % (rev.timestamp, -rev.timezone), |
7053 | 174 |
author=self.recode(rev.committer), |
175 |
desc=self.recode(rev.message), |
|
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
176 |
branch=branch, |
7053 | 177 |
rev=version) |
178 |
||
179 |
def gettags(self): |
|
180 |
bytetags = {} |
|
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
181 |
for branch in self._bzrbranches(): |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
182 |
if not branch.supports_tags(): |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
183 |
return {} |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
184 |
tagdict = branch.tags.get_tag_dict() |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
185 |
for name, rev in tagdict.iteritems(): |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
186 |
bytetags[self.recode(name)] = rev |
7053 | 187 |
return bytetags |
188 |
||
189 |
def getchangedfiles(self, rev, i): |
|
190 |
self._modecache = {} |
|
191 |
curtree = self.sourcerepo.revision_tree(rev) |
|
192 |
if i is not None: |
|
8165
78658990c725
convert/bzr: make it work with filemaps (issue1631)
Patrick Mezard <pmezard@gmail.com>
parents:
8148
diff
changeset
|
193 |
parentid = self._parentids[rev][i] |
7053 | 194 |
else: |
195 |
# no parent id, get the empty revision |
|
196 |
parentid = revision.NULL_REVISION |
|
197 |
||
198 |
prevtree = self.sourcerepo.revision_tree(parentid) |
|
199 |
changes = [e[0] for e in self._gettreechanges(curtree, prevtree)[0]] |
|
200 |
return changes |
|
201 |
||
202 |
def _gettreechanges(self, current, origin): |
|
10394
4612cded5176
fix coding style (reported by pylint)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10282
diff
changeset
|
203 |
revid = current._revision_id |
7053 | 204 |
changes = [] |
205 |
renames = {} |
|
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
206 |
seen = set() |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
207 |
# Process the entries by reverse lexicographic name order to |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
208 |
# handle nested renames correctly, most specific first. |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
209 |
curchanges = sorted(current.iter_changes(origin), |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
210 |
key=lambda c: c[1][0] or c[1][1], |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
211 |
reverse=True) |
7053 | 212 |
for (fileid, paths, changed_content, versioned, parent, name, |
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
213 |
kind, executable) in curchanges: |
7053 | 214 |
|
215 |
if paths[0] == u'' or paths[1] == u'': |
|
216 |
# ignore changes to tree root |
|
217 |
continue |
|
218 |
||
219 |
# bazaar tracks directories, mercurial does not, so |
|
220 |
# we have to rename the directory contents |
|
221 |
if kind[1] == 'directory': |
|
8126
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
222 |
if kind[0] not in (None, 'directory'): |
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
223 |
# Replacing 'something' with a directory, record it |
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
224 |
# so it can be removed. |
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
225 |
changes.append((self.recode(paths[0]), revid)) |
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
226 |
|
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
227 |
if kind[0] == 'directory' and None not in paths: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
228 |
renaming = paths[0] != paths[1] |
7053 | 229 |
# neither an add nor an delete - a move |
230 |
# rename all directory contents manually |
|
29612
a234b32b744a
convert: update use of deprecated bzrlib property
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29205
diff
changeset
|
231 |
subdir = origin.root_inventory.path2id(paths[0]) |
7053 | 232 |
# get all child-entries of the directory |
29612
a234b32b744a
convert: update use of deprecated bzrlib property
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29205
diff
changeset
|
233 |
for name, entry in origin.root_inventory.iter_entries( |
a234b32b744a
convert: update use of deprecated bzrlib property
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
29205
diff
changeset
|
234 |
subdir): |
7053 | 235 |
# hg does not track directory renames |
236 |
if entry.kind == 'directory': |
|
237 |
continue |
|
238 |
frompath = self.recode(paths[0] + '/' + name) |
|
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
239 |
if frompath in seen: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
240 |
# Already handled by a more specific change entry |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
241 |
# This is important when you have: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
242 |
# a => b |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
243 |
# a/c => a/c |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
244 |
# Here a/c must not be renamed into b/c |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
245 |
continue |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
246 |
seen.add(frompath) |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
247 |
if not renaming: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
248 |
continue |
7053 | 249 |
topath = self.recode(paths[1] + '/' + name) |
250 |
# register the files as changed |
|
251 |
changes.append((frompath, revid)) |
|
252 |
changes.append((topath, revid)) |
|
253 |
# add to mode cache |
|
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
254 |
mode = ((entry.executable and 'x') |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
255 |
or (entry.kind == 'symlink' and 's') |
7053 | 256 |
or '') |
257 |
self._modecache[(topath, revid)] = mode |
|
258 |
# register the change as move |
|
259 |
renames[topath] = frompath |
|
260 |
||
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
16689
diff
changeset
|
261 |
# no further changes, go to the next change |
7053 | 262 |
continue |
263 |
||
264 |
# we got unicode paths, need to convert them |
|
16059
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
265 |
path, topath = paths |
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
266 |
if path is not None: |
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
267 |
path = self.recode(path) |
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
268 |
if topath is not None: |
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
269 |
topath = self.recode(topath) |
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
270 |
seen.add(path or topath) |
7053 | 271 |
|
272 |
if topath is None: |
|
273 |
# file deleted |
|
274 |
changes.append((path, revid)) |
|
275 |
continue |
|
276 |
||
277 |
# renamed |
|
278 |
if path and path != topath: |
|
279 |
renames[topath] = path |
|
8035
cb77c0fbec39
convert: remove renamed source files (issue1505)
Xavier ALT <dex@phoenix-ind.net>
parents:
7060
diff
changeset
|
280 |
changes.append((path, revid)) |
7053 | 281 |
|
282 |
# populate the mode cache |
|
283 |
kind, executable = [e[1] for e in (kind, executable)] |
|
8148
adce97d28389
convert/bzr: fix symlink handling (issue1626)
Patrick Mezard <pmezard@gmail.com>
parents:
8126
diff
changeset
|
284 |
mode = ((executable and 'x') or (kind == 'symlink' and 'l') |
7053 | 285 |
or '') |
286 |
self._modecache[(topath, revid)] = mode |
|
287 |
changes.append((topath, revid)) |
|
288 |
||
289 |
return changes, renames |
|
290 |
||
291 |
def _filterghosts(self, ids): |
|
292 |
"""Filters out ghost revisions which hg does not support, see |
|
293 |
<http://bazaar-vcs.org/GhostRevision> |
|
294 |
""" |
|
295 |
parentmap = self.sourcerepo.get_parent_map(ids) |
|
7060
972cce34f345
convert: fixed python2.3 incompatibility in bzr source (generator expression)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7053
diff
changeset
|
296 |
parents = tuple([parent for parent in ids if parent in parentmap]) |
7053 | 297 |
return parents |