##// END OF EJS Templates
verify: get rid of some unnecessary local variables...
verify: get rid of some unnecessary local variables Now that all the major functionality has been refactored out, we can delete some unused local variables.

File last commit:

r26779:aaa33ec3 default
r27648:e72e669d default
Show More
darcs.py
208 lines | 7.8 KiB | text/x-python | PythonLexer
Martin Geisler
convert: add copyright and license headers to back-ends
r8250 # darcs.py - darcs support for the convert extension
#
# Copyright 2007-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 from common import NoRepo, checktool, commandline, commit, converter_source
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 from mercurial.i18n import _
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 from mercurial import util, error
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 import os, shutil, tempfile, re, errno
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
# The naming drift of ElementTree is fun!
Matt Mackall
many, many trivial check-code fixups
r10282 try:
Brodie Rao
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)...
r12717 from xml.etree.cElementTree import ElementTree, XMLParser
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 except ImportError:
Matt Mackall
many, many trivial check-code fixups
r10282 try:
Brodie Rao
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)...
r12717 from xml.etree.ElementTree import ElementTree, XMLParser
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 except ImportError:
Matt Mackall
many, many trivial check-code fixups
r10282 try:
Brodie Rao
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)...
r12717 from elementtree.cElementTree import ElementTree, XMLParser
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 except ImportError:
Matt Mackall
many, many trivial check-code fixups
r10282 try:
Brodie Rao
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)...
r12717 from elementtree.ElementTree import ElementTree, XMLParser
Matt Mackall
many, many trivial check-code fixups
r10282 except ImportError:
Matt Mackall
check-code: enable camelcase check, fix up problems
r15457 pass
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 class darcs_source(converter_source, commandline):
Durham Goode
convert: add support for specifying multiple revs...
r25748 def __init__(self, ui, path, revs=None):
converter_source.__init__(self, ui, path, revs=revs)
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 commandline.__init__(self, ui, 'darcs')
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
Patrick Mezard
convert/darcs: improve unsupported format detection (issue2172)
r12393 # check for _darcs, ElementTree so that we can easily skip
# test-convert-darcs if ElementTree is not around
Alexis S. L. Carvalho
test-convert-darcs: skip if we can't find the elementtree module...
r5520 if not os.path.exists(os.path.join(path, '_darcs')):
Martin Geisler
convert: mark strings for translation
r10939 raise NoRepo(_("%s does not look like a darcs repository") % path)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
Patrick Mezard
convert: fail if an external required tool is not found
r5497 checktool('darcs')
Bryan O'Sullivan
issue1251: bail if darcs version is too old
r9242 version = self.run0('--version').splitlines()[0].strip()
if version < '2.1':
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('darcs version 2.1 or newer needed (found %r)')
% version)
Patrick Mezard
convert: fail if an external required tool is not found
r5497
Matt Mackall
check-code: enable camelcase check, fix up problems
r15457 if "ElementTree" not in globals():
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("Python ElementTree module is not available"))
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
Matt Mackall
backout dbdb777502dc (issue3077) (issue3071)...
r15381 self.path = os.path.realpath(path)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
self.lastrev = None
self.changes = {}
self.parents = {}
self.tags = {}
Patrick Mezard
convert/darcs: improve unsupported format detection (issue2172)
r12393 # Check darcs repository format
format = self.format()
if format:
if format in ('darcs-1.0', 'hashed'):
raise NoRepo(_("%s repository format is unsupported, "
"please upgrade") % format)
else:
self.ui.warn(_('failed to detect repository format!'))
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 def before(self):
self.tmppath = tempfile.mkdtemp(
prefix='convert-' + os.path.basename(self.path) + '-')
output, status = self.run('init', repodir=self.tmppath)
self.checkexit(status)
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 tree = self.xml('changes', xml_output=True, summary=True,
repodir=self.path)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 tagname = None
child = None
for elt in tree.findall('patch'):
node = elt.get('hash')
name = elt.findtext('name', '')
if name.startswith('TAG '):
tagname = name[4:].strip()
elif tagname is not None:
self.tags[tagname] = node
tagname = None
self.changes[node] = elt
self.parents[child] = [node]
child = node
self.parents[child] = []
def after(self):
Martin Geisler
do not attempt to translate ui.debug output
r9467 self.ui.debug('cleaning up %s\n' % self.tmppath)
Bryan O'Sullivan
convert: fix a few residual bugs in darcs importer
r5362 shutil.rmtree(self.tmppath, ignore_errors=True)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
Brodie Rao
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)...
r12717 def recode(self, s, encoding=None):
if isinstance(s, unicode):
# XMLParser returns unicode objects for anything it can't
# encode into ASCII. We convert them back to str to get
# recode's normal conversion behavior.
s = s.encode('latin-1')
return super(darcs_source, self).recode(s, encoding)
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 def xml(self, cmd, **kwargs):
Brodie Rao
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)...
r12252 # NOTE: darcs is currently encoding agnostic and will print
# patch metadata byte-for-byte, even in the XML changelog.
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 etree = ElementTree()
Brodie Rao
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)...
r12717 # While we are decoding the XML as latin-1 to be as liberal as
# possible, etree will still raise an exception if any
# non-printable characters are in the XML changelog.
parser = XMLParser(encoding='latin-1')
Patrick Mezard
convert: use subprocess for all commandline calls...
r17413 p = self._run(cmd, **kwargs)
etree.parse(p.stdout, parser=parser)
p.wait()
self.checkexit(p.returncode)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 return etree.getroot()
Patrick Mezard
convert/darcs: improve unsupported format detection (issue2172)
r12393 def format(self):
output, status = self.run('show', 'repo', no_files=True,
repodir=self.path)
self.checkexit(status)
m = re.search(r'^\s*Format:\s*(.*)$', output, re.MULTILINE)
if not m:
return None
return ','.join(sorted(f.strip() for f in m.group(1).split(',')))
Patrick Mezard
convert/darcs: handle directory renaming
r9527 def manifest(self):
man = []
output, status = self.run('show', 'files', no_directories=True,
repodir=self.tmppath)
self.checkexit(status)
for line in output.split('\n'):
path = line[2:]
if path:
man.append(path)
return man
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 def getheads(self):
return self.parents[None]
def getcommit(self, rev):
elt = self.changes[rev]
date = util.strdate(elt.get('local_date'), '%a %b %d %H:%M:%S %Z %Y')
desc = elt.findtext('name') + '\n' + elt.findtext('comment', '')
Brodie Rao
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)...
r12252 # etree can return unicode objects for name, comment, and author,
# so recode() is used to ensure str objects are emitted.
return commit(author=self.recode(elt.get('author')),
FUJIWARA Katsunori
i18n: use locale insensitive format for datetimes as intermediate representation (issue3398)...
r16514 date=util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2'),
Brodie Rao
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)...
r12252 desc=self.recode(desc).strip(),
parents=self.parents[rev])
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
def pull(self, rev):
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 output, status = self.run('pull', self.path, all=True,
match='hash %s' % rev,
no_test=True, no_posthook=True,
external_merge='/bin/false',
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 repodir=self.tmppath)
if status:
if output.find('We have conflicts in') == -1:
self.checkexit(status, output)
Bryan O'Sullivan
convert: abstract darcs's commandline handling
r5512 output, status = self.run('revert', all=True, repodir=self.tmppath)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 self.checkexit(status, output)
Mads Kiilerich
convert: introduce --full for converting all files...
r22300 def getchanges(self, rev, full):
if full:
timeless@mozdev.org
grammar: use does instead of do where appropriate
r26779 raise error.Abort(_("convert from darcs does not support --full"))
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 copies = {}
changes = []
Patrick Mezard
convert/darcs: handle directory renaming
r9527 man = None
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 for elt in self.changes[rev].find('summary').getchildren():
if elt.tag in ('add_directory', 'remove_directory'):
continue
if elt.tag == 'move':
Patrick Mezard
convert/darcs: handle directory renaming
r9527 if man is None:
man = self.manifest()
source, dest = elt.get('from'), elt.get('to')
if source in man:
# File move
changes.append((source, rev))
changes.append((dest, rev))
copies[dest] = source
else:
# Directory move, deduce file moves from manifest
source = source + '/'
for f in man:
if not f.startswith(source):
continue
fdest = dest + '/' + f[len(source):]
changes.append((f, rev))
changes.append((fdest, rev))
copies[fdest] = f
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 else:
changes.append((elt.text.strip(), rev))
Patrick Mezard
convert/darcs: handle directory renaming
r9527 self.pull(rev)
Bryan O'Sullivan
convert: support darcs as a source repo
r5359 self.lastrev = rev
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 return sorted(changes), copies, set()
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
def getfile(self, name, rev):
if rev != self.lastrev:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('internal calling inconsistency'))
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 path = os.path.join(self.tmppath, name)
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 try:
data = util.readfile(path)
mode = os.lstat(path).st_mode
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 if inst.errno == errno.ENOENT:
return None, None
raise
Gregory Szorc
global: mass rewrite to use modern octal syntax...
r25658 mode = (mode & 0o111) and 'x' or ''
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 return data, mode
Bryan O'Sullivan
convert: support darcs as a source repo
r5359
def gettags(self):
return self.tags