##// END OF EJS Templates
splicemap: improve error handling when source is git (issue2084)...
Ben Goswami -
r19121:478a0460 default
parent child Browse files
Show More
@@ -296,3 +296,8 class convert_git(converter_source):
296 pass
296 pass
297
297
298 return bookmarks
298 return bookmarks
299
300 def checkrevformat(self, revstr):
301 """ git revision string is a 40 byte hex """
302 self.checkhexformat(revstr)
303
@@ -13,6 +13,10
13 $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
13 $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
14 $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
14 $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
15 $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
15 $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
16 $ INVALIDID1=afd12345af
17 $ INVALIDID2=28173x36ddd1e67bf7098d541130558ef5534a86
18 $ VALIDID1=39b3d83f9a69a9ba4ebb111461071a0af0027357
19 $ VALIDID2=8dd6476bd09d9c7776355dc454dafe38efaec5da
16 $ count=10
20 $ count=10
17 $ commit()
21 $ commit()
18 > {
22 > {
@@ -298,6 +302,36 test sub modules
298 $ commit -a -m 'addsubmodule' >/dev/null 2>/dev/null
302 $ commit -a -m 'addsubmodule' >/dev/null 2>/dev/null
299 $ cd ..
303 $ cd ..
300
304
305 test invalid splicemap1
306
307 $ cat > splicemap <<EOF
308 > $VALIDID1
309 > EOF
310 $ hg convert --splicemap splicemap git-repo2 git-repo2-splicemap1-hg
311 initializing destination git-repo2-splicemap1-hg repository
312 abort: syntax error in splicemap(1): child parent1[,parent2] expected
313 [255]
314
315 test invalid splicemap2
316
317 $ cat > splicemap <<EOF
318 > $VALIDID1 $VALIDID2, $VALIDID2, $VALIDID2
319 > EOF
320 $ hg convert --splicemap splicemap git-repo2 git-repo2-splicemap2-hg
321 initializing destination git-repo2-splicemap2-hg repository
322 abort: syntax error in splicemap(1): child parent1[,parent2] expected
323 [255]
324
325 test invalid splicemap3
326
327 $ cat > splicemap <<EOF
328 > $INVALIDID1 $INVALIDID2
329 > EOF
330 $ hg convert --splicemap splicemap git-repo2 git-repo2-splicemap3-hg
331 initializing destination git-repo2-splicemap3-hg repository
332 abort: splicemap entry afd12345af is not a valid revision identifier
333 [255]
334
301 convert sub modules
335 convert sub modules
302 $ hg convert git-repo6 git-repo6-hg
336 $ hg convert git-repo6 git-repo6-hg
303 initializing destination git-repo6-hg repository
337 initializing destination git-repo6-hg repository
General Comments 0
You need to be logged in to leave comments. Login now