hgsubversion: fetch_command.py annotate

annotate fetch_command.py @ 236:c34abd2448b7

Issue #60: Add a svn sub-command to list all authors in a Subversion repository

author	Daniel Tang <dytang@cs.purdue.edu>
date	Tue, 07 Apr 2009 22:15:22 -0400
parents	33e885f5f86a
children	c90cfa665b81

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 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	25 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	26 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	27 filemap=None,
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	28 **opts):
185 57355b0e7bd1 Creating patch for documention messages. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 184 diff changeset	29 """pull new revisions from Subversion
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	30 """
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	31 svn_url = util.normalize_url(svn_url)
223 330f0b15d417 issue67: mercurial 1.3 util incompatibility with encoding swap Luke Opperman <luke@loppear.com> parents: 218 diff changeset	32 old_encoding = util.swap_out_encoding()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	33 skipto_rev=int(skipto_rev)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	34 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	35 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	36 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	37 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	38 ' 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	39 ' 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	40 ' contribute a patch to use the ctypes bindings instead'
29 575bd29bc1d8 Fix a missing newline. Augie Fackler <durin42@gmail.com> parents: 25 diff changeset	41 ' of SWIG.\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	42 have_replay = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	43 initializing_repo = False
234 33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 229 diff changeset	44 user = opts.get('username', merc_util.getuser())
33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 229 diff changeset	45 passwd = opts.get('password', '')
33e885f5f86a Add --username and --password options to all commands Daniel Tang <dytang@cs.purdue.edu> parents: 229 diff changeset	46 svn = svnwrap.SubversionRepo(svn_url, user, passwd)
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
225 2117cb0118fe Get rid of .hg/svn/last_rev: Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 224 diff changeset	59 start = hg_editor.last_known_revision()
0 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 initializing_repo = True
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	64 start = skipto_rev
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	65
197 43d56e973c3c Replace a few asserts with aborts. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 188 diff changeset	66 if initializing_repo and start > 0:
43d56e973c3c Replace a few asserts with aborts. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 188 diff changeset	67 raise merc_util.Abort('Revision skipping at repository initialization '
43d56e973c3c Replace a few asserts with aborts. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 188 diff changeset	68 'remains unimplemented.')
43d56e973c3c Replace a few asserts with aborts. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 188 diff changeset	69
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	70 # start converting revisions
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	71 for r in svn.revisions(start=start):
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	72 valid = True
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	73 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	74 for p in r.paths:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	75 if hg_editor._is_path_valid(p):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	76 valid = True
166 db88e528e8e6 Fixed typo: "continue" should have been "break". Martin Geisler <mg@daimi.au.dk> parents: 163 diff changeset	77 break
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	78 if valid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	79 # got a 502? Try more than once!
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	80 tries = 0
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	81 converted = False
229 7f20914e52e8 Better 502 logic that does not catch non-502 errors. Augie Fackler <durin42@gmail.com> parents: 228 diff changeset	82 while not converted:
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	83 try:
198 df4611050286 Output consolidation; decrease the ‘Fetching...’ message to debug level. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 197 diff changeset	84 util.describe_revision(ui, r)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	85 if have_replay:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	86 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	87 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	88 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	89 ui.status('%s\n' % e.message)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	90 print_your_svn_is_old_message(ui)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	91 have_replay = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	92 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	93 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	94 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	95 converted = True
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	96 except core.SubversionException, e: #pragma: no cover
229 7f20914e52e8 Better 502 logic that does not catch non-502 errors. Augie Fackler <durin42@gmail.com> parents: 228 diff changeset	97 if (e.apr_err == core.SVN_ERR_RA_DAV_REQUEST_FAILED
7f20914e52e8 Better 502 logic that does not catch non-502 errors. Augie Fackler <durin42@gmail.com> parents: 228 diff changeset	98 and '502' in str(e)
7f20914e52e8 Better 502 logic that does not catch non-502 errors. Augie Fackler <durin42@gmail.com> parents: 228 diff changeset	99 and tries < 3):
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	100 tries += 1
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	101 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	102 else:
224 2165461d2dd8 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 203 diff changeset	103 raise merc_util.Abort(*e.args)
223 330f0b15d417 issue67: mercurial 1.3 util incompatibility with encoding swap Luke Opperman <luke@loppear.com> parents: 218 diff changeset	104 util.swap_out_encoding(old_encoding)
330f0b15d417 issue67: mercurial 1.3 util incompatibility with encoding swap Luke Opperman <luke@loppear.com> parents: 218 diff changeset	105
181 e37f9d3fd5e7 remove decorators (compat with python2.3) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 179 diff changeset	106 fetch_revisions = util.register_subcommand('pull')(fetch_revisions)
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	107
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	108
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	109 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	110 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	111 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	112
218 a360ddc97719 branches: change handling again, but this time a little less magic. Augie Fackler <durin42@gmail.com> parents: 203 diff changeset	113
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	114 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	115 hg_editor.set_current_rev(r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	116 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	117 i = 1
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	118 if hg_editor.missing_plaintexts:
198 df4611050286 Output consolidation; decrease the ‘Fetching...’ message to debug level. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 197 diff changeset	119 hg_editor.ui.debug('Fetching %s files that could not use replay.\n' %
df4611050286 Output consolidation; decrease the ‘Fetching...’ message to debug level. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 197 diff changeset	120 len(hg_editor.missing_plaintexts))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	121 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	122 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	123 for p in hg_editor.missing_plaintexts:
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	124 hg_editor.ui.note('.')
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	125 hg_editor.ui.flush()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	126 if p[-1] == '/':
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	127 dirpath = p[len(rootpath):]
182 47d25d61abfa remove generators (compat with python2.3) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 181 diff changeset	128 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	129 svn.list_files(dirpath, r.revnum)
182 47d25d61abfa remove generators (compat with python2.3) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 181 diff changeset	130 if k == 'f'])
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	131 else:
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	132 files_to_grab.add(p[len(rootpath):])
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	133 hg_editor.ui.note('\nFetching files...\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	134 for p in files_to_grab:
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	135 hg_editor.ui.note('.')
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	136 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	137 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	138 i += 1
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	139 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	140 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	141 hg_editor.missing_plaintexts = set()
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	142 hg_editor.ui.note('\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	143 hg_editor.commit_current_delta()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	144
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	145
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	146 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	147 =*
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	148 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	149
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	150 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	151 _*
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	152 (?: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	153 \+''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	154
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	155 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	156 _*
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	157 (?: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	158 -''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	159
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	160 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	161
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	162 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	163
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	164 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	165 _*
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	166 (?: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	167 \+''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	168
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	169 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	170 _*
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	171 (?: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	172 \-''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	173
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	174 def mempatchproxy(parentctx, files):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	175 # 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	176 patchfile = patch.patchfile
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	177
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	178 class mempatch(patchfile):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	179 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	180 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	181
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	182 def readlines(self, fname):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	183 if fname not in parentctx:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	184 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	185 fctx = parentctx[fname]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	186 data = fctx.data()
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	187 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	188 data = 'link ' + data
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	189 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	190
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	191 def writelines(self, fname, lines):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	192 files[fname] = ''.join(lines)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	193
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	194 def unlink(self, fname):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	195 files[fname] = None
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	196
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	197 return mempatch
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	198
200 2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	199
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	200 def filteriterhunks(hg_editor):
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	201 iterhunks = patch.iterhunks
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	202 def filterhunks(ui, fp, sourcefile=None):
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	203 applycurrent = False
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	204 for data in iterhunks(ui, fp, sourcefile):
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	205 if data[0] == 'file':
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	206 if hg_editor._is_file_included(data[1][1]):
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	207 applycurrent = True
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	208 else:
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	209 applycurrent = False
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	210 assert data[0] != 'git', 'Filtering git hunks not supported.'
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	211 if applycurrent:
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	212 yield data
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	213 return filterhunks
2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	214
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	215 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	216 """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	217
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	218 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	219 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	220 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	221 error.
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	222 """
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	223 def make_diff_path(branch):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	224 if branch == 'trunk' or branch is None:
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	225 return 'trunk'
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	226 elif branch.startswith('../'):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	227 return branch[3:]
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	228 return 'branches/%s' % branch
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	229 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	230 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	231 try:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	232 if br_p == branch:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	233 # letting patch handle binaries sounded
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	234 # 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	235 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	236 ignore_type=False)
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	237 else:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	238 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	239 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	240 other_rev=parent_rev,
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	241 deleted=True, ignore_type=True)
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	242 if d:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	243 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	244 except svnwrap.SubversionRepoCanNotDiff:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	245 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	246 except core.SubversionException, e:
224 2165461d2dd8 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 203 diff changeset	247 if (hasattr(e, 'apr_err') and e.apr_err != core.SVN_ERR_FS_NOT_FOUND):
109 460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	248 raise
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	249 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	250 if '\0' in d:
f1919e1c35bf fetch_command: cancel patching when encountering binary diffs Patrick Mezard <pmezard@gmail.com> parents: 168 diff changeset	251 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	252 files_data = {}
128 bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	253 binary_files = {}
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	254 touched_files = {}
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	255 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	256 # 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	257 # 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	258 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	259 touched_files[m] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	260 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	261 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	262 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	263 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	264 # 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	265 # 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	266 touched_files[f] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	267 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	268 try:
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	269 oldpatchfile = patch.patchfile
200 2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	270 olditerhunks = patch.iterhunks
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	271 patch.patchfile = mempatchproxy(parentctx, files_data)
200 2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	272 patch.iterhunks = filteriterhunks(hg_editor)
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	273 try:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	274 # 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	275 # 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	276 # by our memory patcher.
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	277 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	278 {}, strip=0)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	279 finally:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	280 patch.patchfile = oldpatchfile
200 2e8c527f0456 stupid replay: Don't actually try and apply diffs to files we don't have anyway. Augie Fackler <durin42@gmail.com> parents: 198 diff changeset	281 patch.iterhunks = olditerhunks
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	282 except patch.PatchError:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	283 # 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	284 # 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	285 # 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	286 # 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	287 raise BadPatchApply('patching failed')
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	288 for x in files_data.iterkeys():
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	289 ui.note('M %s\n' % x)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	290 # 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	291 # entire rev.
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	292 if patch_st == -1:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	293 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	294 ' volumes.')
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	295 elif patch_st == 1:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	296 # 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	297 # 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	298 # 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	299 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	300 else:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	301 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	302 r.revnum)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	303
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	304 exec_files = {}
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	305 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	306 exec_files[m] = False
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	307 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	308 exec_files[m] = True
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	309 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	310 touched_files[m] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	311 link_files = {}
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	312 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	313 # 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	314 # 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	315 # 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	316 assert m in files_data
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	317 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	318 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	319 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	320 link_files[m] = False
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	321
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	322 for p in r.paths:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	323 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	324 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	325 if p2 in parentctx:
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	326 files_data[p2] = None
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	327 continue
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	328 # 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	329 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	330
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	331 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	332 touched_files[f] = 1
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	333
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	334 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	335 parentctx)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	336
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	337 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	338 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	339 raise IOError()
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	340
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	341 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	342 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	343 isexe = 'x' in mode
bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	344 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	345 else:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	346 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	347 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	348 data = ''
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	349 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	350 data = files_data[path]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	351 if islink:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	352 data = data[len('link '):]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	353 elif path in parentctx:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	354 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	355
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	356 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	357 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	358 isexec=isexe, copied=copied)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	359
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	360 return list(touched_files), filectxfn
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	361
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	362 def makecopyfinder(r, branchpath, rootdir):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	363 """Return a function detecting copies.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	364
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	365 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	366 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	367 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	368 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	369 "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	370 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	371 """
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	372 # 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	373 branchpath = branchpath + '/'
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	374 fullbranchpath = rootdir + branchpath
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	375 copies = []
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	376 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	377 if not e.copyfrom_path:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	378 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	379 if not path.startswith(branchpath):
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 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	382 # ignore cross branch copies
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	383 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	384 dest = path[len(branchpath):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	385 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	386 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	387
163 fdc249cd1a0a Combine sort and reverse. Martin Geisler <mg@daimi.au.dk> parents: 158 diff changeset	388 copies.sort(reverse=True)
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	389 exactcopies = dict(copies)
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	390
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	391 def finder(path):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	392 if path in exactcopies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	393 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	394 # 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	395 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	396 dest = dest + '/'
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	397 if not path.startswith(dest):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	398 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	399 sourcepath = source + '/' + path[len(dest):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	400 return (source, sourcerev), sourcepath
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	401 return None
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	402
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	403 return finder
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	404
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	405 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	406 """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	407 """
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	408 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	409 return {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	410
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	411 # 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	412 # 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	413 # 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	414 # 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	415 # copy sources in revision info.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	416 svncopies = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	417 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	418 for f in files:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	419 copy = finder(f)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	420 if copy:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	421 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	422 if not svncopies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	423 return {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	424
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	425 # 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	426 ctxs = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	427 def getctx(svnrev):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	428 if svnrev in ctxs:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	429 return ctxs[svnrev]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	430 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	431 ctx = None
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	432 if changeid != revlog.nullid:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	433 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	434 ctxs[svnrev] = ctx
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	435 return ctx
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	436
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	437 # 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	438 hgcopies = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	439 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	440 sourcectx = getctx(rev)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	441 if sourcectx is None:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	442 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	443 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	444 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	445 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	446 hgcopies.update(copies)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	447 return hgcopies
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	448
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	449 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	450 """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	451
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	452 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	453 to convert and never were.
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	454 """
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	455 externals = svnexternals.externalsfile()
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	456 if '.hgsvnexternals' in parentctx:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	457 externals.read(parentctx['.hgsvnexternals'].data())
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	458 # 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	459 # 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	460 # 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	461 # 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	462 # revision in the common case.
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	463 dirs = set(externals)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	464 if parentctx.node() == revlog.nullid:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	465 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	466 dirs.add('')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	467 else:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	468 branchprefix = branchpath + '/'
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	469 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	470 if e.action == 'D':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	471 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	472 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	473 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	474 kind = svn.checkpath(path, r.revnum)
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	475 if kind != 'd':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	476 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	477 path = path[len(branchprefix):]
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	478 dirs.add(path)
184 d3ea6c98a086 Do not recurse for externals on copied directory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 182 diff changeset	479 if e.action == 'M' or (e.action == 'A' and e.copyfrom_path):
d3ea6c98a086 Do not recurse for externals on copied directory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 182 diff changeset	480 # Do not recurse in copied directories, changes are marked
d3ea6c98a086 Do not recurse for externals on copied directory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 182 diff changeset	481 # as 'M', except for the copied one.
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	482 continue
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	483 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	484 if k == 'd':
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	485 dirs.add((path + '/' + child).strip('/'))
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	486
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	487 # Retrieve new or updated values
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	488 for dir in dirs:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	489 try:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	490 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	491 externals[dir] = values.get('svn:externals', '')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	492 except IOError:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	493 externals[dir] = ''
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	494
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	495 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	496 # Do not create empty externals files
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	497 return None
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	498 return externals
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	499
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	500 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	501 """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	502
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	503 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	504 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	505 callable to retrieve individual file information.
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	506 """
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 79 diff changeset	507 files = []
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	508 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	509 # 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	510 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	511 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	512 files.append(path)
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	513 else:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	514 branchprefix = branchpath + '/'
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	515 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	516 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	517 continue
187 68e506bc3a43 fetch_command: fix file exclusion in very stupid mode Patrick Mezard <pmezard@gmail.com> parents: 186 diff changeset	518 if not hg_editor._is_path_valid(path):
179 a336e3e82648 Fetch: add a filemap argument for use in converting old repositories to Graham Booker <gbooker@cod3r.com> parents: 176 diff changeset	519 continue
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	520 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	521 path = path[len(branchprefix):]
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	522 if kind == 'f':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	523 files.append(path)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	524 elif kind == 'd':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	525 if e.action == 'M':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	526 continue
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	527 dirpath = branchprefix + path
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	528 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	529 if k == 'f':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	530 files.append(path + '/' + child)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	531 else:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	532 if path in parentctx:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	533 files.append(path)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	534 continue
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	535 # 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	536 path = path + '/'
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	537 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	538 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	539
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	540 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	541
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	542 def filectxfn(repo, memctx, path):
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	543 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	544 isexec = 'x' in mode
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	545 islink = 'l' in mode
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	546 copied = copies.get(path)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	547 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	548 isexec=isexec, copied=copied)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	549
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	550 return files, filectxfn
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	551
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	552 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	553 # this server fails at replay
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	554 branches = hg_editor.branches_in_paths(r.paths, r.revnum, svn.checkpath, svn.list_files)
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	555 deleted_branches = {}
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	556 brpaths = branches.values()
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	557 bad_branch_paths = {}
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	558 for br, bp in branches.iteritems():
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	559 bad_branch_paths[br] = []
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	560
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	561 # This next block might be needed, but for now I'm omitting it until it can be
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	562 # proven necessary.
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	563 # for bad in brpaths:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	564 # if bad.startswith(bp) and len(bad) > len(bp):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	565 # bad_branch_paths[br].append(bad[len(bp)+1:])
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	566
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	567 # We've go a branch that contains other branches. We have to be careful to
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	568 # get results similar to real replay in this case.
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	569 for existingbr in hg_editor.branches:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	570 bad = hg_editor._remotename(existingbr)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	571 if bad.startswith(bp) and len(bad) > len(bp):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	572 bad_branch_paths[br].append(bad[len(bp)+1:])
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	573 for p in r.paths:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	574 if hg_editor._is_path_tag(p):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	575 continue
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	576 branch = hg_editor._localname(p)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	577 if r.paths[p].action == 'R' and branch in hg_editor.branches:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	578 branchedits = sorted(filter(lambda x: x[0][1] == branch and x[0][0] < r.revnum,
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	579 hg_editor.revmap.iteritems()), reverse=True)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	580 is_closed = False
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	581 if len(branchedits) > 0:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	582 branchtip = branchedits[0][1]
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	583 for child in hg_editor.repo[branchtip].children():
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	584 if child.branch() == 'closed-branches':
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	585 is_closed = True
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	586 break
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	587 if not is_closed:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	588 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	589 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	590 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	591 check_deleted_branches = set()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	592 for b in branches:
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	593 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	594 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	595 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	596 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	597 if kind != 'd':
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	598 # 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	599 # 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	600 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	601 continue
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	602 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	603 try:
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	604 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	605 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	606 except BadPatchApply, e:
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	607 # Either this revision or the previous one does not exist.
224 2165461d2dd8 Exception clean-ups; use symbolic names & avoid Python 2.6 deprecations. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 203 diff changeset	608 ui.status("Fetching entire revision: %s.\n" % e.args[0])
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	609 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	610 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	611
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	612 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	613 if externals is not None:
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	614 files_touched.append('.hgsvnexternals')
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	615
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	616 def filectxfn(repo, memctx, path):
f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	617 if path == '.hgsvnexternals':
176 c4115b3918e9 Really delete the .hgsvnexternals file when explicitely removed Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	618 if not externals:
c4115b3918e9 Really delete the .hgsvnexternals file when explicitely removed Patrick Mezard <pmezard@gmail.com> parents: 174 diff changeset	619 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	620 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	621 islink=False, isexec=False, copied=None)
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	622 for bad in bad_branch_paths[b]:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	623 if path.startswith(bad):
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	624 raise IOError()
174 f80132c5fea5 Convert svn:externals properties into a .hgsvnexternals file Patrick Mezard <pmezard@gmail.com> parents: 169 diff changeset	625 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	626
154 6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 147 diff changeset	627 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	628 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	629 files_touched.remove('')
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	630 excluded = [f for f in files_touched
188 f48cd62a9de4 fetch_command: fix coding style Patrick Mezard <pmezard@gmail.com> parents: 187 diff changeset	631 if not hg_editor._is_file_included(f)]
f48cd62a9de4 fetch_command: fix coding style Patrick Mezard <pmezard@gmail.com> parents: 187 diff changeset	632 for f in excluded:
f48cd62a9de4 fetch_command: fix coding style Patrick Mezard <pmezard@gmail.com> parents: 187 diff changeset	633 files_touched.remove(f)
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	634 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	635 # 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	636 for f in files_touched:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	637 if f:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	638 assert f[0] != '/'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	639 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	640 [parentctx.node(), revlog.nullid],
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	641 r.message or util.default_commit_msg,
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	642 files_touched,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	643 filectxfn,
168 4f26fa049452 authormap: Add tests, fix in stupid mode. Augie Fackler <durin42@gmail.com> parents: 167 diff changeset	644 hg_editor.authorforsvnauthor(r.author),
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	645 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	646 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	647 ha = hg_editor.repo.commitctx(current_ctx)
203 907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	648 branch = extra.get('branch', None)
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	649 if not branch in hg_editor.branches:
907c160c6289 Refactor branch handling to be much more dynamic (and hopefully robust). Augie Fackler <durin42@gmail.com> parents: 200 diff changeset	650 hg_editor.branches[branch] = None, 0, r.revnum
33 a9c15cae50e5 Faster append-only revmap implementation. Andreas Hartmetz <ahartmetz@gmail.com> parents: 32 diff changeset	651 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	652 hg_editor._save_metadata()
198 df4611050286 Output consolidation; decrease the ‘Fetching...’ message to debug level. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 197 diff changeset	653 util.describe_commit(ui, ha, 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	654 # 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	655 # 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	656 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	657 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	658 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	659 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	660 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	661 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	662 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	663 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	664 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	665 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	666 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	667 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	668 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	669 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	670 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	671 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	672 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	673 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	674 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	675 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	676 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	677 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	678 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	679 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	680 parents,
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	681 r.message or util.default_commit_msg,
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	682 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	683 filectxfn,
168 4f26fa049452 authormap: Add tests, fix in stupid mode. Augie Fackler <durin42@gmail.com> parents: 167 diff changeset	684 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	685 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	686 {'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	687 ha = hg_editor.repo.commitctx(current_ctx)
141 6f2d67bf3039 Fix missing newlines. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	688 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	689 hg_editor._save_metadata()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	690
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	691 class BadPatchApply(Exception):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	692 pass

Mercurial > hgsubversion

annotate fetch_command.py @ 236:c34abd2448b7