##// END OF EJS Templates
convert: fix a few residual bugs in darcs importer
Bryan O'Sullivan -
r5362:4ad2a18a default
parent child Browse files
Show More
@@ -1,137 +1,137 b''
1 # darcs support for the convert extension
1 # darcs support for the convert extension
2
2
3 from common import NoRepo, commit, converter_source
3 from common import NoRepo, commit, converter_source
4 from mercurial.i18n import _
4 from mercurial.i18n import _
5 from mercurial import util
5 from mercurial import util
6 import os, shutil, tempfile
6 import os, shutil, tempfile
7
7
8 # The naming drift of ElementTree is fun!
8 # The naming drift of ElementTree is fun!
9
9
10 try: from xml.etree.cElementTree import ElementTree
10 try: from xml.etree.cElementTree import ElementTree
11 except ImportError:
11 except ImportError:
12 try: from xml.etree.ElementTree import ElementTree
12 try: from xml.etree.ElementTree import ElementTree
13 except ImportError:
13 except ImportError:
14 try: from elementtree.cElementTree import ElementTree
14 try: from elementtree.cElementTree import ElementTree
15 except ImportError:
15 except ImportError:
16 try: from elementtree.ElementTree import ElementTree
16 try: from elementtree.ElementTree import ElementTree
17 except ImportError: ElementTree = None
17 except ImportError: ElementTree = None
18
18
19
19
20 class darcs_source(converter_source):
20 class darcs_source(converter_source):
21 def __init__(self, ui, path, rev=None):
21 def __init__(self, ui, path, rev=None):
22 super(darcs_source, self).__init__(ui, path, rev=rev)
22 super(darcs_source, self).__init__(ui, path, rev=rev)
23
23
24 if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
24 if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
25 raise NoRepo("couldn't open darcs repo %s" % path)
25 raise NoRepo("couldn't open darcs repo %s" % path)
26
26
27 if ElementTree is None:
27 if ElementTree is None:
28 raise util.Abort(_("Python ElementTree module is not available"))
28 raise util.Abort(_("Python ElementTree module is not available"))
29
29
30 self.path = os.path.realpath(path)
30 self.path = os.path.realpath(path)
31
31
32 self.lastrev = None
32 self.lastrev = None
33 self.changes = {}
33 self.changes = {}
34 self.parents = {}
34 self.parents = {}
35 self.tags = {}
35 self.tags = {}
36
36
37 def before(self):
37 def before(self):
38 self.tmppath = tempfile.mkdtemp(
38 self.tmppath = tempfile.mkdtemp(
39 prefix='convert-' + os.path.basename(self.path) + '-')
39 prefix='convert-' + os.path.basename(self.path) + '-')
40 output, status = self.run('init', repodir=self.tmppath)
40 output, status = self.run('init', repodir=self.tmppath)
41 self.checkexit(status)
41 self.checkexit(status)
42
42
43 tree = self.xml('changes', '--xml-output', '--summary')
43 tree = self.xml('changes', '--xml-output', '--summary')
44 tagname = None
44 tagname = None
45 child = None
45 child = None
46 for elt in tree.findall('patch'):
46 for elt in tree.findall('patch'):
47 node = elt.get('hash')
47 node = elt.get('hash')
48 name = elt.findtext('name', '')
48 name = elt.findtext('name', '')
49 if name.startswith('TAG '):
49 if name.startswith('TAG '):
50 tagname = name[4:].strip()
50 tagname = name[4:].strip()
51 elif tagname is not None:
51 elif tagname is not None:
52 self.tags[tagname] = node
52 self.tags[tagname] = node
53 tagname = None
53 tagname = None
54 self.changes[node] = elt
54 self.changes[node] = elt
55 self.parents[child] = [node]
55 self.parents[child] = [node]
56 child = node
56 child = node
57 self.parents[child] = []
57 self.parents[child] = []
58
58
59 def after(self):
59 def after(self):
60 self.ui.debug('cleaning up %s\n' % self.tmppath)
60 self.ui.debug('cleaning up %s\n' % self.tmppath)
61 #shutil.rmtree(self.tmppath, ignore_errors=True)
61 shutil.rmtree(self.tmppath, ignore_errors=True)
62
62
63 def _run(self, cmd, *args, **kwargs):
63 def _run(self, cmd, *args, **kwargs):
64 cmdline = 'darcs %s --repodir=%r %s </dev/null' % (
64 cmdline = 'darcs %s --repodir=%r %s </dev/null' % (
65 cmd, kwargs.get('repodir', self.path), ' '.join(args))
65 cmd, kwargs.get('repodir', self.path), ' '.join(args))
66 self.ui.debug(cmdline, '\n')
66 self.ui.debug(cmdline, '\n')
67 return os.popen(cmdline, 'r')
67 return os.popen(cmdline, 'r')
68
68
69 def run(self, cmd, *args, **kwargs):
69 def run(self, cmd, *args, **kwargs):
70 fp = self._run(cmd, *args, **kwargs)
70 fp = self._run(cmd, *args, **kwargs)
71 output = fp.read()
71 output = fp.read()
72 return output, fp.close()
72 return output, fp.close()
73
73
74 def checkexit(self, status, output=''):
74 def checkexit(self, status, output=''):
75 if status:
75 if status:
76 if output:
76 if output:
77 ui.warn(_('darcs error:\n'))
77 self.ui.warn(_('darcs error:\n'))
78 ui.warn(output)
78 self.ui.warn(output)
79 msg = util.explain_exit(status)[0]
79 msg = util.explain_exit(status)[0]
80 raise util.Abort(_('darcs %s') % msg)
80 raise util.Abort(_('darcs %s') % msg)
81
81
82 def xml(self, cmd, *opts):
82 def xml(self, cmd, *opts):
83 etree = ElementTree()
83 etree = ElementTree()
84 fp = self._run(cmd, *opts)
84 fp = self._run(cmd, *opts)
85 etree.parse(fp)
85 etree.parse(fp)
86 self.checkexit(fp.close())
86 self.checkexit(fp.close())
87 return etree.getroot()
87 return etree.getroot()
88
88
89 def getheads(self):
89 def getheads(self):
90 return self.parents[None]
90 return self.parents[None]
91
91
92 def getcommit(self, rev):
92 def getcommit(self, rev):
93 elt = self.changes[rev]
93 elt = self.changes[rev]
94 date = util.strdate(elt.get('local_date'), '%a %b %d %H:%M:%S %Z %Y')
94 date = util.strdate(elt.get('local_date'), '%a %b %d %H:%M:%S %Z %Y')
95 desc = elt.findtext('name') + '\n' + elt.findtext('comment', '')
95 desc = elt.findtext('name') + '\n' + elt.findtext('comment', '')
96 return commit(author=elt.get('author'), date=util.datestr(date),
96 return commit(author=elt.get('author'), date=util.datestr(date),
97 desc=desc.strip(), parents=self.parents[rev])
97 desc=desc.strip(), parents=self.parents[rev])
98
98
99 def pull(self, rev):
99 def pull(self, rev):
100 output, status = self.run('pull %r --all --match="hash %s"' %
100 output, status = self.run('pull %r --all --match="hash %s"' %
101 (self.path, rev),
101 (self.path, rev),
102 '--no-test', '--no-posthook',
102 '--no-test', '--no-posthook',
103 '--external-merge=/bin/false',
103 '--external-merge=/bin/false',
104 repodir=self.tmppath)
104 repodir=self.tmppath)
105 if status:
105 if status:
106 if output.find('We have conflicts in') == -1:
106 if output.find('We have conflicts in') == -1:
107 self.checkexit(status, output)
107 self.checkexit(status, output)
108 output, status = self.run('revert --all', repodir=self.tmppath)
108 output, status = self.run('revert --all', repodir=self.tmppath)
109 self.checkexit(status, output)
109 self.checkexit(status, output)
110
110
111 def getchanges(self, rev):
111 def getchanges(self, rev):
112 self.pull(rev)
112 self.pull(rev)
113 copies = {}
113 copies = {}
114 changes = []
114 changes = []
115 for elt in self.changes[rev].find('summary').getchildren():
115 for elt in self.changes[rev].find('summary').getchildren():
116 if elt.tag in ('add_directory', 'remove_directory'):
116 if elt.tag in ('add_directory', 'remove_directory'):
117 continue
117 continue
118 if elt.tag == 'move':
118 if elt.tag == 'move':
119 changes.append((elt.get('from'), rev))
119 changes.append((elt.get('from'), rev))
120 copies[elt.get('from')] = elt.get('to')
120 copies[elt.get('from')] = elt.get('to')
121 else:
121 else:
122 changes.append((elt.text.strip(), rev))
122 changes.append((elt.text.strip(), rev))
123 changes.sort()
123 changes.sort()
124 self.lastrev = rev
124 self.lastrev = rev
125 return changes, copies
125 return changes, copies
126
126
127 def getfile(self, name, rev):
127 def getfile(self, name, rev):
128 if rev != self.lastrev:
128 if rev != self.lastrev:
129 raise util.Abort(_('internal calling inconsistency'))
129 raise util.Abort(_('internal calling inconsistency'))
130 return open(os.path.join(self.tmppath, name), 'rb').read()
130 return open(os.path.join(self.tmppath, name), 'rb').read()
131
131
132 def getmode(self, name, rev):
132 def getmode(self, name, rev):
133 mode = os.lstat(os.path.join(self.tmppath, name)).st_mode
133 mode = os.lstat(os.path.join(self.tmppath, name)).st_mode
134 return (mode & 0111) and 'x' or ''
134 return (mode & 0111) and 'x' or ''
135
135
136 def gettags(self):
136 def gettags(self):
137 return self.tags
137 return self.tags
General Comments 0
You need to be logged in to leave comments. Login now