hgsubversion: fetch_command.py annotate

annotate fetch_command.py @ 179:a336e3e82648

Fetch: add a filemap argument for use in converting old repositories to Mercurial.

author	Graham Booker <gbooker@cod3r.com>
date	Sat, 03 Jan 2009 20:15:03 -0600
parents	c4115b3918e9
children	e37f9d3fd5e7

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 re
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
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 from mercurial import patch
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 from mercurial import node
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import context
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 from mercurial import revlog
6 1a5bb173170b Fixes for win32 compatibility. Changes suggested by Shun-ichi GOTO, with some alterations by me. Augie Fackler <durin42@gmail.com> parents: 0 diff changeset	9 from mercurial import util as merc_util
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 from svn import core
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	11 from svn import delta
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	12
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 import hg_delta_editor
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	14 import svnwrap
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	15 import svnexternals
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 import util
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	17
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	18
63 2e30b59a9c19 Added some coverage pragmas to stop it from trying to cover things we can't test. Augie Fackler <durin42@gmail.com> parents: 59 diff changeset	19 def print_your_svn_is_old_message(ui): #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	20 ui.status("In light of that, I'll fall back and do diffs, but it won't do "
11 83ed086ddf72 Add a missing newline. Augie Fackler <durin42@gmail.com> parents: 6 diff changeset	21 "as good a job. You should really upgrade your server.\n")
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	22
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	23
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	24 @util.register_subcommand('pull')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	25 def fetch_revisions(ui, svn_url, hg_repo_path, skipto_rev=0, stupid=None,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	26 tag_locations='tags',
167 3cd6a7354207 fetch: Add support for an authormap which can rename authors, intended for Graham Booker <gbooker@cod3r.com> parents: 166 diff changeset	27 authors=None,
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	28 filemap=None,
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	29 **opts):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	30 """Pull new revisions from Subversion.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	31 """
140 9ffde8662967 util: Add a command to normalize svn urls and use it in a couple of places. Test that it works and prevents failed assertions. Augie Fackler <durin42@gmail.com> parents: 133 diff changeset	32 svn_url = util.normalize_url(svn_url)
44 85fcac4e2291 Fix an encoding bug that would occur if the local encoding was not utf-8. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	33 old_encoding = merc_util._encoding
85fcac4e2291 Fix an encoding bug that would occur if the local encoding was not utf-8. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	34 merc_util._encoding = 'UTF-8'
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	35 skipto_rev=int(skipto_rev)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	36 have_replay = not stupid
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	37 if have_replay and not callable(
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	38 delta.svn_txdelta_apply(None, None, None)[0]): #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	39 ui.status('You are using old Subversion SWIG bindings. Replay will not'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	40 ' work until you upgrade to 1.5.0 or newer. Falling back to'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	41 ' a slower method that may be buggier. Please upgrade, or'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	42 ' contribute a patch to use the ctypes bindings instead'
29 575bd29bc1d8 Fix a missing newline. Augie Fackler <durin42@gmail.com> parents: 25 diff changeset	43 ' of SWIG.\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	44 have_replay = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	45 initializing_repo = False
6 1a5bb173170b Fixes for win32 compatibility. Changes suggested by Shun-ichi GOTO, with some alterations by me. Augie Fackler <durin42@gmail.com> parents: 0 diff changeset	46 svn = svnwrap.SubversionRepo(svn_url, username=merc_util.getuser())
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	47 author_host = "@%s" % svn.uuid
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	48 tag_locations = tag_locations.split(',')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	49 hg_editor = hg_delta_editor.HgChangeReceiver(hg_repo_path,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	50 ui_=ui,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	51 subdir=svn.subdir,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	52 author_host=author_host,
167 3cd6a7354207 fetch: Add support for an authormap which can rename authors, intended for Graham Booker <gbooker@cod3r.com> parents: 166 diff changeset	53 tag_locations=tag_locations,
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	54 authors=authors,
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	55 filemap=filemap)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	56 if os.path.exists(hg_editor.uuid_file):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	57 uuid = open(hg_editor.uuid_file).read()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	58 assert uuid == svn.uuid
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	59 start = int(open(hg_editor.last_revision_handled_file, 'r').read())
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	60 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	61 open(hg_editor.uuid_file, 'w').write(svn.uuid)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	62 open(hg_editor.svn_url_file, 'w').write(svn_url)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	63 open(hg_editor.last_revision_handled_file, 'w').write(str(0))
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	64 initializing_repo = True
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	65 start = skipto_rev
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 # start converting revisions
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	68 for r in svn.revisions(start=start):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	69 valid = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	70 hg_editor.update_branch_tag_map_for_rev(r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	71 for p in r.paths:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	72 if hg_editor._is_path_valid(p):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	73 valid = True
166 db88e528e8e6 Fixed typo: "continue" should have been "break". Martin Geisler <mg@daimi.au.dk> parents: 163 diff changeset	74 break
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	75 if initializing_repo and start > 0:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	76 assert False, 'This feature not ready yet.'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	77 if valid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	78 # got a 502? Try more than once!
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	79 tries = 0
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	80 converted = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	81 while not converted and tries < 3:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	82 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	83 ui.status('converting %s\n' % r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	84 if have_replay:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	85 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	86 replay_convert_rev(hg_editor, svn, r)
63 2e30b59a9c19 Added some coverage pragmas to stop it from trying to cover things we can't test. Augie Fackler <durin42@gmail.com> parents: 59 diff changeset	87 except svnwrap.SubversionRepoCanNotReplay, e: #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	88 ui.status('%s\n' % e.message)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	89 print_your_svn_is_old_message(ui)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	90 have_replay = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	91 stupid_svn_server_pull_rev(ui, svn, hg_editor, r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	92 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	93 stupid_svn_server_pull_rev(ui, svn, hg_editor, r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	94 converted = True
32 d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	95 tmpfile = '%s_tmp' % hg_editor.last_revision_handled_file
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	96 fp = open(tmpfile, 'w')
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	97 fp.write(str(r.revnum))
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	98 fp.close()
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	99 merc_util.rename(tmpfile,
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	100 hg_editor.last_revision_handled_file)
63 2e30b59a9c19 Added some coverage pragmas to stop it from trying to cover things we can't test. Augie Fackler <durin42@gmail.com> parents: 59 diff changeset	101 except core.SubversionException, e: #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	102 if hasattr(e, 'message') and (
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	103 'Server sent unexpected return value (502 Bad Gateway)'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	104 ' in response to PROPFIND') in e.message:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	105 tries += 1
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	106 ui.status('Got a 502, retrying (%s)\n' % tries)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	107 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	108 raise
44 85fcac4e2291 Fix an encoding bug that would occur if the local encoding was not utf-8. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	109 merc_util._encoding = old_encoding
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	110
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	111
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	112 def cleanup_file_handles(svn, count):
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	113 if count % 50 == 0:
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	114 svn.init_ra_and_client()
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	115
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	116 def replay_convert_rev(hg_editor, svn, r):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	117 hg_editor.set_current_rev(r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	118 svn.get_replay(r.revnum, hg_editor)
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	119 i = 1
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	120 if hg_editor.missing_plaintexts:
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	121 hg_editor.ui.status('Fetching %s files that could not use replay.\n' %
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	122 len(hg_editor.missing_plaintexts))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	123 files_to_grab = set()
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	124 rootpath = svn.subdir and svn.subdir[1:] or ''
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	125 for p in hg_editor.missing_plaintexts:
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	126 hg_editor.ui.status('.')
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	127 hg_editor.ui.flush()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	128 if p[-1] == '/':
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	129 dirpath = p[len(rootpath):]
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	130 files_to_grab.update((dirpath + f for f,k in
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	131 svn.list_files(dirpath, r.revnum)
112 e58c2f1de059 Fix a regression in converting repositories with files copied in from outside Augie Fackler <durin42@gmail.com> parents: 111 diff changeset	132 if k == 'f'))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	133 else:
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	134 files_to_grab.add(p[len(rootpath):])
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	135 hg_editor.ui.status('\nFetching files...\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	136 for p in files_to_grab:
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	137 hg_editor.ui.status('.')
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	138 hg_editor.ui.flush()
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	139 cleanup_file_handles(svn, i)
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	140 i += 1
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	141 data, mode = svn.get_file(p, r.revnum)
97 0d3a2a7cefa3 hg_delta_editor: fix symlink prefix confusion Patrick Mezard <pmezard@gmail.com> parents: 90 diff changeset	142 hg_editor.set_file(p, data, 'x' in mode, 'l' in mode)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	143 hg_editor.missing_plaintexts = set()
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	144 hg_editor.ui.status('\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	145 hg_editor.commit_current_delta()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	146
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	147
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	148 binary_file_re = re.compile(r'''Index: ([^\n]*)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	149 =*
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	150 Cannot display: file marked as a binary type.''')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	151
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	152 property_exec_set_re = re.compile(r'''Property changes on: ([^\n]*)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	153 _*
25 99f8e4b535e9 svn 1.4 and 1.5 have different ideas of diff output for prop changes. Augie Fackler <durin42@gmail.com> parents: 11 diff changeset	154 (?:Added\|Name): svn:executable
111 5497d1264b4d fetch_command: Fix mis-converted executable when svn:executable was set to the Augie Fackler <durin42@gmail.com> parents: 110 diff changeset	155 \+''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	156
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	157 property_exec_removed_re = re.compile(r'''Property changes on: ([^\n]*)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	158 _*
25 99f8e4b535e9 svn 1.4 and 1.5 have different ideas of diff output for prop changes. Augie Fackler <durin42@gmail.com> parents: 11 diff changeset	159 (?:Deleted\|Name): svn:executable
111 5497d1264b4d fetch_command: Fix mis-converted executable when svn:executable was set to the Augie Fackler <durin42@gmail.com> parents: 110 diff changeset	160 -''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	161
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	162 empty_file_patch_wont_make_re = re.compile(r'''Index: ([^\n])\n=\n(?=Index:)''')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	163
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	164 any_file_re = re.compile(r'''^Index: ([^\n])\n=\n''', re.MULTILINE)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	165
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	166 property_special_set_re = re.compile(r'''Property changes on: ([^\n]*)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	167 _*
25 99f8e4b535e9 svn 1.4 and 1.5 have different ideas of diff output for prop changes. Augie Fackler <durin42@gmail.com> parents: 11 diff changeset	168 (?:Added\|Name): svn:special
111 5497d1264b4d fetch_command: Fix mis-converted executable when svn:executable was set to the Augie Fackler <durin42@gmail.com> parents: 110 diff changeset	169 \+''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	170
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	171 property_special_removed_re = re.compile(r'''Property changes on: ([^\n]*)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	172 _*
25 99f8e4b535e9 svn 1.4 and 1.5 have different ideas of diff output for prop changes. Augie Fackler <durin42@gmail.com> parents: 11 diff changeset	173 (?:Deleted\|Name): svn:special
111 5497d1264b4d fetch_command: Fix mis-converted executable when svn:executable was set to the Augie Fackler <durin42@gmail.com> parents: 110 diff changeset	174 \-''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	175
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	176 def mempatchproxy(parentctx, files):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	177 # Avoid circular references patch.patchfile -> mempatch
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	178 patchfile = patch.patchfile
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	179
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	180 class mempatch(patchfile):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	181 def __init__(self, ui, fname, opener, missing=False):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	182 patchfile.__init__(self, ui, fname, None, False)
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	183
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	184 def readlines(self, fname):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	185 if fname not in parentctx:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	186 raise IOError('Cannot find %r to patch' % fname)
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	187 fctx = parentctx[fname]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	188 data = fctx.data()
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	189 if 'l' in fctx.flags():
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	190 data = 'link ' + data
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	191 return cStringIO.StringIO(data).readlines()
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	192
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	193 def writelines(self, fname, lines):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	194 files[fname] = ''.join(lines)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	195
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	196 def unlink(self, fname):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	197 files[fname] = None
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	198
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	199 return mempatch
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	200
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	201 def stupid_diff_branchrev(ui, svn, hg_editor, branch, r, parentctx):
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	202 """Extract all 'branch' content at a given revision.
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	203
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	204 Return a tuple (files, filectxfn) where 'files' is the list of all files
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	205 in the branch at the given revision, and 'filectxfn' is a memctx compatible
109 460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	206 callable to retrieve individual file information. Raise BadPatchApply upon
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	207 error.
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	208 """
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	209 def make_diff_path(b):
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	210 if b == None:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	211 return 'trunk'
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	212 return 'branches/' + b
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	213
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	214 parent_rev, br_p = hg_editor.get_parent_svn_branch_and_rev(r.revnum, branch)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	215 diff_path = make_diff_path(branch)
109 460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	216 try:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	217 if br_p == branch:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	218 # letting patch handle binaries sounded
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	219 # cool, but it breaks patch in sad ways
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	220 d = svn.get_unified_diff(diff_path, r.revnum, deleted=False,
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	221 ignore_type=False)
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	222 else:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	223 d = svn.get_unified_diff(diff_path, r.revnum,
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	224 other_path=make_diff_path(br_p),
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	225 other_rev=parent_rev,
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	226 deleted=True, ignore_type=True)
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	227 if d:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	228 raise BadPatchApply('branch creation with mods')
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	229 except svnwrap.SubversionRepoCanNotDiff:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	230 raise BadPatchApply('subversion diffing code is not supported')
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	231 except core.SubversionException, e:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	232 if (hasattr(e, 'apr_err') and e.apr_err != 160013):
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	233 raise
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	234 raise BadPatchApply('previous revision does not exist')
169 f1919e1c35bf fetch_command: cancel patching when encountering binary diffs Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	235 if '\0' in d:
f1919e1c35bf fetch_command: cancel patching when encountering binary diffs Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	236 raise BadPatchApply('binary diffs are not supported')
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	237 files_data = {}
128 bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	238 binary_files = {}
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	239 touched_files = {}
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	240 for m in binary_file_re.findall(d):
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	241 # we have to pull each binary file by hand as a fulltext,
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	242 # which sucks but we've got no choice
128 bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	243 binary_files[m] = 1
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	244 touched_files[m] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	245 d2 = empty_file_patch_wont_make_re.sub('', d)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	246 d2 = property_exec_set_re.sub('', d2)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	247 d2 = property_exec_removed_re.sub('', d2)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	248 for f in any_file_re.findall(d):
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	249 # Here we ensure that all files, including the new empty ones
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	250 # are marked as touched. Content is loaded on demand.
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	251 touched_files[f] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	252 if d2.strip() and len(re.findall('\n[-+]', d2.strip())) > 0:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	253 try:
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	254 oldpatchfile = patch.patchfile
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	255 patch.patchfile = mempatchproxy(parentctx, files_data)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	256 try:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	257 # We can safely ignore the changed list since we are
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	258 # handling non-git patches. Touched files are known
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	259 # by our memory patcher.
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	260 patch_st = patch.applydiff(ui, cStringIO.StringIO(d2),
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	261 {}, strip=0)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	262 finally:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	263 patch.patchfile = oldpatchfile
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	264 except patch.PatchError:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	265 # TODO: this happens if the svn server has the wrong mime
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	266 # type stored and doesn't know a file is binary. It would
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	267 # be better to do one file at a time and only do a
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	268 # full fetch on files that had problems.
109 460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	269 raise BadPatchApply('patching failed')
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	270 for x in files_data.iterkeys():
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	271 ui.status('M %s\n' % x)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	272 # if this patch didn't apply right, fall back to exporting the
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	273 # entire rev.
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	274 if patch_st == -1:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	275 assert False, ('This should only happen on case-insensitive'
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	276 ' volumes.')
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	277 elif patch_st == 1:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	278 # When converting Django, I saw fuzz on .po files that was
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	279 # causing revisions to end up failing verification. If that
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	280 # can be fixed, maybe this won't ever be reached.
109 460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	281 raise BadPatchApply('patching succeeded with fuzz')
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	282 else:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	283 ui.status('Not using patch for %s, diff had no hunks.\n' %
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	284 r.revnum)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	285
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	286 exec_files = {}
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	287 for m in property_exec_removed_re.findall(d):
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	288 exec_files[m] = False
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	289 for m in property_exec_set_re.findall(d):
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	290 exec_files[m] = True
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	291 for m in exec_files:
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	292 touched_files[m] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	293 link_files = {}
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	294 for m in property_special_set_re.findall(d):
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	295 # TODO(augie) when a symlink is removed, patching will fail.
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	296 # We're seeing that above - there's gotta be a better
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	297 # workaround than just bailing like that.
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	298 assert m in files_data
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	299 link_files[m] = True
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	300 for m in property_special_removed_re.findall(d):
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	301 assert m in files_data
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	302 link_files[m] = False
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	303
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	304 for p in r.paths:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	305 if p.startswith(diff_path) and r.paths[p].action == 'D':
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	306 p2 = p[len(diff_path)+1:].strip('/')
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	307 if p2 in parentctx:
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	308 files_data[p2] = None
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	309 continue
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	310 # If this isn't in the parent ctx, it must've been a dir
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	311 files_data.update([(f, None) for f in parentctx if f.startswith(p2 + '/')])
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	312
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	313 for f in files_data:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	314 touched_files[f] = 1
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	315
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	316 copies = getcopies(svn, hg_editor, branch, diff_path, r, touched_files,
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	317 parentctx)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	318
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	319 def filectxfn(repo, memctx, path):
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	320 if path in files_data and files_data[path] is None:
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	321 raise IOError()
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	322
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	323 if path in binary_files:
128 bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	324 data, mode = svn.get_file(diff_path + '/' + path, r.revnum)
bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	325 isexe = 'x' in mode
bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	326 islink = 'l' in mode
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	327 else:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	328 isexe = exec_files.get(path, 'x' in parentctx.flags(path))
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	329 islink = link_files.get(path, 'l' in parentctx.flags(path))
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	330 data = ''
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	331 if path in files_data:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	332 data = files_data[path]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	333 if islink:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	334 data = data[len('link '):]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	335 elif path in parentctx:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	336 data = parentctx[path].data()
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	337
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	338 copied = copies.get(path)
128 bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	339 return context.memfilectx(path=path, data=data, islink=islink,
bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	340 isexec=isexe, copied=copied)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	341
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	342 return list(touched_files), filectxfn
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	343
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	344 def makecopyfinder(r, branchpath, rootdir):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	345 """Return a function detecting copies.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	346
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	347 Returned copyfinder(path) returns None if no copy information can
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	348 be found or ((source, sourcerev), sourcepath) where "sourcepath" is the
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	349 copy source path, "sourcerev" the source svn revision and "source" is the
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	350 copy record path causing the copy to occur. If a single file was copied
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	351 "sourcepath" and "source" are the same, while file copies dectected from
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	352 directory copies return the copied source directory in "source".
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	353 """
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	354 # filter copy information for current branch
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	355 branchpath = branchpath + '/'
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	356 fullbranchpath = rootdir + branchpath
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	357 copies = []
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	358 for path, e in r.paths.iteritems():
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	359 if not e.copyfrom_path:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	360 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	361 if not path.startswith(branchpath):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	362 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	363 if not e.copyfrom_path.startswith(fullbranchpath):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	364 # ignore cross branch copies
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	365 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	366 dest = path[len(branchpath):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	367 source = e.copyfrom_path[len(fullbranchpath):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	368 copies.append((dest, (source, e.copyfrom_rev)))
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	369
163 fdc249cd1a0a Combine sort and reverse. Martin Geisler <mg@daimi.au.dk> parents: 158 diff changeset	370 copies.sort(reverse=True)
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	371 exactcopies = dict(copies)
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	372
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	373 def finder(path):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	374 if path in exactcopies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	375 return exactcopies[path], exactcopies[path][0]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	376 # look for parent directory copy, longest first
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	377 for dest, (source, sourcerev) in copies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	378 dest = dest + '/'
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	379 if not path.startswith(dest):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	380 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	381 sourcepath = source + '/' + path[len(dest):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	382 return (source, sourcerev), sourcepath
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	383 return None
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	384
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	385 return finder
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	386
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	387 def getcopies(svn, hg_editor, branch, branchpath, r, files, parentctx):
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	388 """Return a mapping {dest: source} for every file copied into r.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	389 """
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	390 if parentctx.node() == revlog.nullid:
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	391 return {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	392
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	393 # Extract svn copy information, group them by copy source.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	394 # The idea is to duplicate the replay behaviour where copies are
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	395 # evaluated per copy event (one event for all files in a directory copy,
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	396 # one event for single file copy). We assume that copy events match
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	397 # copy sources in revision info.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	398 svncopies = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	399 finder = makecopyfinder(r, branchpath, svn.subdir)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	400 for f in files:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	401 copy = finder(f)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	402 if copy:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	403 svncopies.setdefault(copy[0], []).append((f, copy[1]))
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	404 if not svncopies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	405 return {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	406
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	407 # cache changeset contexts and map them to source svn revisions
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	408 ctxs = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	409 def getctx(svnrev):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	410 if svnrev in ctxs:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	411 return ctxs[svnrev]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	412 changeid = hg_editor.get_parent_revision(svnrev + 1, branch)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	413 ctx = None
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	414 if changeid != revlog.nullid:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	415 ctx = hg_editor.repo.changectx(changeid)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	416 ctxs[svnrev] = ctx
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	417 return ctx
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	418
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	419 # check svn copies really make sense in mercurial
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	420 hgcopies = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	421 for (sourcepath, rev), copies in svncopies.iteritems():
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	422 sourcectx = getctx(rev)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	423 if sourcectx is None:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	424 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	425 sources = [s[1] for s in copies]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	426 if not hg_editor.aresamefiles(sourcectx, parentctx, sources):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	427 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	428 hgcopies.update(copies)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	429 return hgcopies
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	430
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	431 def stupid_fetch_externals(svn, branchpath, r, parentctx):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	432 """Extract svn:externals for the current revision and branch
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	433
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	434 Return an externalsfile instance or None if there are no externals
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	435 to convert and never were.
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	436 """
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	437 externals = svnexternals.externalsfile()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	438 if '.hgsvnexternals' in parentctx:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	439 externals.read(parentctx['.hgsvnexternals'].data())
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	440 # Detect property additions only, changes are handled by checking
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	441 # existing entries individually. Projects are unlikely to store
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	442 # externals on many different root directories, so we trade code
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	443 # duplication and complexity for a constant lookup price at every
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	444 # revision in the common case.
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	445 dirs = set(externals)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	446 if parentctx.node() == revlog.nullid:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	447 dirs.update([p for p,k in svn.list_files(branchpath, r.revnum) if k == 'd'])
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	448 dirs.add('')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	449 else:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	450 branchprefix = branchpath + '/'
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	451 for path, e in r.paths.iteritems():
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	452 if e.action == 'D':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	453 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	454 if not path.startswith(branchprefix) and path != branchpath:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	455 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	456 kind = svn.checkpath(path, r.revnum)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	457 if kind != 'd':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	458 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	459 path = path[len(branchprefix):]
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	460 dirs.add(path)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	461 if e.action == 'M':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	462 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	463 for child, k in svn.list_files(branchprefix + path, r.revnum):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	464 if k == 'd':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	465 dirs.add((path + '/' + child).strip('/'))
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	466
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	467 # Retrieve new or updated values
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	468 for dir in dirs:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	469 try:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	470 values = svn.list_props(branchpath + '/' + dir, r.revnum)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	471 externals[dir] = values.get('svn:externals', '')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	472 except IOError:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	473 externals[dir] = ''
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	474
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	475 if not externals and '.hgsvnexternals' not in parentctx:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	476 # Do not create empty externals files
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	477 return None
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	478 return externals
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	479
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	480 def stupid_fetch_branchrev(svn, hg_editor, branch, branchpath, r, parentctx):
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	481 """Extract all 'branch' content at a given revision.
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	482
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	483 Return a tuple (files, filectxfn) where 'files' is the list of all files
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	484 in the branch at the given revision, and 'filectxfn' is a memctx compatible
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	485 callable to retrieve individual file information.
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	486 """
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 79 diff changeset	487 files = []
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	488 if parentctx.node() == revlog.nullid:
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	489 # Initial revision, fetch all files
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	490 for path, kind in svn.list_files(branchpath, r.revnum):
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	491 if kind == 'f':
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 79 diff changeset	492 files.append(path)
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	493 else:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	494 branchprefix = branchpath + '/'
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	495 for path, e in r.paths.iteritems():
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	496 if not path.startswith(branchprefix):
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 79 diff changeset	497 continue
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	498 if not hg_editor._is_path_valid(branchprefix + path):
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	499 continue
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	500 kind = svn.checkpath(path, r.revnum)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	501 path = path[len(branchprefix):]
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	502 if kind == 'f':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	503 files.append(path)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	504 elif kind == 'd':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	505 if e.action == 'M':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	506 continue
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	507 dirpath = branchprefix + path
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	508 for child, k in svn.list_files(dirpath, r.revnum):
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	509 if k == 'f':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	510 files.append(path + '/' + child)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	511 else:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	512 if path in parentctx:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	513 files.append(path)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	514 continue
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	515 # Assume it's a deleted directory
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	516 path = path + '/'
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	517 deleted = [f for f in parentctx if f.startswith(path)]
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	518 files += deleted
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 79 diff changeset	519
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	520 copies = getcopies(svn, hg_editor, branch, branchpath, r, files, parentctx)
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	521
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	522 def filectxfn(repo, memctx, path):
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	523 data, mode = svn.get_file(branchpath + '/' + path, r.revnum)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	524 isexec = 'x' in mode
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	525 islink = 'l' in mode
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	526 copied = copies.get(path)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	527 return context.memfilectx(path=path, data=data, islink=islink,
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	528 isexec=isexec, copied=copied)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	529
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	530 return files, filectxfn
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	531
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	532 def stupid_svn_server_pull_rev(ui, svn, hg_editor, r):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	533 # this server fails at replay
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	534 branches = hg_editor.branches_in_paths(r.paths)
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	535 deleted_branches = {}
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	536 date = r.date.replace('T', ' ').replace('Z', '').split('.')[0]
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	537 date += ' -0000'
147 22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	538 check_deleted_branches = set()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	539 for b in branches:
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	540 parentctx = hg_editor.repo[hg_editor.get_parent_revision(r.revnum, b)]
147 22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	541 if parentctx.branch() != (b or 'default'):
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	542 check_deleted_branches.add(b)
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	543 kind = svn.checkpath(branches[b], r.revnum)
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	544 if kind != 'd':
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	545 # Branch does not exist at this revision. Get parent revision and
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	546 # remove everything.
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	547 deleted_branches[b] = parentctx.node()
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	548 continue
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	549 else:
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	550 try:
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	551 files_touched, filectxfn2 = stupid_diff_branchrev(
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	552 ui, svn, hg_editor, b, r, parentctx)
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	553 except BadPatchApply, e:
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	554 # Either this revision or the previous one does not exist.
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	555 ui.status("fetching entire rev: %s.\n" % e.message)
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	556 files_touched, filectxfn2 = stupid_fetch_branchrev(
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	557 svn, hg_editor, b, branches[b], r, parentctx)
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	558
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	559 externals = stupid_fetch_externals(svn, branches[b], r, parentctx)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	560 if externals is not None:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	561 files_touched.append('.hgsvnexternals')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	562
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	563 def filectxfn(repo, memctx, path):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	564 if path == '.hgsvnexternals':
176 c4115b3918e9 Really delete the .hgsvnexternals file when explicitely removed Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	565 if not externals:
c4115b3918e9 Really delete the .hgsvnexternals file when explicitely removed Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	566 raise IOError()
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	567 return context.memfilectx(path=path, data=externals.write(),
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	568 islink=False, isexec=False, copied=None)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	569 return filectxfn2(repo, memctx, path)
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	570
154 6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 147 diff changeset	571 extra = util.build_extra(r.revnum, b, svn.uuid, svn.subdir)
59 430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 58 diff changeset	572 if '' in files_touched:
430af23bef4a Performance fix for branches-from-tags in real replay, which is tied up with Augie Fackler <durin42@gmail.com> parents: 58 diff changeset	573 files_touched.remove('')
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	574 removedFiles = []
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	575 for file in files_touched:
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	576 if not hg_editor._is_file_included(file):
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	577 removedFiles.append(file)
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	578 for file in removedFiles:
a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	579 files_touched.remove(file)
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	580 if parentctx.node() != node.nullid or files_touched:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	581 # TODO(augie) remove this debug code? Or maybe it's sane to have it.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	582 for f in files_touched:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	583 if f:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	584 assert f[0] != '/'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	585 current_ctx = context.memctx(hg_editor.repo,
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	586 [parentctx.node(), revlog.nullid],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	587 r.message or '...',
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	588 files_touched,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	589 filectxfn,
168 4f26fa049452 authormap: Add tests, fix in stupid mode. Augie Fackler <durin42@gmail.com> parents: 167 diff changeset	590 hg_editor.authorforsvnauthor(r.author),
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	591 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	592 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	593 ha = hg_editor.repo.commitctx(current_ctx)
33 a9c15cae50e5 Faster append-only revmap implementation. Andreas Hartmetz <ahartmetz@gmail.com> parents: 32 diff changeset	594 hg_editor.add_to_revmap(r.revnum, b, ha)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	595 hg_editor._save_metadata()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	596 ui.status('committed as %s on branch %s\n' %
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	597 (node.hex(ha), b or 'default'))
147 22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	598 # These are branches which would have an 'R' status in svn log. This means they were
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	599 # replaced by some other branch, so we need to verify they get marked as closed.
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	600 for branch in check_deleted_branches:
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	601 branchedits = sorted(filter(lambda x: x[0][1] == branch and x[0][0] < r.revnum,
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	602 hg_editor.revmap.iteritems()), reverse=True)
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	603 is_closed = False
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	604 if len(branchedits) > 0:
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	605 branchtip = branchedits[0][1]
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	606 for child in hg_editor.repo[branchtip].children():
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	607 if child.branch() == 'closed-branches':
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	608 is_closed = True
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	609 break
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	610 if not is_closed:
22162380c4b9 Improve branch closing in the case of a single-rev replacement of one branch Augie Fackler <durin42@gmail.com> parents: 141 diff changeset	611 deleted_branches[branch] = branchtip
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	612 for b, parent in deleted_branches.iteritems():
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	613 if parent == node.nullid:
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	614 continue
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	615 parentctx = hg_editor.repo[parent]
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	616 files_touched = parentctx.manifest().keys()
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	617 def filectxfn(repo, memctx, path):
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	618 raise IOError()
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	619 closed = node.nullid
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	620 if 'closed-branches' in hg_editor.repo.branchtags():
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	621 closed = hg_editor.repo['closed-branches'].node()
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	622 parents = (parent, closed)
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	623 current_ctx = context.memctx(hg_editor.repo,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	624 parents,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	625 r.message or '...',
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	626 files_touched,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	627 filectxfn,
168 4f26fa049452 authormap: Add tests, fix in stupid mode. Augie Fackler <durin42@gmail.com> parents: 167 diff changeset	628 hg_editor.authorforsvnauthor(r.author),
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	629 date,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	630 {'branch': 'closed-branches'})
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	631 ha = hg_editor.repo.commitctx(current_ctx)
141 6f2d67bf3039 Fix missing newlines. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	632 ui.status('Marked branch %s as closed.\n' % (b or 'default'))
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	633 hg_editor._save_metadata()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	634
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	635 class BadPatchApply(Exception):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	636 pass

Mercurial > hgsubversion

annotate fetch_command.py @ 179:a336e3e82648