##// END OF EJS Templates
Merge with crew-stable
Patrick Mezard -
r10696:28e9a990 merge default
parent child Browse files
Show More
@@ -124,9 +124,9 b' def createlog(ui, directory=None, root="'
124 # Get the real directory in the repository
124 # Get the real directory in the repository
125 try:
125 try:
126 prefix = open(os.path.join('CVS','Repository')).read().strip()
126 prefix = open(os.path.join('CVS','Repository')).read().strip()
127 directory = prefix
127 if prefix == ".":
128 if prefix == ".":
128 prefix = ""
129 prefix = ""
129 directory = prefix
130 except IOError:
130 except IOError:
131 raise logerror('Not a CVS sandbox')
131 raise logerror('Not a CVS sandbox')
132
132
@@ -184,7 +184,11 b' def createlog(ui, directory=None, root="'
184 p = util.normpath(getrepopath(root))
184 p = util.normpath(getrepopath(root))
185 if not p.endswith('/'):
185 if not p.endswith('/'):
186 p += '/'
186 p += '/'
187 prefix = p + util.normpath(prefix)
187 if prefix:
188 # looks like normpath replaces "" by "."
189 prefix = p + util.normpath(prefix)
190 else:
191 prefix = p
188 cmd.append(['log', 'rlog'][rlog])
192 cmd.append(['log', 'rlog'][rlog])
189 if date:
193 if date:
190 # no space between option and date string
194 # no space between option and date string
@@ -75,6 +75,15 b' hg convert --filemap filemap src src-fil'
75 hgcat b/c
75 hgcat b/c
76 hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
76 hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
77
77
78 echo % 'convert full repository (issue1649)'
79 cvscall -q -d "$CVSROOT" checkout -d srcfull "." | grep -v CVSROOT
80 ls srcfull
81 hg convert srcfull srcfull-hg \
82 | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' \
83 | grep -v 'log entries' | grep -v 'hook:'
84 hg cat -r tip srcfull-hg/src/a
85 hg cat -r tip srcfull-hg/src/b/c
86
78 echo % commit new file revisions
87 echo % commit new file revisions
79 cd src
88 cd src
80 echo a >> a
89 echo a >> a
@@ -53,6 +53,28 b' c'
53 2 update tags files: .hgtags
53 2 update tags files: .hgtags
54 1 ci0 files: b/c
54 1 ci0 files: b/c
55 0 Initial revision files: b/c
55 0 Initial revision files: b/c
56 % convert full repository (issue1649)
57 U srcfull/src/a
58 U srcfull/src/b/c
59 CVS
60 CVSROOT
61 src
62 initializing destination srcfull-hg repository
63 connecting to cvsrepo
64 scanning source...
65 collecting CVS rlog
66 creating changesets
67 4 changeset entries
68 sorting...
69 converting...
70 3 Initial revision
71 2 import
72 1 initial checkin
73 0 ci0
74 updating tags
75 a
76 c
77 c
56 % commit new file revisions
78 % commit new file revisions
57 checking in src/a,v
79 checking in src/a,v
58 checking in src/b/c,v
80 checking in src/b/c,v
General Comments 0
You need to be logged in to leave comments. Login now