##// END OF EJS Templates
convert: add a config knob for not saving the bzr revision...
Matt Harbison -
r38591:85da230c default
parent child Browse files
Show More
@@ -204,6 +204,14 b' def convert(ui, src, dest=None, revmapfi'
204
204
205 :convert.hg.revs: revset specifying the source revisions to convert.
205 :convert.hg.revs: revset specifying the source revisions to convert.
206
206
207 Bazaar Source
208 #############
209
210 The following options can be used with ``--config``:
211
212 :convert.bzr.saverev: whether to store the original Bazaar commit ID in
213 the metadata of the destination commit. The default is True.
214
207 CVS Source
215 CVS Source
208 ##########
216 ##########
209
217
@@ -65,6 +65,7 b' class bzr_source(common.converter_source'
65 raise common.NoRepo(_('%s does not look like a Bazaar repository')
65 raise common.NoRepo(_('%s does not look like a Bazaar repository')
66 % path)
66 % path)
67 self._parentids = {}
67 self._parentids = {}
68 self._saverev = ui.configbool('convert', 'bzr.saverev')
68
69
69 def _checkrepotype(self, path):
70 def _checkrepotype(self, path):
70 # Lightweight checkouts detection is informational but probably
71 # Lightweight checkouts detection is informational but probably
@@ -175,7 +176,8 b' class bzr_source(common.converter_source'
175 author=self.recode(rev.committer),
176 author=self.recode(rev.committer),
176 desc=self.recode(rev.message),
177 desc=self.recode(rev.message),
177 branch=branch,
178 branch=branch,
178 rev=version)
179 rev=version,
180 saverev=self._saverev)
179
181
180 def gettags(self):
182 def gettags(self):
181 bytetags = {}
183 bytetags = {}
@@ -209,6 +209,9 b" coreconfigitem('committemplate', '.*',"
209 default=None,
209 default=None,
210 generic=True,
210 generic=True,
211 )
211 )
212 coreconfigitem('convert', 'bzr.saverev',
213 default=True,
214 )
212 coreconfigitem('convert', 'cvsps.cache',
215 coreconfigitem('convert', 'cvsps.cache',
213 default=True,
216 default=True,
214 )
217 )
@@ -39,7 +39,7 b' test multiple merges at once'
39 $ bzr merge -q --force ../source-branch2
39 $ bzr merge -q --force ../source-branch2
40 $ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100'
40 $ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100'
41 $ cd ..
41 $ cd ..
42 $ hg convert --datesort source source-hg
42 $ hg convert --datesort --config convert.bzr.saverev=False source source-hg
43 initializing destination source-hg repository
43 initializing destination source-hg repository
44 scanning source...
44 scanning source...
45 sorting...
45 sorting...
@@ -148,6 +148,15 b''
148 convert.hg.revs
148 convert.hg.revs
149 revset specifying the source revisions to convert.
149 revset specifying the source revisions to convert.
150
150
151 Bazaar Source
152 #############
153
154 The following options can be used with "--config":
155
156 convert.bzr.saverev
157 whether to store the original Bazaar commit ID in the
158 metadata of the destination commit. The default is True.
159
151 CVS Source
160 CVS Source
152 ##########
161 ##########
153
162
General Comments 0
You need to be logged in to leave comments. Login now