hgsubversion: hgsubversion/hg_delta

annotate hgsubversion/hg_delta_editor.py @ 413:ac0cc3c9ea63

sort HgChangeReceiver methods and properties Keep editor-only bits close to editor bits, move the rest up, in order of ascending complexity (including use of other methods).

author	Dirkjan Ochtman <dirkjan@ochtman.nl>
date	Thu, 11 Jun 2009 08:40:20 +0200
parents	d71972428fce
children	343da842dbe6

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 cPickle as pickle
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import os
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	4 import sys
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 import tempfile
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 import traceback
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	7
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 from mercurial import context
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 from mercurial import hg
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 from mercurial import ui
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	11 from mercurial import util as hgutil
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	12 from mercurial import revlog
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 from mercurial import node
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	14 from mercurial import error
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	15 from svn import delta
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 from svn import core
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	17
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	18 import svnexternals
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	19 import util
317 5dc8fee7fc96 Less import * Augie Fackler <durin42@gmail.com> parents: 316 diff changeset	20 import maps
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	21
363 ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	22 class MissingPlainTextError(Exception):
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	23 """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	24 a txdelta.
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	25 """
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	26
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	27 class ReplayException(Exception):
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	28 """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	29 exception.
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	30 """
ccef78b91ac9 Move exception classes in hg_delta_editor up top. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 362 diff changeset	31
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	32 def pickle_atomic(data, file_path, dir=None):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	33 """pickle some data to a path atomically.
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 This is present because I kept corrupting my revmap by managing to hit ^C
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	36 during the pickle of that file.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	37 """
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	38 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	39 f, path = tempfile.mkstemp(prefix='pickling', dir=dir)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	40 f = os.fdopen(f, 'w')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	41 pickle.dump(data, f)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	42 f.close()
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	43 except: #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	44 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	45 else:
250 79349fd04836 utils: standardizing imported name to hgutil, our_util to util Daniel Tang <dytang@cs.purdue.edu> parents: 237 diff changeset	46 hgutil.rename(path, file_path)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	47
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	48 def ieditor(fn):
705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	49 """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	50
705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	51 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	52
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	53 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	54 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	55 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	56 got an exception in the replay process.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	57 """
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	58 def fun(self, args, *kwargs):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	59 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	60 return fn(self, args, *kwargs)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	61 except: #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	62 if not hasattr(self, '_exception_info'):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	63 self._exception_info = sys.exc_info()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	64 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	65 return fun
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	66
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	67
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	68 class RevisionData(object):
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	69
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	70 __slots__ = [
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	71 'file', 'files', 'deleted', 'rev', 'execfiles', 'symlinks', 'batons',
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	72 'copies', 'missing', 'emptybranches', 'base', 'closebranches',
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	73 'externals',
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	74 ]
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	75
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	76 def __init__(self):
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	77 self.clear()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	78
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	79 def clear(self):
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	80 self.file = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	81 self.files = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	82 self.deleted = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	83 self.rev = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	84 self.execfiles = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	85 self.symlinks = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	86 self.batons = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	87 # 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	88 self.copies = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	89 self.missing = set()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	90 self.emptybranches = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	91 self.base = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	92 self.closebranches = set()
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	93 self.externals = {}
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	94
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	95
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	96 class HgChangeReceiver(delta.Editor):
33 a9c15cae50e5 Faster append-only revmap implementation. Andreas Hartmetz <ahartmetz@gmail.com> parents: 23 diff changeset	97
405 a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	98 def __init__(self, repo, uuid=None, subdir=''):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	99 """path is the path to the target hg repo.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	100
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	101 subdir is the subdirectory of the edits on the svn server.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	102 It is needed for stripping paths off in certain cases.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	103 """
405 a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	104 self.ui = repo.ui
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	105 self.repo = repo
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	106 self.path = os.path.normpath(repo.join('..'))
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	107
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	108 if not os.path.isdir(self.meta_data_dir):
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	109 os.makedirs(self.meta_data_dir)
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	110 self._set_uuid(uuid)
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	111 # TODO: validate subdir too
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 407 diff changeset	112 self.revmap = maps.RevMap(repo)
405 a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	113
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	114 author_host = self.ui.config('hgsubversion', 'defaulthost', uuid)
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	115 authors = self.ui.config('hgsubversion', 'authormap')
a98b8d424221 editor: simplify HgChangeReceiver constructor signature Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 400 diff changeset	116 tag_locations = self.ui.configlist('hgsubversion', 'tagpaths', ['tags'])
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	117 self.usebranchnames = self.ui.configbool('hgsubversion',
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	118 'usebranchnames', True)
124 291925677a9f tag_repo: remove gentags command, extend repo.tags(), HgChangeEditor now takes either repo or repo_path Luke Opperman <luke@loppear.com> parents: 123 diff changeset	119
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 342 diff changeset	120 # FIXME: test that this hasn't changed! defer & compare?
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	121 self.subdir = subdir
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	122 if self.subdir and self.subdir[0] == '/':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	123 self.subdir = self.subdir[1:]
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	124 self.branches = {}
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	125 if os.path.exists(self.branch_info_file):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	126 f = open(self.branch_info_file)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	127 self.branches = pickle.load(f)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	128 f.close()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	129 self.tags = {}
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	130 if os.path.exists(self.tag_locations_file):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	131 f = open(self.tag_locations_file)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	132 self.tag_locations = pickle.load(f)
8 c89f53103502 Another fix for Win32 compat. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 6 diff changeset	133 f.close()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	134 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	135 self.tag_locations = tag_locations
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	136 pickle_atomic(self.tag_locations, self.tag_locations_file,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	137 self.meta_data_dir)
295 aacc8cf83e13 Ensure proper handling of nested tag paths by sorting and reversing them. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 224 diff changeset	138 # ensure nested paths are handled properly
aacc8cf83e13 Ensure proper handling of nested tag paths by sorting and reversing them. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 224 diff changeset	139 self.tag_locations.sort()
aacc8cf83e13 Ensure proper handling of nested tag paths by sorting and reversing them. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 224 diff changeset	140 self.tag_locations.reverse()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	141
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	142 self.current = RevisionData()
317 5dc8fee7fc96 Less import * Augie Fackler <durin42@gmail.com> parents: 316 diff changeset	143 self.authors = maps.AuthorMap(self.ui, self.authors_file,
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 306 diff changeset	144 defaulthost=author_host)
1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 306 diff changeset	145 if authors: self.authors.load(authors)
237 c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	146
290 153266401676 hg_delta_editor: add timezone to default date to avoid DST issues Patrick Mezard <pmezard@gmail.com> parents: 279 diff changeset	147 self.lastdate = '1970-01-01 00:00:00 -0000'
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	148 self.filemap = maps.FileMap(repo)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	149
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	150 def _get_uuid(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	151 return open(os.path.join(self.meta_data_dir, 'uuid')).read()
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	152
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	153 def _set_uuid(self, uuid):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	154 if not uuid:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	155 return
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	156 elif os.path.isfile(os.path.join(self.meta_data_dir, 'uuid')):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	157 stored_uuid = self._get_uuid()
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	158 assert stored_uuid
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	159 if uuid != stored_uuid:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	160 raise hgutil.Abort('unable to operate on unrelated repository')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	161 else:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	162 if uuid:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	163 f = open(os.path.join(self.meta_data_dir, 'uuid'), 'w')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	164 f.write(uuid)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	165 f.flush()
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	166 f.close()
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	167 else:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	168 raise hgutil.Abort('unable to operate on unrelated repository')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	169
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	170 uuid = property(_get_uuid, _set_uuid, None,
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	171 'Error-checked UUID of source Subversion repository.')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	172
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	173 @property
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	174 def meta_data_dir(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	175 return os.path.join(self.path, '.hg', 'svn')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	176
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	177 @property
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	178 def branch_info_file(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	179 return os.path.join(self.meta_data_dir, 'branch_info')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	180
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	181 @property
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	182 def tag_locations_file(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	183 return os.path.join(self.meta_data_dir, 'tag_locations')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	184
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	185 @property
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	186 def authors_file(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	187 return os.path.join(self.meta_data_dir, 'authors')
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	188
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	189 def hashes(self):
e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	190 return dict((v, k) for (k, v) in self.revmap.iteritems())
e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	191
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	192 def branchedits(self, branch, rev):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	193 check = lambda x: x[0][1] == branch and x[0][0] < rev.revnum
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	194 return sorted(filter(check, self.revmap.iteritems()), reverse=True)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	195
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	196 def last_known_revision(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	197 """Obtain the highest numbered -- i.e. latest -- revision known.
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	198
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	199 Currently, this function just iterates over the entire revision map
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	200 using the max() builtin. This may be slow for extremely large
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	201 repositories, but for now, it's fast enough.
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	202 """
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	203 try:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	204 return max(k[0] for k in self.revmap.iterkeys())
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	205 except ValueError:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	206 return 0
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	207
237 c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	208 def fixdate(self, date):
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	209 if date is not None:
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	210 date = date.replace('T', ' ').replace('Z', '').split('.')[0]
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	211 date += ' -0000'
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	212 self.lastdate = date
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	213 else:
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	214 date = self.lastdate
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	215 return date
c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	216
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	217 def _save_metadata(self):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	218 '''Save the Subversion metadata. This should really be called after
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	219 every revision is created.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	220 '''
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	221 pickle_atomic(self.branches, self.branch_info_file, self.meta_data_dir)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	222
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	223 def _localname(self, path):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	224 """Compute the local name for a branch located at path.
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	225 """
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	226 assert not path.startswith('tags/')
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	227 if path == 'trunk':
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	228 return None
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	229 elif path.startswith('branches/'):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	230 return path[len('branches/'):]
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	231 return '../%s' % path
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	232
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	233 def _remotename(self, branch):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	234 if branch == 'default' or branch is None:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	235 return 'trunk'
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	236 elif branch.startswith('../'):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	237 return branch[3:]
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	238 return 'branches/%s' % branch
72 9ec2a12c12ae hg_delta_editor: make branches_in_paths() return the branch svn path too Patrick Mezard <pmezard@gmail.com> parents: 69 diff changeset	239
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	240 def _normalize_path(self, path):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	241 '''Normalize a path to strip of leading slashes and our subdir if we
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	242 have one.
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	243 '''
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	244 if path and path[0] == '/':
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	245 path = path[1:]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	246 if path and path.startswith(self.subdir):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	247 path = path[len(self.subdir):]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	248 if path and path[0] == '/':
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	249 path = path[1:]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	250 return path
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	251
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	252 def _is_path_tag(self, path):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	253 """If path could represent the path to a tag, returns the potential tag
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	254 name. Otherwise, returns False.
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	255
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	256 Note that it's only a tag if it was copied from the path '' in a branch
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	257 (or tag) we have, for our purposes.
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	258 """
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	259 path = self._normalize_path(path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	260 for tagspath in self.tag_locations:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	261 onpath = path.startswith(tagspath)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	262 longer = len(path) > len('%s/' % tagspath)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	263 if path and onpath and longer:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	264 tag, subpath = path[len(tagspath) + 1:], ''
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	265 return tag
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	266 return False
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	267
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	268 def _split_branch_path(self, path, existing=True):
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	269 """Figure out which branch inside our repo this path represents, and
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	270 also figure out which path inside that branch it is.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	271
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	272 Returns a tuple of (path within branch, local branch name, server-side branch path).
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	273
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	274 If existing=True, will return None, None, None if the file isn't on some known
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	275 branch. If existing=False, then it will guess what the branch would be if it were
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	276 known.
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	277 """
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	278 path = self._normalize_path(path)
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	279 if path.startswith('tags/'):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	280 return None, None, None
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	281 test = ''
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	282 path_comps = path.split('/')
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	283 while self._localname(test) not in self.branches and len(path_comps):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	284 if not test:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	285 test = path_comps.pop(0)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	286 else:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	287 test += '/%s' % path_comps.pop(0)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	288 if self._localname(test) in self.branches:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	289 return path[len(test)+1:], self._localname(test), test
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	290 if existing:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	291 return None, None, None
313 942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	292 if path == 'trunk' or path.startswith('trunk/'):
942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	293 path = path.split('/')[1:]
207 b20a6c149021 fetch: Fix a bogus case where no files in the root level of trunk caused breakage in the branch detection. Augie Fackler <durin42@gmail.com> parents: 203 diff changeset	294 test = 'trunk'
218 a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	295 elif path.startswith('branches/'):
a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	296 elts = path.split('/')
a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	297 test = '/'.join(elts[:2])
a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	298 path = '/'.join(elts[2:])
207 b20a6c149021 fetch: Fix a bogus case where no files in the root level of trunk caused breakage in the branch detection. Augie Fackler <durin42@gmail.com> parents: 203 diff changeset	299 else:
b20a6c149021 fetch: Fix a bogus case where no files in the root level of trunk caused breakage in the branch detection. Augie Fackler <durin42@gmail.com> parents: 203 diff changeset	300 path = test.split('/')[-1]
b20a6c149021 fetch: Fix a bogus case where no files in the root level of trunk caused breakage in the branch detection. Augie Fackler <durin42@gmail.com> parents: 203 diff changeset	301 test = '/'.join(test.split('/')[:-1])
218 a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	302 ln = self._localname(test)
a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	303 if ln and ln.startswith('../'):
a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	304 return None, None, None
a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 217 diff changeset	305 return path, ln, test
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	306
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	307 def _is_path_valid(self, path):
217 6eb691a163cd hg_delta_editor: stop using foobaz as a bogus filename. Augie Fackler <durin42@gmail.com> parents: 214 diff changeset	308 if path is None:
6eb691a163cd hg_delta_editor: stop using foobaz as a bogus filename. Augie Fackler <durin42@gmail.com> parents: 214 diff changeset	309 return False
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	310 subpath = self._split_branch_path(path)[0]
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	311 if subpath is None:
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	312 return False
409 d4615986e1db extract the filemap support into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 408 diff changeset	313 return subpath in self.filemap
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	314
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	315 def get_parent_svn_branch_and_rev(self, number, branch):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	316 number -= 1
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	317 if (number, branch) in self.revmap:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	318 return number, branch
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	319 real_num = 0
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	320 for num, br in self.revmap.iterkeys():
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	321 if br != branch:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	322 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	323 if num <= number and num > real_num:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	324 real_num = num
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	325 if branch in self.branches:
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	326 parent_branch = self.branches[branch][0]
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	327 parent_branch_rev = self.branches[branch][1]
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	328 # check to see if this branch already existed and is the same
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	329 if parent_branch_rev < real_num:
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	330 return real_num, branch
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	331 # if that wasn't true, then this is the a new branch with the
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	332 # same name as some old deleted branch
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	333 if parent_branch_rev <= 0 and real_num == 0:
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	334 return None, None
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	335 branch_created_rev = self.branches[branch][2]
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	336 if parent_branch == 'trunk':
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	337 parent_branch = None
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	338 if branch_created_rev <= number+1 and branch != parent_branch:
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	339 return self.get_parent_svn_branch_and_rev(
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	340 parent_branch_rev+1,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	341 parent_branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	342 if real_num != 0:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	343 return real_num, branch
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	344 return None, None
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	345
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	346 def get_parent_revision(self, number, branch):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	347 '''Get the parent revision hash for a commit on a specific branch.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	348 '''
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	349 r, br = self.get_parent_svn_branch_and_rev(number, branch)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	350 if r is not None:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	351 return self.revmap[r, br]
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	352 return revlog.nullid
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	353
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	354 def update_branch_tag_map_for_rev(self, revision):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	355 paths = revision.paths
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	356 added_branches = {}
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	357 added_tags = {}
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	358 self.current.closebranches = set()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	359 tags_to_delete = set()
131 4d42dbbb5127 hg_delta_editor: fix parent revision detection on branch copy Patrick Mezard <pmezard@gmail.com> parents: 124 diff changeset	360 for p in sorted(paths):
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	361 t_name = self._is_path_tag(p)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	362 if t_name != False:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	363 src_p, src_rev = paths[p].copyfrom_path, paths[p].copyfrom_rev
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	364 # if you commit to a tag, I'm calling you stupid and ignoring
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	365 # you.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	366 if src_p is not None and src_rev is not None:
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 file, branch = self._path_and_branch_for_path(src_p)
30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	368 if file is None:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	369 # some crazy people make tags from other tags
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	370 file = ''
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	371 from_tag = self._is_path_tag(src_p)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	372 if not from_tag:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	373 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	374 branch, src_rev = self.tags[from_tag]
381 a441ba143ac8 tags: fix handling for certain nonstandard tag layouts. Augie Fackler <durin42@gmail.com> parents: 380 diff changeset	375 if t_name not in added_tags and file is '':
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	376 added_tags[t_name] = branch, src_rev
381 a441ba143ac8 tags: fix handling for certain nonstandard tag layouts. Augie Fackler <durin42@gmail.com> parents: 380 diff changeset	377 elif file:
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts. Augie Fackler <durin42@gmail.com> parents: 380 diff changeset	378 t_name = t_name[:-(len(file)+1)]
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts. Augie Fackler <durin42@gmail.com> parents: 380 diff changeset	379 if src_rev > added_tags[t_name][1]:
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts. Augie Fackler <durin42@gmail.com> parents: 380 diff changeset	380 added_tags[t_name] = branch, src_rev
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	381 elif (paths[p].action == 'D' and p.endswith(t_name)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	382 and t_name in self.tags):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	383 tags_to_delete.add(t_name)
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	384 continue
312 4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	385 # At this point we know the path is not a tag. In that
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	386 # case, we only care if it is the root of a new branch (in
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	387 # this function). This is determined by the following
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	388 # checks:
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	389 # 1. Is the file located inside any currently known
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	390 # branch? If yes, then we're done with it, this isn't
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	391 # interesting.
313 942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	392 # 2. Does the file have copyfrom information? If yes, then
942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	393 # we're done: this is a new branch, and we record the
942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	394 # copyfrom in added_branches if it comes from the root
942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	395 # of another branch, or create it from scratch.
312 4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	396 # 3. Neither of the above. This could be a branch, but it
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	397 # might never work out for us. It's only ever a branch
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	398 # (as far as we're concerned) if it gets committed to,
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	399 # which we have to detect at file-write time anyway. So
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	400 # we do nothing here.
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	401 # 4. It's the root of an already-known branch, with an
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	402 # action of 'D'. We mark the branch as deleted.
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	403 # 5. It's the parent directory of one or more
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	404 # already-known branches, so we mark them as deleted.
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	405 # 6. It's a branch being replaced by another branch - the
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	406 # action will be 'R'.
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	407 fi, br = self._path_and_branch_for_path(p)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	408 if fi is not None:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	409 if fi == '':
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	410 if paths[p].action == 'D':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	411 self.current.closebranches.add(br) # case 4
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	412 elif paths[p].action == 'R':
312 4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	413 parent = self._determine_parent_branch(
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	414 p, paths[p].copyfrom_path, paths[p].copyfrom_rev,
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	415 revision.revnum)
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	416 added_branches.update(parent)
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	417 continue # case 1
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	418 if paths[p].action == 'D':
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	419 for known in self.branches:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	420 if self._svnpath(known).startswith(p):
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	421 self.current.closebranches.add(known) # case 5
312 4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	422 parent = self._determine_parent_branch(
4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	423 p, paths[p].copyfrom_path, paths[p].copyfrom_rev, revision.revnum)
313 942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	424 if not parent and paths[p].copyfrom_path:
942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	425 bpath, branch = self._path_and_branch_for_path(p, False)
352 cc7a10efddc9 Fix a bug in branch ancestry calculation. Augie Fackler <durin42@gmail.com> parents: 350 diff changeset	426 if (bpath is not None
cc7a10efddc9 Fix a bug in branch ancestry calculation. Augie Fackler <durin42@gmail.com> parents: 350 diff changeset	427 and branch not in self.branches
cc7a10efddc9 Fix a bug in branch ancestry calculation. Augie Fackler <durin42@gmail.com> parents: 350 diff changeset	428 and branch not in added_branches):
313 942f198b8ff5 hg_delta_editor: detect new branches issued from non-branch directories Patrick Mezard <pmezard@gmail.com> parents: 312 diff changeset	429 parent = {branch: (None, 0, revision.revnum)}
312 4dc197f533c1 hg_delta_editor: reformat huge comment, rename __determine_parent_branch() Patrick Mezard <pmezard@gmail.com> parents: 290 diff changeset	430 added_branches.update(parent)
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	431 rmtags = dict((t, self.tags[t][0]) for t in tags_to_delete)
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	432 return {
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	433 'tags': (added_tags, rmtags),
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	434 'branches': (added_branches, self.current.closebranches),
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	435 }
ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	436
ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	437 def save_tbdelta(self, tbdelta):
ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	438 for t in tbdelta['tags'][1]:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	439 del self.tags[t]
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	440 for br in tbdelta['branches'][1]:
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	441 del self.branches[br]
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	442 for t, info in tbdelta['tags'][0].items():
156 56dae5beae65 hg_delta_editor: Produce some output when creating a tag. Augie Fackler <durin42@gmail.com> parents: 155 diff changeset	443 self.ui.status('Tagged %s@%s as %s\n' %
56dae5beae65 hg_delta_editor: Produce some output when creating a tag. Augie Fackler <durin42@gmail.com> parents: 155 diff changeset	444 (info[0] or 'trunk', info[1], t))
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	445 self.tags.update(tbdelta['tags'][0])
ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	446 self.branches.update(tbdelta['branches'][0])
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	447
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	448 def committags(self, delta, rev, endbranches):
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	449
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	450 date = self.fixdate(rev.date)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	451 # determine additions/deletions per branch
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	452 branches = {}
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	453 for tag, source in delta[0].iteritems():
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	454 b, r = source
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	455 branches.setdefault(b, []).append(('add', tag, r))
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	456 for tag, branch in delta[1].iteritems():
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	457 branches.setdefault(branch, []).append(('rm', tag, None))
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	458
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	459 for b, tags in branches.iteritems():
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	460
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	461 # modify parent's .hgtags source
389 a8811c84e3ee tags: Fix an improper parent calculation. Augie Fackler <durin42@gmail.com> parents: 386 diff changeset	462 parent = self.repo[self.get_parent_revision(rev.revnum, b)]
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	463 if '.hgtags' not in parent:
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	464 src = ''
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	465 else:
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	466 src = parent['.hgtags'].data()
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	467 for op, tag, r in sorted(tags, reverse=True):
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	468 if op == 'add':
380 639105d25a2f tags: Fix parent detection so that copyfrom trunk@5 correctly falls back to trunk@4 if trunk@5 is not in the revmap. Augie Fackler <durin42@gmail.com> parents: 378 diff changeset	469 tagged = node.hex(self.revmap[
639105d25a2f tags: Fix parent detection so that copyfrom trunk@5 correctly falls back to trunk@4 if trunk@5 is not in the revmap. Augie Fackler <durin42@gmail.com> parents: 378 diff changeset	470 self.get_parent_svn_branch_and_rev(r+1, b)])
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	471 elif op == 'rm':
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	472 tagged = node.hex(node.nullid)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	473 src += '%s %s\n' % (tagged, tag)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	474
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	475 # add new changeset containing updated .hgtags
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	476 def fctxfun(repo, memctx, path):
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	477 return context.memfilectx(path='.hgtags', data=src,
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	478 islink=False, isexec=False,
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	479 copied=None)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	480 extra = util.build_extra(rev.revnum, b, self.uuid, self.subdir)
398 f13dd964d10c tags: obey usebranchnames setting Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 397 diff changeset	481 if not self.usebranchnames:
f13dd964d10c tags: obey usebranchnames setting Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 397 diff changeset	482 extra.pop('branch', None)
399 94f7e8c53c36 tags: end branch while tagging instead of creating extra changeset Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 398 diff changeset	483 if b in endbranches:
94f7e8c53c36 tags: end branch while tagging instead of creating extra changeset Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 398 diff changeset	484 extra['close'] = 1
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	485 ctx = context.memctx(self.repo,
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	486 (parent.node(), node.nullid),
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	487 rev.message or ' ',
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	488 ['.hgtags'],
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	489 fctxfun,
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	490 self.authors[rev.author],
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	491 date,
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	492 extra)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	493 new = self.repo.commitctx(ctx)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	494 if (rev.revnum, b) not in self.revmap:
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 407 diff changeset	495 self.revmap[rev.revnum, b] = new
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	496 if b in endbranches:
399 94f7e8c53c36 tags: end branch while tagging instead of creating extra changeset Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 398 diff changeset	497 endbranches.pop(b)
94f7e8c53c36 tags: end branch while tagging instead of creating extra changeset Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 398 diff changeset	498 bname = b or 'default'
94f7e8c53c36 tags: end branch while tagging instead of creating extra changeset Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 398 diff changeset	499 self.ui.status('Marked branch %s as closed.\n' % bname)
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	500
413 ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	501 def delbranch(self, branch, node, rev):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	502 pctx = self.repo[node]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	503 files = pctx.manifest().keys()
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	504 extra = {'close': 1}
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	505 if self.usebranchnames:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	506 extra['branch'] = branch or 'default'
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	507 ctx = context.memctx(self.repo,
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	508 (node, revlog.nullid),
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	509 rev.message or util.default_commit_msg,
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	510 [],
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	511 lambda x, y, z: None,
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	512 self.authors[rev.author],
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	513 self.fixdate(rev.date),
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	514 extra)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	515 new = self.repo.commitctx(ctx)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	516 self.ui.status('Marked branch %s as closed.\n' % (branch or 'default'))
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	517
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	518 def set_file(self, path, data, isexec=False, islink=False):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	519 if islink:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	520 data = 'link ' + data
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	521 self.current.files[path] = data
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	522 self.current.execfiles[path] = isexec
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	523 self.current.symlinks[path] = islink
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	524 if path in self.current.deleted:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	525 del self.current.deleted[path]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	526 if path in self.current.missing:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	527 self.current.missing.remove(path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	528
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	529 def delete_file(self, path):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	530 self.current.deleted[path] = True
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	531 if path in self.current.files:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	532 del self.current.files[path]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	533 self.current.execfiles[path] = False
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	534 self.current.symlinks[path] = False
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	535 self.ui.note('D %s\n' % path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	536
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	537 def _svnpath(self, branch):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	538 """Return the relative path in svn of branch.
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	539 """
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	540 if branch == None or branch == 'default':
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	541 return 'trunk'
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	542 elif branch.startswith('../'):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	543 return branch[3:]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	544 return 'branches/%s' % branch
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	545
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	546 def _path_and_branch_for_path(self, path, existing=True):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	547 return self._split_branch_path(path, existing=existing)[:2]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	548
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	549 def _branch_for_path(self, path, existing=True):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	550 return self._path_and_branch_for_path(path, existing=existing)[1]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	551
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	552 def _determine_parent_branch(self, p, src_path, src_rev, revnum):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	553 if src_path is not None:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	554 src_file, src_branch = self._path_and_branch_for_path(src_path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	555 src_tag = self._is_path_tag(src_path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	556 if src_tag != False:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	557 # also case 2
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	558 src_branch, src_rev = self.tags[src_tag]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	559 return {self._localname(p): (src_branch, src_rev, revnum )}
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	560 if src_file == '':
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	561 # case 2
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	562 return {self._localname(p): (src_branch, src_rev, revnum )}
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	563 return {}
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	564
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	565 def _updateexternals(self):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	566 if not self.current.externals:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	567 return
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	568 # Accumulate externals records for all branches
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	569 revnum = self.current.rev.revnum
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	570 branches = {}
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	571 for path, entry in self.current.externals.iteritems():
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	572 if not self._is_path_valid(path):
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	573 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	574 continue
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	575 p, b, bp = self._split_branch_path(path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	576 if bp not in branches:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	577 external = svnexternals.externalsfile()
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	578 parent = self.get_parent_revision(revnum, b)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	579 pctx = self.repo[parent]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	580 if '.hgsvnexternals' in pctx:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	581 external.read(pctx['.hgsvnexternals'].data())
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	582 branches[bp] = external
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	583 else:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	584 external = branches[bp]
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	585 external[p] = entry
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	586
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	587 # Register the file changes
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	588 for bp, external in branches.iteritems():
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	589 path = bp + '/.hgsvnexternals'
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	590 if external:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	591 self.set_file(path, external.write(), False, False)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	592 else:
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	593 self.delete_file(path)
ac0cc3c9ea63 sort HgChangeReceiver methods and properties Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 411 diff changeset	594
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	595 def commit_current_delta(self, tbdelta):
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	596 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	597 traceback.print_exception(*self._exception_info)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	598 raise ReplayException()
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	599 if self.current.missing:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	600 raise MissingPlainTextError()
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	601 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	602 # 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	603 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	604 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	605 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	606 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	607 # 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	608 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	609 files_to_commit.sort()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	610 branch_batches = {}
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	611 rev = self.current.rev
237 c90cfa665b81 Cope with date-less revisions. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 232 diff changeset	612 date = self.fixdate(rev.date)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	613
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	614 # 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	615 for f in files_to_commit:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	616 if not self._is_path_valid(f):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	617 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	618 p, b = self._path_and_branch_for_path(f)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	619 if b not in branch_batches:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	620 branch_batches[b] = []
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	621 branch_batches[b].append((p, f))
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	622
ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	623 closebranches = {}
367 ce64d57172a3 Generate separate data structure containing revision's tags/branches changes. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 365 diff changeset	624 for branch in tbdelta['branches'][1]:
368 e786253eb565 Abstract out a branchedits() function. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 367 diff changeset	625 branchedits = self.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	626 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	627 # 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	628 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	629 ha = branchedits[0][1]
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	630 closebranches[branch] = ha
ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	631
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	632 # 1. handle normal commits
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	633 closedrevs = closebranches.values()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	634 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	635 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	636 del self.current.emptybranches[branch]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	637 files = dict(files)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	638
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	639 parents = (self.get_parent_revision(rev.revnum, branch),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	640 revlog.nullid)
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	641 if parents[0] in closedrevs and branch in self.current.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	642 continue
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	643 extra = util.build_extra(rev.revnum, branch, self.uuid, self.subdir)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	644 if branch is not None:
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	645 if (branch not in self.branches
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 131 diff changeset	646 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	647 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	648 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	649 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	650 # 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	651 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	652 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	653 del files['.hgsvnexternals']
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	654
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	655 def filectxfn(repo, memctx, path):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	656 current_file = files[path]
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	657 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	658 raise IOError()
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	659 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	660 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	661 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	662 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	663 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	664 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	665 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	666 data = data[len('link '):]
335 9ef720a611e0 HgChangeReceiver: better diagnostics for invalid links Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 331 diff changeset	667 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	668 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	669 '%s (%r)\n' % (current_file, flags))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	670 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	671 data = parent_ctx.filectx(path).data()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	672 return context.memfilectx(path=path,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	673 data=data,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	674 islink=is_link, isexec=is_exec,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	675 copied=copied)
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	676 if not self.usebranchnames:
321 b6c6d32c8ef1 Add an option to clone without branch names. Augie Fackler <durin42@gmail.com> parents: 317 diff changeset	677 extra.pop('branch', None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	678 current_ctx = context.memctx(self.repo,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	679 parents,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	680 rev.message or '...',
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	681 files.keys(),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	682 filectxfn,
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 306 diff changeset	683 self.authors[rev.author],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	684 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	685 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	686 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	687 util.describe_commit(self.ui, new_hash, branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	688 if (rev.revnum, branch) not in self.revmap:
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 407 diff changeset	689 self.revmap[rev.revnum, branch] = new_hash
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	690
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	691 # 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	692 for branch in self.current.emptybranches:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	693 ha = self.get_parent_revision(rev.revnum, branch)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	694 if ha == node.nullid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	695 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	696 parent_ctx = self.repo.changectx(ha)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	697 def del_all_files(*args):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	698 raise IOError
369 ce2b7ef74f89 Extract closed_revs into closebranches and closedrevs. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 368 diff changeset	699 # 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	700 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	701 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	702 'Please report this issue.')
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	703 extra = util.build_extra(rev.revnum, branch, self.uuid, self.subdir)
75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 330 diff changeset	704 if not self.usebranchnames:
321 b6c6d32c8ef1 Add an option to clone without branch names. Augie Fackler <durin42@gmail.com> parents: 317 diff changeset	705 extra.pop('branch', None)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	706 current_ctx = context.memctx(self.repo,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	707 (ha, node.nullid),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	708 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	709 [],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	710 del_all_files,
307 1d48d9a34c19 Put authormap into a separate file, and make it much better too. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 306 diff changeset	711 self.authors[rev.author],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	712 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	713 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	714 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	715 util.describe_commit(self.ui, new_hash, branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	716 if (rev.revnum, branch) not in self.revmap:
408 f137231f9d30 extract the revmap support into a separate dict-like class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 407 diff changeset	717 self.revmap[rev.revnum, branch] = new_hash
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	718
376 9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	719 # 3. handle tags
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	720 if tbdelta['tags'][0] or tbdelta['tags'][1]:
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	721 self.committags(tbdelta['tags'], rev, closebranches)
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	722
9327e9325645 Use tbdelta to push added tags into .hgtags. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 375 diff changeset	723 # 4. close any branches that need it
400 09625f3abdb0 branches: simplify branch deletion a little bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 399 diff changeset	724 for branch, parent in closebranches.iteritems():
09625f3abdb0 branches: simplify branch deletion a little bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 399 diff changeset	725 if parent is None:
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	726 continue
400 09625f3abdb0 branches: simplify branch deletion a little bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 399 diff changeset	727 self.delbranch(branch, parent, rev)
370 c4da18ba92ea Reorder different commit blocks. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 369 diff changeset	728
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	729 self._save_metadata()
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	730 self.current.clear()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	731
364 b71c8f935740 Move HgChangeReceiver.aresamefiles() to before the editor methods. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 363 diff changeset	732 # 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	733
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	734 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	735 def delete_entry(self, path, revision_bogus, parent_baton, pool=None):
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	736 br_path, branch = self._path_and_branch_for_path(path)
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	737 if br_path == '':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	738 self.current.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	739 if br_path is not None:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	740 ha = self.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	741 if ha == revlog.nullid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	742 return
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	743 ctx = self.repo.changectx(ha)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	744 if br_path not in ctx:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	745 br_path2 = ''
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	746 if br_path != '':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	747 br_path2 = br_path + '/'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	748 # 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	749 self.current.externals[path] = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	750 map(self.delete_file, [pat for pat in self.current.files.iterkeys()
232 c0063328587f Fix and test for directory deletes during branch creation. Augie Fackler <durin42@gmail.com> parents: 228 diff changeset	751 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	752 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	753 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	754 if f_p not in self.current.files:
145 b37c401b7f92 hg_delta_editor: reset properties of deleted entries Patrick Mezard <pmezard@gmail.com> parents: 141 diff changeset	755 self.delete_file(f_p)
b37c401b7f92 hg_delta_editor: reset properties of deleted entries Patrick Mezard <pmezard@gmail.com> parents: 141 diff changeset	756 self.delete_file(path)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	757
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	758 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	759 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	760 self.current.file = None
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 116 diff changeset	761 fpath, branch = self._path_and_branch_for_path(path)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	762 if not fpath:
322 05cd4a5138bf Move some .warn() calls to noisy levels instead. Augie Fackler <durin42@gmail.com> parents: 321 diff changeset	763 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	764 return
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	765
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	766 self.current.file = path
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	767 self.ui.note('M %s\n' % path)
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	768 if base_revision != -1:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	769 self.current.base = base_revision
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	770 else:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	771 self.current.base = None
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	772
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	773 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	774 return
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	775
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	776 baserev = base_revision
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	777 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	778 baserev = self.current.rev.revnum - 1
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	779 parent = self.get_parent_revision(baserev + 1, branch)
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	780
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	781 ctx = self.repo[parent]
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	782 if not self._is_path_valid(path):
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	783 return
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	784
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	785 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	786 self.current.missing.add(path)
378 eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	787
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	788 fctx = ctx.filectx(fpath)
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	789 base = fctx.data()
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	790 if 'l' in fctx.flags():
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	791 base = 'link ' + base
eeefbe104087 Inline HgChangeReceiver.load_base_from_ctx(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 377 diff changeset	792 self.set_file(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	793
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	794 @ieditor
300 4aba7542f6a9 Various cleanups, cosmetics and removal of superfluous assertions. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 299 diff changeset	795 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	796 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	797 self.current.file = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	798 self.current.base = None
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	799 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	800 del self.current.deleted[path]
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	801 fpath, branch = self._path_and_branch_for_path(path, existing=False)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	802 if not fpath:
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	803 return
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	804 if branch not in self.branches:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	805 # we know this branch will exist now, because it has at least one file. Rock.
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	806 self.branches[branch] = None, 0, self.current.rev.revnum
d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	807 self.current.file = path
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	808 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	809 self.ui.note('A %s\n' % 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	810 self.set_file(path, '', False, False)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	811 return
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 181 diff changeset	812 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	813 (from_file,
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	814 from_branch) = self._path_and_branch_for_path(copyfrom_path)
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	815 if not from_file:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	816 self.current.missing.add(path)
67 e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	817 return
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	818 ha = self.get_parent_revision(copyfrom_revision + 1,
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	819 from_branch)
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	820 ctx = self.repo.changectx(ha)
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	821 if from_file in ctx:
e319c9168910 hg_delta_editor: register svn file copies Patrick Mezard <pmezard@gmail.com> parents: 59 diff changeset	822 fctx = ctx.filectx(from_file)
97 0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 73 diff changeset	823 flags = fctx.flags()
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	824 self.set_file(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	825 if from_branch == branch:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	826 parentid = self.get_parent_revision(self.current.rev.revnum,
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	827 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	828 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	829 parentctx = self.repo.changectx(parentid)
410 eb524b957345 move aresamefiles() from HgChangeReceiver to util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	830 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	831 self.current.copies[path] = from_file
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	832
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	833 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	834 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	835 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	836 self.current.batons[path] = path
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	837 br_path, branch = self._path_and_branch_for_path(path)
30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	838 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	839 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	840 self.current.emptybranches[branch] = True
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	841 else:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	842 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	843 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	844 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	845 if copyfrom_path:
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	846 tag = self._is_path_tag(copyfrom_path)
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	847 if tag not in self.tags:
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	848 tag = None
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	849 if not self._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	850 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	851 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	852 if tag:
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	853 source_branch, source_rev = self.tags[tag]
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	854 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	855 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	856 source_rev = copyfrom_revision
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	857 cp_f, source_branch = self._path_and_branch_for_path(copyfrom_path)
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	858 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	859 assert br_path is not None
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	860 self.branches[branch] = source_branch, source_rev, self.current.rev.revnum
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	861 new_hash = self.get_parent_revision(source_rev + 1,
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 55 diff changeset	862 source_branch)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	863 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	864 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	865 return path
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	866 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	867 if cp_f != '/' and cp_f != '':
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	868 cp_f = '%s/' % cp_f
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	869 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	870 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	871 copies = {}
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	872 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	873 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	874 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	875 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	876 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	877 fp_c = path + '/' + f2
97 0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 73 diff changeset	878 self.set_file(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	879 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	880 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	881 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	882 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	883 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	884 # 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	885 # the source and destination revisions, or discard it completely.
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	886 parentid = self.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	887 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	888 parentctx = self.repo.changectx(parentid)
410 eb524b957345 move aresamefiles() from HgChangeReceiver to util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 409 diff changeset	889 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	890 self.current.copies.update(copies)
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	891 return path
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	892
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	893 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	894 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	895 if name == 'svn:executable':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	896 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	897 elif name == 'svn:special':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	898 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	899
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	900 @ieditor
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	901 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	902 if dir_baton is None:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	903 return
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	904 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	905 if name == 'svn:externals':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	906 self.current.externals[path] = value
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	907
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	908 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	909 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	910 self.current.batons[path] = path
116 30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	911 p_, branch = self._path_and_branch_for_path(path)
30580c05dccc hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() Patrick Mezard <pmezard@gmail.com> parents: 111 diff changeset	912 if p_ == '':
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	913 self.current.emptybranches[branch] = False
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	914 return path
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	915
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	916 @ieditor
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	917 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	918 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	919 del self.current.batons[dir_baton]
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	920
362 705f33c0a323 Replace stash_exception_on_self() by @ieditor. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 352 diff changeset	921 @ieditor
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	922 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	923 # 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	924 # 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	925 # 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	926 # 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	927 base = ''
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	928 if not self._is_path_valid(self.current.file):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	929 return lambda x: None
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	930 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	931 '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	932 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	933 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	934 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	935 return lambda x: None
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	936 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	937 source = cStringIO.StringIO(base)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	938 target = cStringIO.StringIO()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	939 self.stream = target
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	940
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	941 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	942 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	943 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	944 'cannot call handler!')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	945 def txdelt_window(window):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	946 try:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	947 if not self._is_path_valid(self.current.file):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	948 return
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	949 handler(window, baton)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	950 # window being None means commit this file
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	951 if not window:
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	952 self.current.files[self.current.file] = target.getvalue()
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	953 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	954 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	955 self.current.missing.add(self.current.file)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	956 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	957 raise hgutil.Abort(*e.args)
146 4da9f20aef01 Add some more coverage directives. Augie Fackler <durin42@gmail.com> parents: 145 diff changeset	958 except: #pragma: no cover
411 d71972428fce editor: move current revision state into a separate class Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 410 diff changeset	959 print len(base), self.current.file
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	960 self._exception_info = sys.exc_info()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	961 raise
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	962 return txdelt_window

Mercurial > hgsubversion

annotate hgsubversion/hg_delta_editor.py @ 413:ac0cc3c9ea63