##// END OF EJS Templates
convert: use repo.join instead of referencing ".hg" directly
Martin Geisler -
r15069:650d81a3 default
parent child Browse files
Show More
@@ -70,10 +70,10 b' class mercurial_sink(converter_sink):'
70 self.wlock.release()
70 self.wlock.release()
71
71
72 def revmapfile(self):
72 def revmapfile(self):
73 return os.path.join(self.path, ".hg", "shamap")
73 return self.repo.join("shamap")
74
74
75 def authorfile(self):
75 def authorfile(self):
76 return os.path.join(self.path, ".hg", "authormap")
76 return self.repo.join("authormap")
77
77
78 def getheads(self):
78 def getheads(self):
79 h = self.repo.changelog.heads()
79 h = self.repo.changelog.heads()
@@ -364,8 +364,7 b' class mercurial_source(converter_source)'
364
364
365 def converted(self, rev, destrev):
365 def converted(self, rev, destrev):
366 if self.convertfp is None:
366 if self.convertfp is None:
367 self.convertfp = open(os.path.join(self.path, '.hg', 'shamap'),
367 self.convertfp = open(self.repo.join('shamap'), 'a')
368 'a')
369 self.convertfp.write('%s %s\n' % (destrev, rev))
368 self.convertfp.write('%s %s\n' % (destrev, rev))
370 self.convertfp.flush()
369 self.convertfp.flush()
371
370
@@ -27,7 +27,7 b' Explicit --authors'
27 sorting...
27 sorting...
28 converting...
28 converting...
29 0 foo
29 0 foo
30 Writing author map file new/.hg/authormap
30 Writing author map file $TESTTMP/new/.hg/authormap
31 $ cat new/.hg/authormap
31 $ cat new/.hg/authormap
32 user name=Long User Name
32 user name=Long User Name
33 $ hg -Rnew log
33 $ hg -Rnew log
@@ -44,7 +44,7 b' Implicit .hg/authormap'
44 $ hg init new
44 $ hg init new
45 $ mv authormap.txt new/.hg/authormap
45 $ mv authormap.txt new/.hg/authormap
46 $ hg convert orig new
46 $ hg convert orig new
47 Ignoring bad line in author map file new/.hg/authormap: this line is ignored
47 Ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
48 scanning source...
48 scanning source...
49 sorting...
49 sorting...
50 converting...
50 converting...
General Comments 0
You need to be logged in to leave comments. Login now