hgsubversion: hgsubversion/editor.py annotate

annotate hgsubversion/editor.py @ 433:a2a15fa7afb1

editor: move set_file() and delete_file() methods to RevisionData class

author	Dirkjan Ochtman <dirkjan@ochtman.nl>
date	Tue, 16 Jun 2009 08:41:28 +0200
parents	4bf90f8c9b7b
children	3e2259fe3c93

rev	line source
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	1 import cStringIO
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	2 import sys
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import traceback
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	4
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 from mercurial import context
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	6 from mercurial import util as hgutil
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import revlog
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 from mercurial import node
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 from svn import delta
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 from svn import core
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	11
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	12 import svnexternals
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	13 import util
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	14
363 ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	15 class MissingPlainTextError(Exception):
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	16 """Exception raised when the repo lacks a source file required for replaying
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	17 a txdelta.
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	18 """
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	19
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	20 class ReplayException(Exception):
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	21 """Exception raised when you try and commit but the replay encountered an
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	22 exception.
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	23 """
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	24
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	25 def ieditor(fn):
705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	26 """Helps identify methods used by the SVN editor interface.
705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	27
705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	28 Stash any exception raised in the method on self.
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	29
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	30 This is required because the SWIG bindings just mutate any exception into
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	31 a generic Subversion exception with no way of telling what the original was.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	32 This allows the editor object to notice when you try and commit and really
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	33 got an exception in the replay process.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	34 """
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	35 def fun(self, args, *kwargs):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	36 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	37 return fn(self, args, *kwargs)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	38 except: #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	39 if not hasattr(self, '_exception_info'):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	40 self._exception_info = sys.exc_info()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	41 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	42 return fun
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	43
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	44
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	45 class RevisionData(object):
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	46
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	47 __slots__ = [
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	48 'file', '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	49 'copies', 'missing', 'emptybranches', 'base', 'externals', 'ui',
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	50 ]
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	51
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	52 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	53 self.ui = ui
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	54 self.clear()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	55
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	56 def clear(self):
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	57 self.file = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	58 self.files = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	59 self.deleted = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	60 self.rev = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	61 self.execfiles = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	62 self.symlinks = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	63 self.batons = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	64 # 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	65 self.copies = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	66 self.missing = set()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	67 self.emptybranches = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	68 self.base = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	69 self.externals = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	70
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	71 def set(self, path, data, isexec=False, islink=False):
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	72 if islink:
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	73 data = 'link ' + data
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	74 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	75 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	76 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	77 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	78 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	79 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	80 self.missing.remove(path)
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	81
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	82 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	83 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	84 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	85 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	86 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	87 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	88 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	89
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	90
421 8277113036f1 editor: rename hg_delta_editor.HgChangeReceiver to editor.HgEditor Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 420 diff changeset	91 class HgEditor(delta.Editor):
33 a9c15cae50e5 Faster append-only revmap implementation. Andreas Hartmetz <ahartmetz@gmail.com> parents: 23 diff changeset	92
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	93 def __init__(self, meta):
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	94 self.meta = meta
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	95 self.ui = meta.ui
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	96 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	97 self.current = RevisionData(meta.ui)
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	98
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	99 def _updateexternals(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	100 if not self.current.externals:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	101 return
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	102 # Accumulate externals records for all branches
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	103 revnum = self.current.rev.revnum
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	104 branches = {}
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	105 for path, entry in self.current.externals.iteritems():
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	106 if not self.meta.is_path_valid(path):
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	107 self.ui.warn('WARNING: Invalid path %s in externals\n' % path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	108 continue
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	109 p, b, bp = self.meta.split_branch_path(path)
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	110 if bp not in branches:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	111 external = svnexternals.externalsfile()
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	112 parent = self.meta.get_parent_revision(revnum, b)
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	113 pctx = self.repo[parent]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	114 if '.hgsvnexternals' in pctx:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	115 external.read(pctx['.hgsvnexternals'].data())
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	116 branches[bp] = external
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	117 else:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	118 external = branches[bp]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	119 external[p] = entry
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	120
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	121 # Register the file changes
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	122 for bp, external in branches.iteritems():
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	123 path = bp + '/.hgsvnexternals'
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	124 if external:
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	125 self.current.set(path, external.write(), False, False)
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	126 else:
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	127 self.current.delete(path)
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	128
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	129 def commit_current_delta(self, tbdelta):
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	130 if hasattr(self, '_exception_info'): #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	131 traceback.print_exception(*self._exception_info)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	132 raise ReplayException()
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	133 if self.current.missing:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	134 raise MissingPlainTextError()
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	135 self._updateexternals()
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	136 # paranoidly generate the list of files to commit
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	137 files_to_commit = set(self.current.files.keys())
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	138 files_to_commit.update(self.current.symlinks.keys())
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	139 files_to_commit.update(self.current.execfiles.keys())
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	140 files_to_commit.update(self.current.deleted.keys())
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	141 # back to a list and sort so we get sane behavior
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	142 files_to_commit = list(files_to_commit)
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	143 files_to_commit.sort()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	144 branch_batches = {}
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	145 rev = self.current.rev
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	146 date = self.meta.fixdate(rev.date)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	147
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	148 # build up the branches that have files on them
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	149 for f in files_to_commit:
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	150 if not self.meta.is_path_valid(f):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	151 continue
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	152 p, b = self.meta.split_branch_path(f)[:2]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	153 if b not in branch_batches:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	154 branch_batches[b] = []
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	155 branch_batches[b].append((p, f))
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	156
ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	157 closebranches = {}
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	158 for branch in tbdelta['branches'][1]:
415 b17b2969861c svnmeta: move revmap methods, make last_known_revision() more efficient Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 414 diff changeset	159 branchedits = self.meta.revmap.branchedits(branch, rev)
147 22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 146 diff changeset	160 if len(branchedits) < 1:
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 146 diff changeset	161 # can't close a branch that never existed
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 146 diff changeset	162 continue
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 146 diff changeset	163 ha = branchedits[0][1]
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	164 closebranches[branch] = ha
ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	165
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	166 # 1. handle normal commits
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	167 closedrevs = closebranches.values()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	168 for branch, files in branch_batches.iteritems():
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	169 if branch in self.current.emptybranches and files:
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	170 del self.current.emptybranches[branch]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	171 files = dict(files)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	172
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	173 parents = (self.meta.get_parent_revision(rev.revnum, branch),
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	174 revlog.nullid)
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	175 if parents[0] in closedrevs and branch in self.meta.closebranches:
147 22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 146 diff changeset	176 continue
422 6086363e8230 svnmeta: move util.build_extra() to SVNMeta.genextra() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 421 diff changeset	177 extra = self.meta.genextra(rev.revnum, branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	178 if branch is not None:
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	179 if (branch not in self.meta.branches
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	180 and branch not in self.repo.branchtags()):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	181 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	182 parent_ctx = self.repo.changectx(parents[0])
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	183 if '.hgsvnexternals' not in parent_ctx and '.hgsvnexternals' in files:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	184 # Do not register empty externals files
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	185 if (files['.hgsvnexternals'] in self.current.files
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	186 and not self.current.files[files['.hgsvnexternals']]):
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	187 del files['.hgsvnexternals']
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	188
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	189 def filectxfn(repo, memctx, path):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	190 current_file = files[path]
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	191 if current_file in self.current.deleted:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	192 raise IOError()
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	193 copied = self.current.copies.get(current_file)
55 987e44afa71e hg_delta_editor: simplify exec/symlink flags generation Patrick Mezard <pmezard@gmail.com> parents: 43 diff changeset	194 flags = parent_ctx.flags(path)
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	195 is_exec = self.current.execfiles.get(current_file, 'x' in flags)
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	196 is_link = self.current.symlinks.get(current_file, 'l' in flags)
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	197 if current_file in self.current.files:
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	198 data = self.current.files[current_file]
335 9ef720a611e0 HgChangeReceiver: better diagnostics for invalid links Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	199 if is_link and data.startswith('link '):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	200 data = data[len('link '):]
335 9ef720a611e0 HgChangeReceiver: better diagnostics for invalid links Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	201 elif is_link:
350 b6f9e270f103 hg_delta_editor: do not raise an error for bad symlinks, but warn instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 347 diff changeset	202 self.ui.warn('file marked as link, but contains data: '
b6f9e270f103 hg_delta_editor: do not raise an error for bad symlinks, but warn instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 347 diff changeset	203 '%s (%r)\n' % (current_file, flags))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	204 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	205 data = parent_ctx.filectx(path).data()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	206 return context.memfilectx(path=path,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	207 data=data,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	208 islink=is_link, isexec=is_exec,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	209 copied=copied)
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	210 if not self.meta.usebranchnames:
321 b6c6d32c8ef1 Add an option to clone without branch names. Augie Fackler <durin42@gmail.com> parents: 317 diff changeset	211 extra.pop('branch', None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	212 current_ctx = context.memctx(self.repo,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	213 parents,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	214 rev.message or '...',
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	215 files.keys(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	216 filectxfn,
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	217 self.meta.authors[rev.author],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	218 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	219 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	220 new_hash = self.repo.commitctx(current_ctx)
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	221 util.describe_commit(self.ui, new_hash, branch)
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	222 if (rev.revnum, branch) not in self.meta.revmap:
343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	223 self.meta.revmap[rev.revnum, branch] = new_hash
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	224
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	225 # 2. handle branches that need to be committed without any files
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	226 for branch in self.current.emptybranches:
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	227 ha = self.meta.get_parent_revision(rev.revnum, branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	228 if ha == node.nullid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	229 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	230 parent_ctx = self.repo.changectx(ha)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	231 def del_all_files(*args):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	232 raise IOError
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	233 # True here meant nuke all files, shouldn't happen with branch closing
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	234 if self.current.emptybranches[branch]: #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	235 raise hgutil.Abort('Empty commit to an open branch attempted. '
79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	236 'Please report this issue.')
422 6086363e8230 svnmeta: move util.build_extra() to SVNMeta.genextra() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 421 diff changeset	237 extra = self.meta.genextra(rev.revnum, branch)
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	238 if not self.meta.usebranchnames:
321 b6c6d32c8ef1 Add an option to clone without branch names. Augie Fackler <durin42@gmail.com> parents: 317 diff changeset	239 extra.pop('branch', None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	240 current_ctx = context.memctx(self.repo,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	241 (ha, node.nullid),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	242 rev.message or ' ',
136 cf6fe8457570 Fix an apparent regression where branch name didn't get properly stored for Augie Fackler <durin42@gmail.com> parents: 133 diff changeset	243 [],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	244 del_all_files,
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	245 self.meta.authors[rev.author],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	246 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	247 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	248 new_hash = self.repo.commitctx(current_ctx)
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	249 util.describe_commit(self.ui, new_hash, branch)
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	250 if (rev.revnum, branch) not in self.meta.revmap:
343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	251 self.meta.revmap[rev.revnum, branch] = new_hash
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	252
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	253 self.current.clear()
432 4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 422 diff changeset	254 return closebranches
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 422 diff changeset	255
364 b71c8f935740 Move HgChangeReceiver.aresamefiles() to before the editor methods. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 363 diff changeset	256 # Here come all the actual editor methods
b71c8f935740 Move HgChangeReceiver.aresamefiles() to before the editor methods. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 363 diff changeset	257
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	258 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	259 def delete_entry(self, path, revision_bogus, parent_baton, pool=None):
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	260 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	261 if br_path == '':
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	262 self.meta.closebranches.add(branch)
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	263 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	264 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	265 if ha == revlog.nullid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	266 return
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	267 ctx = self.repo.changectx(ha)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	268 if br_path not in ctx:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	269 br_path2 = ''
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	270 if br_path != '':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	271 br_path2 = br_path + '/'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	272 # 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	273 self.current.externals[path] = None
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	274 map(self.current.delete, [pat for pat in self.current.files.iterkeys()
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	275 if pat.startswith(path+'/')])
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	276 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	277 f_p = '%s/%s' % (path, f[len(br_path2):])
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	278 if f_p not in self.current.files:
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	279 self.current.delete(f_p)
a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	280 self.current.delete(path)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	281
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	282 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	283 def open_file(self, path, parent_baton, base_revision, p=None):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	284 self.current.file = None
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	285 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	286 if not fpath:
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 321 diff changeset	287 self.ui.debug('WARNING: Opening non-existant file %s\n' % path)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	288 return
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	289
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	290 self.current.file = path
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	291 self.ui.note('M %s\n' % path)
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	292 if base_revision != -1:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	293 self.current.base = base_revision
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	294 else:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	295 self.current.base = None
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	296
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	297 if self.current.file in self.current.files:
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	298 return
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	299
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	300 baserev = base_revision
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	301 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	302 baserev = self.current.rev.revnum - 1
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	303 parent = self.meta.get_parent_revision(baserev + 1, branch)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	304
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	305 ctx = self.repo[parent]
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	306 if not self.meta.is_path_valid(path):
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	307 return
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	308
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	309 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	310 self.current.missing.add(path)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	311
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	312 fctx = ctx.filectx(fpath)
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	313 base = fctx.data()
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	314 if 'l' in fctx.flags():
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	315 base = 'link ' + base
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	316 self.current.set(path, base, 'x' in fctx.flags(), 'l' in fctx.flags())
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	317
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	318 @ieditor
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 299 diff changeset	319 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	320 copyfrom_revision=None, file_pool=None):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	321 self.current.file = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	322 self.current.base = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	323 if path in self.current.deleted:
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	324 del self.current.deleted[path]
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	325 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	326 if not fpath:
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	327 return
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	328 if branch not in self.meta.branches:
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	329 # 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	330 self.meta.branches[branch] = None, 0, self.current.rev.revnum
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	331 self.current.file = path
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	332 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	333 self.ui.note('A %s\n' % path)
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	334 self.current.set(path, '', False, False)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	335 return
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 181 diff changeset	336 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	337 (from_file,
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	338 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	339 if not from_file:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	340 self.current.missing.add(path)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	341 return
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	342 ha = self.meta.get_parent_revision(copyfrom_revision + 1,
343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	343 from_branch)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	344 ctx = self.repo.changectx(ha)
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	345 if from_file in ctx:
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	346 fctx = ctx.filectx(from_file)
97 0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 73 diff changeset	347 flags = fctx.flags()
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	348 self.current.set(path, fctx.data(), 'x' in flags, 'l' in flags)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	349 if from_branch == branch:
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	350 parentid = self.meta.get_parent_revision(self.current.rev.revnum,
343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	351 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	352 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	353 parentctx = self.repo.changectx(parentid)
410 eb524b957345 move aresamefiles() from HgChangeReceiver to util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	354 if util.aresamefiles(parentctx, ctx, [from_file]):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	355 self.current.copies[path] = from_file
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	356
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	357 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	358 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	359 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	360 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	361 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	362 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	363 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	364 self.current.emptybranches[branch] = True
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	365 else:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	366 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	367 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	368 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	369 if copyfrom_path:
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	370 tag = self.meta.is_path_tag(copyfrom_path)
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	371 if tag not in self.meta.tags:
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	372 tag = None
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	373 if not self.meta.is_path_valid(copyfrom_path) and not tag:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	374 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	375 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	376 if tag:
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	377 source_branch, source_rev = self.meta.tags[tag]
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	378 cp_f = ''
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	379 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	380 source_rev = copyfrom_revision
420 59e19c73b0df svnmeta: eliminate unneeded path_and_branch_for_path() method Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 418 diff changeset	381 cp_f, source_branch = self.meta.split_branch_path(copyfrom_path)[:2]
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	382 if cp_f == '' and br_path == '':
217 6eb691a163cd hg_delta_editor: stop using foobaz as a bogus filename. Augie Fackler <durin42@gmail.com> parents: 214 diff changeset	383 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	384 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	385 self.meta.branches[branch] = tmp
343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	386 new_hash = self.meta.get_parent_revision(source_rev + 1, source_branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	387 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	388 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	389 return path
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	390 cp_f_ctx = self.repo.changectx(new_hash)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	391 if cp_f != '/' and cp_f != '':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	392 cp_f = '%s/' % cp_f
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	393 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	394 cp_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	395 copies = {}
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	396 for f in cp_f_ctx:
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	397 if not f.startswith(cp_f):
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	398 continue
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	399 f2 = f[len(cp_f):]
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	400 fctx = cp_f_ctx.filectx(f)
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	401 fp_c = path + '/' + f2
433 a2a15fa7afb1 editor: move set_file() and delete_file() methods to RevisionData class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	402 self.current.set(fp_c, fctx.data(), 'x' in fctx.flags(), 'l' in fctx.flags())
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	403 if fp_c in self.current.deleted:
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	404 del self.current.deleted[fp_c]
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	405 if branch == source_branch:
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	406 copies[fp_c] = f
63ece4ea25c9 hg_delta_editor: register copies only if files are unchanged between source and dest Patrick Mezard <pmezard@gmail.com> parents: 67 diff changeset	407 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	408 # 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	409 # the source and destination revisions, or discard it completely.
414 343da842dbe6 split parts of HgChangeReceiver out into an SVNMeta class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 413 diff changeset	410 parentid = self.meta.get_parent_revision(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	411 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	412 parentctx = self.repo.changectx(parentid)
410 eb524b957345 move aresamefiles() from HgChangeReceiver to util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	413 if util.aresamefiles(parentctx, cp_f_ctx, copies.values()):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	414 self.current.copies.update(copies)
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	415 return path
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	416
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	417 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	418 def change_file_prop(self, file_baton, name, value, pool=None):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	419 if name == 'svn:executable':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	420 self.current.execfiles[self.current.file] = bool(value is not None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	421 elif name == 'svn:special':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	422 self.current.symlinks[self.current.file] = bool(value is not None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	423
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	424 @ieditor
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	425 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	426 if dir_baton is None:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	427 return
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	428 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	429 if name == 'svn:externals':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	430 self.current.externals[path] = value
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	431
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	432 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	433 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	434 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	435 p_, 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	436 if p_ == '':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	437 self.current.emptybranches[branch] = False
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	438 return path
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	439
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	440 @ieditor
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	441 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	442 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	443 del self.current.batons[dir_baton]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	444
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	445 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	446 def apply_textdelta(self, file_baton, base_checksum, pool=None):
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	447 # We know coming in here the file must be one of the following options:
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	448 # 1) Deleted (invalid, fail an assertion)
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	449 # 2) Missing a base text (bail quick since we have to fetch a full plaintext)
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	450 # 3) Has a base text in self.current.files, apply deltas
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	451 base = ''
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	452 if not self.meta.is_path_valid(self.current.file):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	453 return lambda x: None
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	454 assert self.current.file not in self.current.deleted, (
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	455 'Cannot apply_textdelta to a deleted file: %s' % self.current.file)
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	456 assert (self.current.file in self.current.files
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	457 or self.current.file in self.current.missing), '%s not found' % self.current.file
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	458 if self.current.file in self.current.missing:
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	459 return lambda x: None
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	460 base = self.current.files[self.current.file]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	461 source = cStringIO.StringIO(base)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	462 target = cStringIO.StringIO()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	463 self.stream = target
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	464
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	465 handler, baton = delta.svn_txdelta_apply(source, target, None)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	466 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	467 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	468 'cannot call handler!')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	469 def txdelt_window(window):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	470 try:
417 8630d1ebcdb9 svnmeta: deprivatize a bunch of member functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	471 if not self.meta.is_path_valid(self.current.file):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	472 return
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	473 handler(window, baton)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	474 # window being None means commit this file
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	475 if not window:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	476 self.current.files[self.current.file] = target.getvalue()
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	477 except core.SubversionException, e: #pragma: no cover
224 2165461d2dd8 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 211 diff changeset	478 if e.apr_err == core.SVN_ERR_INCOMPLETE_DATA:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	479 self.current.missing.add(self.current.file)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	480 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	481 raise hgutil.Abort(*e.args)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	482 except: #pragma: no cover
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	483 print len(base), self.current.file
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	484 self._exception_info = sys.exc_info()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	485 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	486 return txdelt_window

Mercurial > hgsubversion

annotate hgsubversion/editor.py @ 433:a2a15fa7afb1