author | Gregory Szorc <gregory.szorc@gmail.com> |
Mon, 21 Feb 2022 10:25:53 -0700 | |
changeset 48978 | 426cf9d98a5d |
parent 48966 | 6000f5b25c9b |
child 49004 | f254fc73d956 |
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 |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
8 |
# This module is for handling Breezy imports or `brz`, but it's also compatible |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
9 |
# with Bazaar or `bzr`, that was formerly known as Bazaar-NG; |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
10 |
# it cannot access `bar` repositories, but they were never used very much. |
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 _ |
43105
649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43077
diff
changeset
|
15 |
from mercurial import ( |
649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43077
diff
changeset
|
16 |
demandimport, |
649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43077
diff
changeset
|
17 |
error, |
649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43077
diff
changeset
|
18 |
pycompat, |
47632
3b2d080f11b5
windows: use abspath in convert.bzr
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47383
diff
changeset
|
19 |
util, |
43105
649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43077
diff
changeset
|
20 |
) |
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
21 |
from . import common |
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
22 |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
23 |
|
7053 | 24 |
# these do not work with demandimport, blacklist |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
25 |
demandimport.IGNORES.update( |
45957
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
43105
diff
changeset
|
26 |
[ |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
27 |
b'breezy.transactions', |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
28 |
b'breezy.urlutils', |
45957
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
43105
diff
changeset
|
29 |
b'ElementPath', |
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
43105
diff
changeset
|
30 |
] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
31 |
) |
7053 | 32 |
|
33 |
try: |
|
34 |
# bazaar imports |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
35 |
import breezy.bzr.bzrdir |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
36 |
import breezy.errors |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
37 |
import breezy.revision |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
38 |
import breezy.revisionspec |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
39 |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
40 |
bzrdir = breezy.bzr.bzrdir |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
41 |
errors = breezy.errors |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
42 |
revision = breezy.revision |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
43 |
revisionspec = breezy.revisionspec |
34488
6bda8a9d8431
convert: fix the RevisionSpec import in the bzr module
Saurabh Singh <singhsrb@fb.com>
parents:
29612
diff
changeset
|
44 |
revisionspec.RevisionSpec |
7053 | 45 |
except ImportError: |
46 |
pass |
|
47 |
||
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
48 |
supportedkinds = ('file', 'symlink') |
8045
e09a2f2ef85d
convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents:
8035
diff
changeset
|
49 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
50 |
|
28411
098bb5660580
convert: bzr use absolute_import
timeless <timeless@mozdev.org>
parents:
26779
diff
changeset
|
51 |
class bzr_source(common.converter_source): |
7053 | 52 |
"""Reads Bazaar repositories by using the Bazaar Python libraries""" |
53 |
||
35187
671aba341d90
convert: save an indicator of the repo type for sources and sinks
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
54 |
def __init__(self, ui, repotype, path, revs=None): |
671aba341d90
convert: save an indicator of the repo type for sources and sinks
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
55 |
super(bzr_source, self).__init__(ui, repotype, path, revs=revs) |
7053 | 56 |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
57 |
if not os.path.exists(os.path.join(path, b'.bzr')): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
58 |
raise common.NoRepo( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
59 |
_(b'%s does not look like a Bazaar repository') % path |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
60 |
) |
7973
db3a68fd9387
convert: attempt to check repo type before checking for tool
Matt Mackall <mpm@selenic.com>
parents:
7060
diff
changeset
|
61 |
|
7053 | 62 |
try: |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
63 |
# access breezy stuff |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
64 |
bzrdir |
7053 | 65 |
except NameError: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
66 |
raise common.NoRepo(_(b'Bazaar modules could not be loaded')) |
7053 | 67 |
|
47632
3b2d080f11b5
windows: use abspath in convert.bzr
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47383
diff
changeset
|
68 |
path = util.abspath(path) |
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
69 |
self._checkrepotype(path) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
70 |
try: |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
71 |
bzr_dir = bzrdir.BzrDir.open(path.decode()) |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
72 |
self.sourcerepo = bzr_dir.open_repository() |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
73 |
except errors.NoRepositoryPresent: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
74 |
raise common.NoRepo( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
75 |
_(b'%s does not look like a Bazaar repository') % path |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
76 |
) |
7053 | 77 |
self._parentids = {} |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
78 |
self._saverev = ui.configbool(b'convert', b'bzr.saverev') |
7053 | 79 |
|
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
80 |
def _checkrepotype(self, path): |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
81 |
# 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
|
82 |
# 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
|
83 |
try: |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
84 |
dir = bzrdir.BzrDir.open_containing(path.decode())[0] |
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
85 |
try: |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
86 |
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
|
87 |
branch = tree.branch |
12063
516b000fbb7e
cleanup: remove unused variables
Brodie Rao <brodie@bitheap.org>
parents:
11134
diff
changeset
|
88 |
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
|
89 |
tree = None |
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
90 |
branch = dir.open_branch() |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
91 |
if ( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
92 |
tree is not None |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
93 |
and tree.controldir.root_transport.base |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
94 |
!= branch.controldir.root_transport.base |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
95 |
): |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
96 |
self.ui.warn( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
97 |
_( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
98 |
b'warning: lightweight checkouts may cause ' |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
99 |
b'conversion failures, try with a regular ' |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
100 |
b'branch instead.\n' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
101 |
) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
102 |
) |
16689
f366d4c2ff34
cleanup: replace naked excepts with except Exception: ...
Brodie Rao <brodie@sf.io>
parents:
16099
diff
changeset
|
103 |
except Exception: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
104 |
self.ui.note(_(b'bzr source type could not be determined\n')) |
8470
dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)
Patrick Mezard <pmezard@gmail.com>
parents:
8434
diff
changeset
|
105 |
|
7053 | 106 |
def before(self): |
107 |
"""Before the conversion begins, acquire a read lock |
|
108 |
for all the operations that might need it. Fortunately |
|
109 |
read locks don't block other reads or writes to the |
|
110 |
repository, so this shouldn't have any impact on the usage of |
|
111 |
the source repository. |
|
112 |
||
113 |
The alternative would be locking on every operation that |
|
114 |
needs locks (there are currently two: getting the file and |
|
115 |
getting the parent map) and releasing immediately after, |
|
116 |
but this approach can take even 40% longer.""" |
|
117 |
self.sourcerepo.lock_read() |
|
118 |
||
119 |
def after(self): |
|
120 |
self.sourcerepo.unlock() |
|
121 |
||
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
122 |
def _bzrbranches(self): |
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
123 |
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
|
124 |
|
7053 | 125 |
def getheads(self): |
25748
baea47cafe75
convert: add support for specifying multiple revs
Durham Goode <durham@fb.com>
parents:
24395
diff
changeset
|
126 |
if not self.revs: |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
127 |
# 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
|
128 |
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
|
129 |
else: |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
130 |
revid = None |
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
131 |
for branch in self._bzrbranches(): |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
132 |
try: |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
133 |
revspec = self.revs[0].decode() |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
134 |
r = revisionspec.RevisionSpec.from_string(revspec) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
135 |
info = r.in_history(branch) |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
136 |
except errors.BzrError: |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
137 |
pass |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
138 |
revid = info.rev_id |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
139 |
if revid is None: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
140 |
raise error.Abort( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
141 |
_(b'%s is not a valid revision') % self.revs[0] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
142 |
) |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
143 |
heads = [revid] |
16061
915e06faa8f3
convert/bzr: handle empty bzr repositories (issue3233)
Patrick Mezard <pmezard@gmail.com>
parents:
16060
diff
changeset
|
144 |
# Empty repositories return 'null:', which cannot be retrieved |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
145 |
heads = [h for h in heads if h != b'null:'] |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
146 |
return heads |
7053 | 147 |
|
148 |
def getfile(self, name, rev): |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
149 |
name = name.decode() |
7053 | 150 |
revtree = self.sourcerepo.revision_tree(rev) |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
151 |
|
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
152 |
try: |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
153 |
kind = revtree.kind(name) |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
154 |
except breezy.errors.NoSuchFile: |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
155 |
return None, None |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
156 |
if kind not in supportedkinds: |
7053 | 157 |
# 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
|
158 |
return None, None |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
159 |
mode = self._modecache[(name.encode(), rev)] |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
160 |
if kind == 'symlink': |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
161 |
target = revtree.get_symlink_target(name) |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
162 |
if target is None: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
163 |
raise error.Abort( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
164 |
_(b'%s.%s symlink has no target') % (name, rev) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
165 |
) |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
166 |
return target.encode(), mode |
8423
eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)
Patrick Mezard <pmezard@gmail.com>
parents:
8165
diff
changeset
|
167 |
else: |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
168 |
sio = revtree.get_file(name) |
11134
33010ff1fd6f
convert: merge sources getmode() into getfile()
Patrick Mezard <pmezard@gmail.com>
parents:
10939
diff
changeset
|
169 |
return sio.read(), mode |
7053 | 170 |
|
22300
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
22296
diff
changeset
|
171 |
def getchanges(self, version, full): |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
22296
diff
changeset
|
172 |
if full: |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
173 |
raise error.Abort(_(b"convert from cvs does not support --full")) |
7053 | 174 |
self._modecache = {} |
175 |
self._revtree = self.sourcerepo.revision_tree(version) |
|
176 |
# get the parentids from the cache |
|
177 |
parentids = self._parentids.pop(version) |
|
178 |
# only diff against first parent id |
|
179 |
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
|
180 |
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
|
181 |
return files, changes, set() |
7053 | 182 |
|
183 |
def getcommit(self, version): |
|
184 |
rev = self.sourcerepo.get_revision(version) |
|
185 |
# populate parent id cache |
|
186 |
if not rev.parent_ids: |
|
187 |
parents = [] |
|
188 |
self._parentids[version] = (revision.NULL_REVISION,) |
|
189 |
else: |
|
190 |
parents = self._filterghosts(rev.parent_ids) |
|
191 |
self._parentids[version] = parents |
|
192 |
||
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
193 |
branch = rev.properties.get('branch-nick', 'default') |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
194 |
if branch == 'trunk': |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
195 |
branch = 'default' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
196 |
return common.commit( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
197 |
parents=parents, |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
198 |
date=b'%d %d' % (rev.timestamp, -rev.timezone), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
199 |
author=self.recode(rev.committer), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
200 |
desc=self.recode(rev.message), |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
201 |
branch=branch.encode('utf8'), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
202 |
rev=version, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
203 |
saverev=self._saverev, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
204 |
) |
7053 | 205 |
|
206 |
def gettags(self): |
|
207 |
bytetags = {} |
|
16099
4e4c416a0b1f
convert/bzr: ignore nested repos when listing branches (issue3254)
Patrick Mezard <patrick@mezard.eu>
parents:
16061
diff
changeset
|
208 |
for branch in self._bzrbranches(): |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
209 |
if not branch.supports_tags(): |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
210 |
return {} |
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
211 |
tagdict = branch.tags.get_tag_dict() |
43105
649d3ac37a12
py3: define and use pycompat.iteritems() for hgext/
Gregory Szorc <gregory.szorc@gmail.com>
parents:
43077
diff
changeset
|
212 |
for name, rev in pycompat.iteritems(tagdict): |
16060
f84dda152a55
convert/bzr: convert all branches (issue3229) (BC)
Patrick Mezard <pmezard@gmail.com>
parents:
16059
diff
changeset
|
213 |
bytetags[self.recode(name)] = rev |
7053 | 214 |
return bytetags |
215 |
||
216 |
def getchangedfiles(self, rev, i): |
|
217 |
self._modecache = {} |
|
218 |
curtree = self.sourcerepo.revision_tree(rev) |
|
219 |
if i is not None: |
|
8165
78658990c725
convert/bzr: make it work with filemaps (issue1631)
Patrick Mezard <pmezard@gmail.com>
parents:
8148
diff
changeset
|
220 |
parentid = self._parentids[rev][i] |
7053 | 221 |
else: |
222 |
# no parent id, get the empty revision |
|
223 |
parentid = revision.NULL_REVISION |
|
224 |
||
225 |
prevtree = self.sourcerepo.revision_tree(parentid) |
|
226 |
changes = [e[0] for e in self._gettreechanges(curtree, prevtree)[0]] |
|
227 |
return changes |
|
228 |
||
229 |
def _gettreechanges(self, current, origin): |
|
10394
4612cded5176
fix coding style (reported by pylint)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10282
diff
changeset
|
230 |
revid = current._revision_id |
7053 | 231 |
changes = [] |
232 |
renames = {} |
|
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
233 |
seen = set() |
35001
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
234 |
|
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
235 |
# Fall back to the deprecated attribute for legacy installations. |
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
236 |
try: |
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
237 |
inventory = origin.root_inventory |
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
238 |
except AttributeError: |
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
239 |
inventory = origin.inventory |
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
240 |
|
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
241 |
# 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
|
242 |
# handle nested renames correctly, most specific first. |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
243 |
|
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
244 |
def key(c): |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
245 |
return c.path[0] or c.path[1] or "" |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
246 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
247 |
curchanges = sorted( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
248 |
current.iter_changes(origin), |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
249 |
key=key, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
250 |
reverse=True, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
251 |
) |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
252 |
for change in curchanges: |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
253 |
paths = change.path |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
254 |
kind = change.kind |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
255 |
executable = change.executable |
7053 | 256 |
if paths[0] == u'' or paths[1] == u'': |
257 |
# ignore changes to tree root |
|
258 |
continue |
|
259 |
||
260 |
# bazaar tracks directories, mercurial does not, so |
|
261 |
# we have to rename the directory contents |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
262 |
if kind[1] == 'directory': |
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
263 |
if kind[0] not in (None, 'directory'): |
8126
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
264 |
# 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
|
265 |
# so it can be removed. |
13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
8045
diff
changeset
|
266 |
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
|
267 |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
268 |
if kind[0] == 'directory' and None not in paths: |
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
269 |
renaming = paths[0] != paths[1] |
7053 | 270 |
# neither an add nor an delete - a move |
271 |
# rename all directory contents manually |
|
35001
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
272 |
subdir = inventory.path2id(paths[0]) |
7053 | 273 |
# get all child-entries of the directory |
35001
759234670d19
convert: restore the ability to use bzr < 2.6.0 (issue5733)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34488
diff
changeset
|
274 |
for name, entry in inventory.iter_entries(subdir): |
7053 | 275 |
# hg does not track directory renames |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
276 |
if entry.kind == 'directory': |
7053 | 277 |
continue |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
278 |
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
|
279 |
if frompath in seen: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
280 |
# 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
|
281 |
# This is important when you have: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
282 |
# a => b |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
283 |
# a/c => a/c |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
284 |
# 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
|
285 |
continue |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
286 |
seen.add(frompath) |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
287 |
if not renaming: |
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
288 |
continue |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
289 |
topath = self.recode(paths[1] + '/' + name) |
7053 | 290 |
# register the files as changed |
291 |
changes.append((frompath, revid)) |
|
292 |
changes.append((topath, revid)) |
|
293 |
# add to mode cache |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
294 |
mode = ( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
295 |
(entry.executable and b'x') |
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
296 |
or (entry.kind == 'symlink' and b's') |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
297 |
or b'' |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
38573
diff
changeset
|
298 |
) |
7053 | 299 |
self._modecache[(topath, revid)] = mode |
300 |
# register the change as move |
|
301 |
renames[topath] = frompath |
|
302 |
||
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
16689
diff
changeset
|
303 |
# no further changes, go to the next change |
7053 | 304 |
continue |
305 |
||
306 |
# 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
|
307 |
path, topath = paths |
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
308 |
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
|
309 |
path = self.recode(path) |
f5b6046f6ce8
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Patrick Mezard <pmezard@gmail.com>
parents:
15461
diff
changeset
|
310 |
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
|
311 |
topath = self.recode(topath) |
15461
6ba2fc0a87ab
convert/bzr: correctly handle divergent nested renames (issue3089)
Patrick Mezard <pmezard@gmail.com>
parents:
12063
diff
changeset
|
312 |
seen.add(path or topath) |
7053 | 313 |
|
314 |
if topath is None: |
|
315 |
# file deleted |
|
316 |
changes.append((path, revid)) |
|
317 |
continue |
|
318 |
||
319 |
# renamed |
|
320 |
if path and path != topath: |
|
321 |
renames[topath] = path |
|
8035
cb77c0fbec39
convert: remove renamed source files (issue1505)
Xavier ALT <dex@phoenix-ind.net>
parents:
7060
diff
changeset
|
322 |
changes.append((path, revid)) |
7053 | 323 |
|
324 |
# populate the mode cache |
|
325 |
kind, executable = [e[1] for e in (kind, executable)] |
|
47383
26127236b229
convert-bazaar: use breezy package instead of old bzr one
Raphaël Gomès <rgomes@octobus.net>
parents:
45957
diff
changeset
|
326 |
mode = (executable and b'x') or (kind == 'symlink' and b'l') or b'' |
7053 | 327 |
self._modecache[(topath, revid)] = mode |
328 |
changes.append((topath, revid)) |
|
329 |
||
330 |
return changes, renames |
|
331 |
||
332 |
def _filterghosts(self, ids): |
|
333 |
"""Filters out ghost revisions which hg does not support, see |
|
334 |
<http://bazaar-vcs.org/GhostRevision> |
|
335 |
""" |
|
336 |
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
|
337 |
parents = tuple([parent for parent in ids if parent in parentmap]) |
7053 | 338 |
return parents |