hgsubversion: hgsubversion/editor.py annotate

annotate hgsubversion/editor.py @ 942:4d9e80f6ba43

editor: do not touch RevisionData copies from the editor Copy source can be passed when adding the file to the revision data.

author	Patrick Mezard <patrick@mezard.eu>
date	Tue, 25 Sep 2012 21:34:16 +0200
parents	febca88dd261
children	c49c3c418f9d

rev	line source
633 37b2adc64fb3 editor: convert two assertions in apply_textdelta() into raising an IOError Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 601 diff changeset	1 import errno
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	2 import cStringIO
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import sys
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	4
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	5 from mercurial import util as hgutil
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 from mercurial import revlog
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import node
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	8
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 591 diff changeset	9 import svnwrap
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	10 import util
792 ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	11 import svnexternals
34 50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	12
862 6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	13 class NeverClosingStringIO(object):
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	14 def __init__(self):
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	15 self._fp = cStringIO.StringIO()
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	16
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	17 def __getattr__(self, name):
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	18 return getattr(self._fp, name)
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	19
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	20 def close(self):
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	21 # svn 1.7 apply_delta driver now calls close() on passed file
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	22 # object which prevent us from calling getvalue() afterwards.
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	23 pass
6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	24
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	25 class RevisionData(object):
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	26
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	27 __slots__ = [
901 bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 891 diff changeset	28 'file', 'added', 'files', 'deleted', 'rev', 'execfiles', 'symlinks', 'batons',
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	29 'copies', 'missing', 'emptybranches', 'base', 'externals', 'ui',
528 052050ca59d6 replay: disable maybeedit filtering, could discard copy records Patrick Mezard <pmezard@gmail.com> parents: 521 diff changeset	30 'exception',
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	31 ]
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	32
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	33 def __init__(self, ui):
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	34 self.ui = ui
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	35 self.clear()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	36
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	37 def clear(self):
901 bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 891 diff changeset	38 self.added = set()
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	39 self.files = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	40 self.deleted = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	41 self.rev = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	42 self.execfiles = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	43 self.symlinks = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	44 self.batons = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	45 # Map fully qualified destination file paths to module source path
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	46 self.copies = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	47 self.missing = set()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	48 self.emptybranches = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	49 self.externals = {}
434 3e2259fe3c93 editor: move exception data into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 433 diff changeset	50 self.exception = None
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	51
942 4d9e80f6ba43 editor: do not touch RevisionData copies from the editor Patrick Mezard <patrick@mezard.eu> parents: 941 diff changeset	52 def set(self, path, data, isexec=False, islink=False, copypath=None):
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	53 self.files[path] = data
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	54 self.execfiles[path] = isexec
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	55 self.symlinks[path] = islink
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	56 if path in self.deleted:
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	57 del self.deleted[path]
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	58 if path in self.missing:
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	59 self.missing.remove(path)
942 4d9e80f6ba43 editor: do not touch RevisionData copies from the editor Patrick Mezard <patrick@mezard.eu> parents: 941 diff changeset	60 if copypath is not None:
4d9e80f6ba43 editor: do not touch RevisionData copies from the editor Patrick Mezard <patrick@mezard.eu> parents: 941 diff changeset	61 self.copies[path] = copypath
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	62
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	63 def delete(self, path):
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	64 self.deleted[path] = True
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	65 if path in self.files:
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	66 del self.files[path]
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	67 self.execfiles[path] = False
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	68 self.symlinks[path] = False
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	69 self.ui.note('D %s\n' % path)
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	70
436 404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	71 def findmissing(self, svn):
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	72
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	73 if not self.missing:
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	74 return
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	75
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	76 msg = 'fetching %s files that could not use replay.\n'
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	77 self.ui.debug(msg % len(self.missing))
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	78 root = svn.subdir and svn.subdir[1:] or ''
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	79 r = self.rev.revnum
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	80
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	81 files = set()
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	82 for p in self.missing:
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	83 self.ui.note('.')
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	84 self.ui.flush()
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	85 if p[-1] == '/':
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	86 dir = p[len(root):]
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 498 diff changeset	87 new = [p + f for f, k in svn.list_files(dir, r) if k == 'f']
436 404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	88 files.update(new)
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	89 else:
591 4359ddd73b00 strip off root file name only once for missing files Gerhard Weis <gweis@gmx.at> parents: 587 diff changeset	90 files.add(p)
436 404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	91
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	92 i = 1
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	93 self.ui.note('\nfetching files...\n')
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	94 for p in files:
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	95 self.ui.note('.')
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	96 self.ui.flush()
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	97 if i % 50 == 0:
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	98 svn.init_ra_and_client()
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	99 i += 1
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 498 diff changeset	100 data, mode = svn.get_file(p[len(root):], r)
436 404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	101 self.set(p, data, 'x' in mode, 'l' in mode)
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	102
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	103 self.missing = set()
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	104 self.ui.note('\n')
404162e4bb53 editor: move find missing files routine into RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	105
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	106 class EditingError(Exception):
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	107 pass
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	108
940 34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	109 class CopiedFile(object):
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	110 def __init__(self, node, path, copypath):
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	111 self.node = node
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	112 self.path = path
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	113 self.copypath = copypath
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	114
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	115 def resolve(self, repo, ctx=None):
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	116 if ctx is None:
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	117 ctx = repo[self.node]
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	118 fctx = ctx[self.path]
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	119 data = fctx.data()
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	120 flags = fctx.flags()
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	121 islink = 'l' in flags
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	122 if islink:
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	123 data = 'link ' + data
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	124 return data, 'x' in flags, islink, self.copypath
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	125
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 591 diff changeset	126 class HgEditor(svnwrap.Editor):
33 a9c15cae50e5 Faster append-only revmap implementation. Andreas Hartmetz <ahartmetz@gmail.com> parents: 23 diff changeset	127
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	128 def __init__(self, meta):
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	129 self.meta = meta
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	130 self.ui = meta.ui
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	131 self.repo = meta.repo
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	132 self.current = RevisionData(meta.ui)
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	133 self._clear()
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	134
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	135 def _clear(self):
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	136 self._filecounter = 0
940 34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	137 # A mapping of svn paths to CopiedFile entries
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	138 self._svncopies = {}
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	139 # A mapping of batons to (path, data, isexec, islink, copypath) tuples
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	140 self._openfiles = {}
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	141 # A mapping of file paths to batons
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	142 self._openpaths = {}
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	143 self._deleted = set()
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	144
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	145 def _openfile(self, path, data, isexec, islink, copypath, create=False):
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	146 if path in self._openpaths:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	147 raise EditingError('trying to open an already opened file %s'
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	148 % path)
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	149 if not create and path in self._deleted:
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	150 raise EditingError('trying to open a deleted file %s' % path)
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	151 if path in self._deleted:
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	152 self._deleted.remove(path)
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	153 self._filecounter += 1
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	154 baton = '%d-%s' % (self._filecounter, path)
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	155 self._openfiles[baton] = (path, data, isexec, islink, copypath)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	156 self._openpaths[path] = baton
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	157 return baton
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	158
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	159 def _deletefile(self, path):
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	160 self._deleted.add(path)
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	161 if path in self._svncopies:
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	162 del self._svncopies[path]
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	163
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	164 @svnwrap.ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	165 def delete_entry(self, path, revision_bogus, parent_baton, pool=None):
545 ebd8fb1a05e4 clean up trailing whitespace Augie Fackler <durin42@gmail.com> parents: 540 diff changeset	166 br_path, branch = self.meta.split_branch_path(path)[:2]
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	167 if br_path == '':
540 8dc759dc9ca9 svnmeta: remove split_branch_tag() exacttag argument Patrick Mezard <pmezard@gmail.com> parents: 534 diff changeset	168 if self.meta.get_path_tag(path):
8dc759dc9ca9 svnmeta: remove split_branch_tag() exacttag argument Patrick Mezard <pmezard@gmail.com> parents: 534 diff changeset	169 # Tag deletion is not handled as branched deletion
8dc759dc9ca9 svnmeta: remove split_branch_tag() exacttag argument Patrick Mezard <pmezard@gmail.com> parents: 534 diff changeset	170 return
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	171 self.meta.closebranches.add(branch)
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	172
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	173 # Delete copied entries, no need to check they exist in hg
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	174 # parent revision.
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	175 if path in self._svncopies:
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	176 del self._svncopies[path]
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	177 prefix = path + '/'
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	178 for f in list(self._svncopies):
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	179 if f.startswith(prefix):
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	180 self._deletefile(f)
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	181
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	182 if br_path is not None:
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	183 ha = self.meta.get_parent_revision(self.current.rev.revnum, branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	184 if ha == revlog.nullid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	185 return
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	186 ctx = self.repo.changectx(ha)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	187 if br_path not in ctx:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	188 br_path2 = ''
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	189 if br_path != '':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	190 br_path2 = br_path + '/'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	191 # assuming it is a directory
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	192 self.current.externals[path] = None
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	193 for f in ctx.walk(util.PrefixMatch(br_path2)):
39 b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 38 diff changeset	194 f_p = '%s/%s' % (path, f[len(br_path2):])
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	195 self._deletefile(f_p)
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	196 self._deletefile(path)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	197
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	198 @svnwrap.ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	199 def open_file(self, path, parent_baton, base_revision, p=None):
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	200 fpath, branch = self.meta.split_branch_path(path)[:2]
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	201 if not fpath:
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 321 diff changeset	202 self.ui.debug('WARNING: Opening non-existant file %s\n' % path)
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	203 return None
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	204
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	205 self.ui.note('M %s\n' % path)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	206
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	207 if path in self._svncopies:
940 34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	208 copy = self._svncopies.pop(path)
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	209 base, isexec, islink, copypath = copy.resolve(self.repo)
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	210 return self._openfile(path, base, isexec, islink, copypath)
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	211
586 704d2ce1d906 editor: fix open_file() on replaced branch Patrick Mezard <pmezard@gmail.com> parents: 585 diff changeset	212 if not self.meta.is_path_valid(path):
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	213 return None
586 704d2ce1d906 editor: fix open_file() on replaced branch Patrick Mezard <pmezard@gmail.com> parents: 585 diff changeset	214
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	215 baserev = base_revision
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	216 if baserev is None or baserev == -1:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	217 baserev = self.current.rev.revnum - 1
586 704d2ce1d906 editor: fix open_file() on replaced branch Patrick Mezard <pmezard@gmail.com> parents: 585 diff changeset	218 # Use exact=True because during replacements ('R' action) we select
704d2ce1d906 editor: fix open_file() on replaced branch Patrick Mezard <pmezard@gmail.com> parents: 585 diff changeset	219 # replacing branch as parent, but svn delta editor provides delta
704d2ce1d906 editor: fix open_file() on replaced branch Patrick Mezard <pmezard@gmail.com> parents: 585 diff changeset	220 # agains replaced branch.
704d2ce1d906 editor: fix open_file() on replaced branch Patrick Mezard <pmezard@gmail.com> parents: 585 diff changeset	221 parent = self.meta.get_parent_revision(baserev + 1, branch, True)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	222 ctx = self.repo[parent]
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	223 if fpath not in ctx:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	224 self.current.missing.add(path)
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	225 return None
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	226
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	227 fctx = ctx.filectx(fpath)
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	228 base = fctx.data()
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	229 flags = fctx.flags()
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	230 if 'l' in flags:
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	231 base = 'link ' + base
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	232 return self._openfile(path, base, 'x' in flags, 'l' in flags, None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	233
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	234 @svnwrap.ieditor
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 299 diff changeset	235 def add_file(self, path, parent_baton=None, copyfrom_path=None,
4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 299 diff changeset	236 copyfrom_revision=None, file_pool=None):
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	237 if path in self._svncopies:
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	238 raise EditingError('trying to replace copied file %s' % path)
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	239 if path in self._deleted:
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	240 self._deleted.remove(path)
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	241 fpath, branch = self.meta.split_branch_path(path, existing=False)[:2]
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	242 if not fpath:
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	243 return None
447 0d3b5acb1d51 tags: handle edits to tags as gracefully as possible Augie Fackler <durin42@gmail.com> parents: 436 diff changeset	244 if (branch not in self.meta.branches and
517 ef288fb7f2fe svnmeta: is_path_tag() is really get_path_tag() Patrick Mezard <pmezard@gmail.com> parents: 499 diff changeset	245 not self.meta.get_path_tag(self.meta.remotename(branch))):
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	246 # we know this branch will exist now, because it has at least one file. Rock.
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	247 self.meta.branches[branch] = None, 0, self.current.rev.revnum
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	248 if not copyfrom_path:
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 181 diff changeset	249 self.ui.note('A %s\n' % path)
901 bd12a4da0f35 replay: workaround svn not telling us about x/l flags (issue346) Bryan O'Sullivan <bryano@fb.com> parents: 891 diff changeset	250 self.current.added.add(path)
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	251 return self._openfile(path, '', False, False, None, create=True)
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 181 diff changeset	252 self.ui.note('A+ %s\n' % path)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	253 (from_file,
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	254 from_branch) = self.meta.split_branch_path(copyfrom_path)[:2]
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	255 if not from_file:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	256 self.current.missing.add(path)
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	257 return None
585 c3ba4ca81d16 editor: fix replaced files content in replay mode Patrick Mezard <pmezard@gmail.com> parents: 582 diff changeset	258 # Use exact=True because during replacements ('R' action) we select
c3ba4ca81d16 editor: fix replaced files content in replay mode Patrick Mezard <pmezard@gmail.com> parents: 582 diff changeset	259 # replacing branch as parent, but svn delta editor provides delta
c3ba4ca81d16 editor: fix replaced files content in replay mode Patrick Mezard <pmezard@gmail.com> parents: 582 diff changeset	260 # agains replaced branch.
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	261 ha = self.meta.get_parent_revision(copyfrom_revision + 1,
585 c3ba4ca81d16 editor: fix replaced files content in replay mode Patrick Mezard <pmezard@gmail.com> parents: 582 diff changeset	262 from_branch, True)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	263 ctx = self.repo.changectx(ha)
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	264 if from_file not in ctx:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	265 self.current.missing.add(path)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	266 return None
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	267
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	268 fctx = ctx.filectx(from_file)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	269 flags = fctx.flags()
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	270 self.current.set(path, fctx.data(), 'x' in flags, 'l' in flags)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	271 copypath = None
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	272 if from_branch == branch:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	273 parentid = self.meta.get_parent_revision(
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	274 self.current.rev.revnum, branch)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	275 if parentid != revlog.nullid:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	276 parentctx = self.repo.changectx(parentid)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	277 if util.issamefile(parentctx, ctx, from_file):
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	278 copypath = from_file
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	279 return self._openfile(path, fctx.data(), 'x' in flags, 'l' in flags,
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	280 copypath, create=True)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	281
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	282 @svnwrap.ieditor
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	283 def close_file(self, file_baton, checksum, pool=None):
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	284 if file_baton is None:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	285 return
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	286 if file_baton not in self._openfiles:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	287 raise EditingError('trying to close a non-open file %s'
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	288 % file_baton)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	289 path, data, isexec, islink, copypath = self._openfiles.pop(file_baton)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	290 del self._openpaths[path]
942 4d9e80f6ba43 editor: do not touch RevisionData copies from the editor Patrick Mezard <patrick@mezard.eu> parents: 941 diff changeset	291 self.current.set(path, data, isexec, islink, copypath)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	292
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	293 @svnwrap.ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	294 def add_directory(self, path, parent_baton, copyfrom_path,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	295 copyfrom_revision, dir_pool=None):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	296 self.current.batons[path] = path
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	297 br_path, branch = self.meta.split_branch_path(path)[:2]
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	298 if br_path is not None:
30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	299 if not copyfrom_path and not br_path:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	300 self.current.emptybranches[branch] = True
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	301 else:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	302 self.current.emptybranches[branch] = False
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	303 if br_path is None or not copyfrom_path:
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	304 return path
521 839734dfb5c7 Handle tag subdirectory as tag in replay mode (issue119) Patrick Mezard <pmezard@gmail.com> parents: 518 diff changeset	305 if self.meta.get_path_tag(path):
839734dfb5c7 Handle tag subdirectory as tag in replay mode (issue119) Patrick Mezard <pmezard@gmail.com> parents: 518 diff changeset	306 del self.current.emptybranches[branch]
839734dfb5c7 Handle tag subdirectory as tag in replay mode (issue119) Patrick Mezard <pmezard@gmail.com> parents: 518 diff changeset	307 return path
518 e37738d95b27 editor: remove useless test Patrick Mezard <pmezard@gmail.com> parents: 517 diff changeset	308 tag = self.meta.get_path_tag(copyfrom_path)
e37738d95b27 editor: remove useless test Patrick Mezard <pmezard@gmail.com> parents: 517 diff changeset	309 if tag not in self.meta.tags:
e37738d95b27 editor: remove useless test Patrick Mezard <pmezard@gmail.com> parents: 517 diff changeset	310 tag = None
e37738d95b27 editor: remove useless test Patrick Mezard <pmezard@gmail.com> parents: 517 diff changeset	311 if not self.meta.is_path_valid(copyfrom_path):
e37738d95b27 editor: remove useless test Patrick Mezard <pmezard@gmail.com> parents: 517 diff changeset	312 self.current.missing.add('%s/' % path)
e37738d95b27 editor: remove useless test Patrick Mezard <pmezard@gmail.com> parents: 517 diff changeset	313 return path
59 430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	314 if tag:
534 e38f110e7088 svnmeta: make it easier to get converted revision info Patrick Mezard <pmezard@gmail.com> parents: 528 diff changeset	315 changeid = self.meta.tags[tag]
e38f110e7088 svnmeta: make it easier to get converted revision info Patrick Mezard <pmezard@gmail.com> parents: 528 diff changeset	316 source_rev, source_branch = self.meta.get_source_rev(changeid)[:2]
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	317 frompath = ''
59 430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	318 else:
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	319 source_rev = copyfrom_revision
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	320 frompath, source_branch = self.meta.split_branch_path(copyfrom_path)[:2]
3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	321 if frompath == '' and br_path == '':
217 6eb691a163cd hg_delta_editor: stop using foobaz as a bogus filename. Augie Fackler <durin42@gmail.com> parents: 214 diff changeset	322 assert br_path is not None
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	323 tmp = source_branch, source_rev, self.current.rev.revnum
343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	324 self.meta.branches[branch] = tmp
587 c06f59441f8e editor: fix replaced directory copies Patrick Mezard <pmezard@gmail.com> parents: 586 diff changeset	325 new_hash = self.meta.get_parent_revision(source_rev + 1, source_branch, True)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	326 if new_hash == node.nullid:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	327 self.current.missing.add('%s/' % path)
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	328 return path
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	329 fromctx = self.repo.changectx(new_hash)
3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	330 if frompath != '/' and frompath != '':
3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	331 frompath = '%s/' % frompath
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	332 else:
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	333 frompath = ''
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	334 svncopies = {}
69 63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	335 copies = {}
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	336 for f in fromctx:
3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	337 if not f.startswith(frompath):
69 63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	338 continue
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	339 fctx = fromctx.filectx(f)
791 05ee7d5351de editor: simplify add_directory() a bit more Patrick Mezard <pmezard@gmail.com> parents: 790 diff changeset	340 dest = path + '/' + f[len(frompath):]
940 34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	341 svncopies[dest] = CopiedFile(new_hash, f, None)
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	342 if dest in self._deleted:
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	343 # Remove this once svn copies and edited files are
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	344 # clearly separated.
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	345 self._deleted.remove(dest)
69 63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	346 if branch == source_branch:
791 05ee7d5351de editor: simplify add_directory() a bit more Patrick Mezard <pmezard@gmail.com> parents: 790 diff changeset	347 copies[dest] = f
69 63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	348 if copies:
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	349 # Preserve the directory copy records if no file was changed between
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	350 # the source and destination revisions, or discard it completely.
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	351 parentid = self.meta.get_parent_revision(
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	352 self.current.rev.revnum, branch)
69 63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	353 if parentid != revlog.nullid:
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	354 parentctx = self.repo.changectx(parentid)
496 5e0dfe59d4c3 copies: fix under-reporting of copies in hg Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	355 for k, v in copies.iteritems():
790 3173f418079c editor: rename add_directory() cp_f* variable into from* Patrick Mezard <pmezard@gmail.com> parents: 741 diff changeset	356 if util.issamefile(parentctx, fromctx, v):
940 34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	357 svncopies[k].copypath = v
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	358 self._svncopies.update(svncopies)
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	359
792 ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	360 # Copy the externals definitions of copied directories
ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	361 fromext = svnexternals.parse(self.ui, fromctx)
ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	362 for p, v in fromext.iteritems():
ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	363 pp = p and (p + '/') or ''
ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	364 if pp.startswith(frompath):
ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	365 dest = (path + '/' + pp[len(frompath):]).rstrip('/')
ba65c0b01d4f replay: copy copied directories externals Patrick Mezard <pmezard@gmail.com> parents: 791 diff changeset	366 self.current.externals[dest] = v
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	367 return path
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	368
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	369 @svnwrap.ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	370 def change_file_prop(self, file_baton, name, value, pool=None):
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	371 if file_baton is None:
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	372 return
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	373 path, data, isexec, islink, copypath = self._openfiles[file_baton]
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	374 changed = False
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	375 if name == 'svn:executable':
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	376 changed = True
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	377 isexec = bool(value is not None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	378 elif name == 'svn:special':
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	379 changed = True
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	380 islink = bool(value is not None)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	381 if changed:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	382 self._openfiles[file_baton] = (path, data, isexec, islink, copypath)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	383
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	384 @svnwrap.ieditor
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	385 def change_dir_prop(self, dir_baton, name, value, pool=None):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	386 if dir_baton is None:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	387 return
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	388 path = self.current.batons[dir_baton]
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	389 if name == 'svn:externals':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	390 self.current.externals[path] = value
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	391
935 1de83496df4e subvertpy_wrapper: fix files and directories batons handling Patrick Mezard <patrick@mezard.eu> parents: 934 diff changeset	392 @svnwrap.ieditor
1de83496df4e subvertpy_wrapper: fix files and directories batons handling Patrick Mezard <patrick@mezard.eu> parents: 934 diff changeset	393 def open_root(self, edit_baton, base_revision, dir_pool=None):
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	394 # We should not have to reset these, unfortunately the editor is
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	395 # reused for different revisions.
fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	396 self._clear()
935 1de83496df4e subvertpy_wrapper: fix files and directories batons handling Patrick Mezard <patrick@mezard.eu> parents: 934 diff changeset	397 return None
1de83496df4e subvertpy_wrapper: fix files and directories batons handling Patrick Mezard <patrick@mezard.eu> parents: 934 diff changeset	398
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	399 @svnwrap.ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	400 def open_directory(self, path, parent_baton, base_revision, dir_pool=None):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	401 self.current.batons[path] = path
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	402 p_, branch = self.meta.split_branch_path(path)[:2]
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 498 diff changeset	403 if p_ == '' or (self.meta.layout == 'single' and p_):
540 8dc759dc9ca9 svnmeta: remove split_branch_tag() exacttag argument Patrick Mezard <pmezard@gmail.com> parents: 534 diff changeset	404 if not self.meta.get_path_tag(path):
8dc759dc9ca9 svnmeta: remove split_branch_tag() exacttag argument Patrick Mezard <pmezard@gmail.com> parents: 534 diff changeset	405 self.current.emptybranches[branch] = False
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	406 return path
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	407
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	408 @svnwrap.ieditor
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	409 def close_directory(self, dir_baton, dir_pool=None):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	410 if dir_baton is not None:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	411 del self.current.batons[dir_baton]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	412
673 32089d080ff8 editor: move ieditor decorator into svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 633 diff changeset	413 @svnwrap.ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	414 def apply_textdelta(self, file_baton, base_checksum, pool=None):
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	415 if file_baton is None:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	416 return lambda x: None
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	417 if file_baton not in self._openfiles:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	418 raise EditingError('trying to patch a closed file %s' % file_baton)
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	419 path, base, isexec, islink, copypath = self._openfiles[file_baton]
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	420 if not self.meta.is_path_valid(path):
211 05243ec295e1 fetch: Fix a bug that caused plaintexts to be interpreted as missing more often than they should be. Augie Fackler <durin42@gmail.com> parents: 207 diff changeset	421 return lambda x: None
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	422
862 6ef6c413d6de editor: work around svn 1.7 closing the output fp in apply_textdelta() Patrick Mezard <patrick@mezard.eu> parents: 843 diff changeset	423 target = NeverClosingStringIO()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	424 self.stream = target
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	425
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 591 diff changeset	426 handler = svnwrap.apply_txdelta(base, target)
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	427 if not callable(handler): # pragma: no cover
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	428 raise hgutil.Abort('Error in Subversion bindings: '
79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	429 'cannot call handler!')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	430 def txdelt_window(window):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	431 try:
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	432 if not self.meta.is_path_valid(path):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	433 return
932 dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	434 try:
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	435 handler(window)
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	436 except AssertionError, e: # pragma: no cover
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	437 # Enhance the exception message
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	438 msg, others = e.args[0], e.args[1:]
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	439
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	440 if msg:
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	441 msg += '\n'
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	442
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	443 msg += _TXDELT_WINDOW_HANDLER_FAILURE_MSG
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	444 e.args = (msg,) + others
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	445 raise e
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	446
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	447 # window being None means commit this file
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	448 if not window:
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	449 self._openfiles[file_baton] = (
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	450 path, target.getvalue(), isexec, islink, copypath)
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	451 except svnwrap.SubversionException, e: # pragma: no cover
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 591 diff changeset	452 if e.args[1] == svnwrap.ERR_INCOMPLETE_DATA:
937 fb6f6b7fa5a5 editor: implement file batons Patrick Mezard <patrick@mezard.eu> parents: 935 diff changeset	453 self.current.missing.add(path)
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	454 else: # pragma: no cover
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	455 raise hgutil.Abort(*e.args)
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 832 diff changeset	456 except: # pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	457 self._exception_info = sys.exc_info()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	458 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	459 return txdelt_window
932 dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	460
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	461 def close(self):
939 997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	462 if self._openfiles:
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	463 for e in self._openfiles.itervalues():
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	464 self.ui.debug('error: %s was not closed\n' % e[0])
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	465 raise EditingError('%d edited files were not closed'
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	466 % len(self._openfiles))
997de286ba0c editor: add close_file(), enforce file batons semantics Patrick Mezard <patrick@mezard.eu> parents: 938 diff changeset	467
940 34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	468 # Resolve by changelog entries to avoid extra reads
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	469 nodes = {}
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	470 for path, copy in self._svncopies.iteritems():
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	471 nodes.setdefault(copy.node, []).append((path, copy))
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	472 for node, copies in nodes.iteritems():
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	473 ctx = self.repo[node]
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	474 for path, copy in copies:
34a1217b8218 editor: resolve files copied by directory copy on-demand Patrick Mezard <patrick@mezard.eu> parents: 939 diff changeset	475 data, isexec, islink, copied = copy.resolve(self.repo, ctx)
942 4d9e80f6ba43 editor: do not touch RevisionData copies from the editor Patrick Mezard <patrick@mezard.eu> parents: 941 diff changeset	476 self.current.set(path, data, isexec, islink, copied)
938 f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	477 self._svncopies.clear()
f9014e28721b editor: start separating svn copies from open files Patrick Mezard <patrick@mezard.eu> parents: 937 diff changeset	478
941 febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	479 for f in self._deleted:
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	480 self.current.delete(f)
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	481 self._deleted.clear()
febca88dd261 editor: handle deleted files in editor Patrick Mezard <patrick@mezard.eu> parents: 940 diff changeset	482
932 dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	483 _TXDELT_WINDOW_HANDLER_FAILURE_MSG = (
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	484 "Your SVN repository may not be supplying correct replay deltas."
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	485 " It is strongly"
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	486 "\nadvised that you repull the entire SVN repository using"
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	487 " hg pull --stupid."
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	488 "\nAlternatively, re-pull just this revision using --stupid and verify"
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	489 " that the"
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	490 "\nchangeset is correct."
dfb3afa6c619 stupid: Fail over to full revision when a PatchError is thrown (issue294) Tim Delaney <timothy.c.delaney@gmail.com> parents: 901 diff changeset	491 )

Mercurial > hgsubversion

annotate hgsubversion/editor.py @ 942:4d9e80f6ba43