hgsubversion: fetch_command.py annotate

annotate fetch_command.py @ 134:22248b34b15a

Add notes on how metadata is stored and recovered. Note that at this point, none of this has actually been implemented. This is documentation of the improved system to be used in the future.

author	Augie Fackler <durin42@gmail.com>
date	Mon, 01 Dec 2008 11:13:01 -0600
parents	2242dd1163c6
children	9ffde8662967

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 import shutil
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 import tempfile
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	6
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import patch
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 from mercurial import node
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 from mercurial import context
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 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	11 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	12 from svn import core
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 from svn import delta
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	14
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	15 import hg_delta_editor
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 import svnwrap
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	17 import util
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	18
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	19
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	20 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	21 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	22 "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	23
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	24
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	25 @util.register_subcommand('pull')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	26 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	27 tag_locations='tags',
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	28 **opts):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	29 """Pull new revisions from Subversion.
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	30 """
44 85fcac4e2291 Fix an encoding bug that would occur if the local encoding was not utf-8. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	31 old_encoding = merc_util._encoding
85fcac4e2291 Fix an encoding bug that would occur if the local encoding was not utf-8. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	32 merc_util._encoding = 'UTF-8'
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
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	44 svn = svnwrap.SubversionRepo(svn_url, username=merc_util.getuser())
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	45 author_host = "@%s" % svn.uuid
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	46 tag_locations = tag_locations.split(',')
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	47 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	48 ui_=ui,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	49 subdir=svn.subdir,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	50 author_host=author_host,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	51 tag_locations=tag_locations)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	52 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	53 uuid = open(hg_editor.uuid_file).read()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	54 assert uuid == svn.uuid
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	55 start = int(open(hg_editor.last_revision_handled_file, 'r').read())
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	56 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	57 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	58 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	59 open(hg_editor.last_revision_handled_file, 'w').write(str(0))
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	60 initializing_repo = True
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	61 start = skipto_rev
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	62
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	63 # start converting revisions
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	64 for r in svn.revisions(start=start):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	65 valid = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	66 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	67 for p in r.paths:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	68 if hg_editor._is_path_valid(p):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	69 valid = True
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	70 continue
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	71 if initializing_repo and start > 0:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	72 assert False, 'This feature not ready yet.'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	73 if valid:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	74 # got a 502? Try more than once!
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	75 tries = 0
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	76 converted = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	77 while not converted and tries < 3:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	78 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	79 ui.status('converting %s\n' % r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	80 if have_replay:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	81 try:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	82 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	83 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	84 ui.status('%s\n' % e.message)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	85 print_your_svn_is_old_message(ui)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	86 have_replay = False
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	87 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	88 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	89 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	90 converted = True
32 d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	91 tmpfile = '%s_tmp' % hg_editor.last_revision_handled_file
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	92 fp = open(tmpfile, 'w')
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	93 fp.write(str(r.revnum))
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	94 fp.close()
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	95 merc_util.rename(tmpfile,
d01196ca1e39 Fix non-atomic write of the last_revision_handled_file which was causing Augie Fackler <durin42@gmail.com> parents: 29 diff changeset	96 hg_editor.last_revision_handled_file)
63 2e30b59a9c19 Added some coverage pragmas to stop it from trying to cover things we can't test. Augie Fackler <durin42@gmail.com> parents: 59 diff changeset	97 except core.SubversionException, e: #pragma: no cover
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	98 if hasattr(e, 'message') and (
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	99 'Server sent unexpected return value (502 Bad Gateway)'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	100 ' in response to PROPFIND') in e.message:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	101 tries += 1
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	102 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	103 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	104 raise
44 85fcac4e2291 Fix an encoding bug that would occur if the local encoding was not utf-8. Augie Fackler <durin42@gmail.com> parents: 42 diff changeset	105 merc_util._encoding = old_encoding
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	106
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	107
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	108 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	109 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	110 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	111
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	112 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	113 hg_editor.set_current_rev(r)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	114 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	115 i = 1
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	116 if hg_editor.missing_plaintexts:
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	117 hg_editor.ui.status('Fetching %s files that could not use replay.\n' %
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	118 len(hg_editor.missing_plaintexts))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	119 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	120 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	121 for p in hg_editor.missing_plaintexts:
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	122 hg_editor.ui.status('.')
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	123 hg_editor.ui.flush()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	124 if p[-1] == '/':
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	125 dirpath = p[len(rootpath):]
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	126 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	127 svn.list_files(dirpath, r.revnum)
112 e58c2f1de059 Fix a regression in converting repositories with files copied in from outside Augie Fackler <durin42@gmail.com> parents: 111 diff changeset	128 if k == 'f'))
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	129 else:
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	130 files_to_grab.add(p[len(rootpath):])
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	131 hg_editor.ui.status('\nFetching files...\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	132 for p in files_to_grab:
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	133 hg_editor.ui.status('.')
9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	134 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	135 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	136 i += 1
98 c7ac013cf7fd fetch_command: simplify replay_convert_rev() with svn.list_files() Patrick Mezard <pmezard@gmail.com> parents: 97 diff changeset	137 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	138 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	139 hg_editor.missing_plaintexts = set()
38 9ee7ce0505eb Fixes so that I can clone the melange repository successfully. Fixes a bug that Augie Fackler <durin42@gmail.com> parents: 33 diff changeset	140 hg_editor.ui.status('\n')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	141 hg_editor.commit_current_delta()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	142
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	143
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	144 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	145 =*
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	146 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	147
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	148 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	149 _*
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	150 (?: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	151 \+''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	152
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	153 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	154 _*
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	155 (?: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	156 -''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	157
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	158 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	159
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	160 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	161
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	162 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	163 _*
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	164 (?: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	165 \+''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	166
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	167 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	168 _*
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	169 (?: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	170 \-''')
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	171
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	172 def mempatchproxy(parentctx, files):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	173 # 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	174 patchfile = patch.patchfile
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	175
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	176 class mempatch(patchfile):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	177 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	178 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	179
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	180 def readlines(self, fname):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	181 if fname not in parentctx:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	182 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	183 fctx = parentctx[fname]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	184 data = fctx.data()
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	185 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	186 data = 'link ' + data
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	187 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	188
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	189 def writelines(self, fname, lines):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	190 files[fname] = ''.join(lines)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	191
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	192 def unlink(self, fname):
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	193 files[fname] = None
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	194
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	195 return mempatch
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 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	198 """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	199
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	200 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	201 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	202 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	203 error.
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	204 """
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	205 def make_diff_path(b):
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	206 if b == None:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	207 return 'trunk'
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	208 return 'branches/' + b
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	209
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	210 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	211 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	212 try:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	213 if br_p == branch:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	214 # letting patch handle binaries sounded
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	215 # 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	216 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	217 ignore_type=False)
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	218 else:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	219 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	220 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	221 other_rev=parent_rev,
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	222 deleted=True, ignore_type=True)
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	223 if d:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	224 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	225 except svnwrap.SubversionRepoCanNotDiff:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	226 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	227 except core.SubversionException, e:
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	228 if (hasattr(e, 'apr_err') and e.apr_err != 160013):
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	229 raise
460443a96497 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() Patrick Mezard <pmezard@gmail.com> parents: 108 diff changeset	230 raise BadPatchApply('previous revision does not exist')
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	231 files_data = {}
128 bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	232 binary_files = {}
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	233 touched_files = {}
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	234 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	235 # 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	236 # 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	237 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	238 touched_files[m] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	239 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	240 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	241 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	242 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	243 # 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	244 # 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	245 touched_files[f] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	246 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	247 try:
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	248 oldpatchfile = patch.patchfile
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	249 patch.patchfile = mempatchproxy(parentctx, files_data)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	250 try:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	251 # 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	252 # 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	253 # by our memory patcher.
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	254 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	255 {}, strip=0)
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	256 finally:
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	257 patch.patchfile = oldpatchfile
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	258 except patch.PatchError:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	259 # 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	260 # 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	261 # 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	262 # 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	263 raise BadPatchApply('patching failed')
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	264 for x in files_data.iterkeys():
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	265 ui.status('M %s\n' % x)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	266 # 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	267 # entire rev.
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	268 if patch_st == -1:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	269 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	270 ' volumes.')
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	271 elif patch_st == 1:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	272 # 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	273 # 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	274 # 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	275 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	276 else:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	277 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	278 r.revnum)
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	279
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	280 exec_files = {}
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	281 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	282 exec_files[m] = False
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	283 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	284 exec_files[m] = True
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	285 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	286 touched_files[m] = 1
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	287 link_files = {}
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	288 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	289 # 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	290 # 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	291 # 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	292 assert m in files_data
7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	293 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	294 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	295 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	296 link_files[m] = False
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	297
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	298 for p in r.paths:
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	299 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	300 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	301 if p2 in parentctx:
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	302 files_data[p2] = None
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	303 continue
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	304 # 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	305 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	306
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	307 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	308 touched_files[f] = 1
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	309
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	310 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	311 parentctx)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	312
de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	313 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	314 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	315 raise IOError()
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	316
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	317 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	318 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	319 isexe = 'x' in mode
bab5bcbbb3dc fetch_command: in stupid mode, load binary files when necessary Patrick Mezard <pmezard@gmail.com> parents: 127 diff changeset	320 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	321 else:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	322 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	323 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	324 data = ''
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	325 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	326 data = files_data[path]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	327 if islink:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	328 data = data[len('link '):]
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	329 elif path in parentctx:
59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	330 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	331
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	332 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	333 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	334 isexec=isexe, copied=copied)
108 de19a13edfa8 fetch_command: extract diff code in a function Patrick Mezard <pmezard@gmail.com> parents: 107 diff changeset	335
129 59f8603a6641 fetch_command: in stupid mode, load file content on demand Patrick Mezard <pmezard@gmail.com> parents: 128 diff changeset	336 return list(touched_files), filectxfn
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	337
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	338 def makecopyfinder(r, branchpath, rootdir):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	339 """Return a function detecting copies.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	340
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	341 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	342 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	343 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	344 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	345 "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	346 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	347 """
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	348 # 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	349 branchpath = branchpath + '/'
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	350 fullbranchpath = rootdir + branchpath
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	351 copies = []
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	352 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	353 if not e.copyfrom_path:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	354 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	355 if not path.startswith(branchpath):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	356 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	357 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	358 # ignore cross branch copies
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	359 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	360 dest = path[len(branchpath):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	361 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	362 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	363
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	364 copies.sort()
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	365 copies.reverse()
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	366 exactcopies = dict(copies)
101 a3b717e4abf5 Cleanups based on pyflakes output. Augie Fackler <durin42@gmail.com> parents: 98 diff changeset	367
73 9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	368 def finder(path):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	369 if path in exactcopies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	370 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	371 # 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	372 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	373 dest = dest + '/'
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	374 if not path.startswith(dest):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	375 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	376 sourcepath = source + '/' + path[len(dest):]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	377 return (source, sourcerev), sourcepath
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	378 return None
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	379
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	380 return finder
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	381
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	382 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	383 """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	384 """
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	385 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	386 return {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	387
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	388 # 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	389 # 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	390 # 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	391 # 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	392 # copy sources in revision info.
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	393 svncopies = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	394 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	395 for f in files:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	396 copy = finder(f)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	397 if copy:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	398 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	399 if not svncopies:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	400 return {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	401
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	402 # 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	403 ctxs = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	404 def getctx(svnrev):
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	405 if svnrev in ctxs:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	406 return ctxs[svnrev]
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	407 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	408 ctx = None
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	409 if changeid != revlog.nullid:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	410 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	411 ctxs[svnrev] = ctx
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	412 return ctx
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	413
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	414 # 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	415 hgcopies = {}
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	416 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	417 sourcectx = getctx(rev)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	418 if sourcectx is None:
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	419 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	420 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	421 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	422 continue
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	423 hgcopies.update(copies)
9c1b53abefcb fetch_command: support svn copy detection in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 63 diff changeset	424 return hgcopies
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	425
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	426 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	427 """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	428
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	429 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	430 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	431 callable to retrieve individual file information.
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	432 """
87 b033d74be76b fetch_command: in stupid non-diffy mode, take changed paths in account Patrick Mezard <pmezard@gmail.com> parents: 79 diff changeset	433 files = []
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	434 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	435 # 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	436 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	437 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	438 files.append(path)
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	439 else:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	440 branchprefix = branchpath + '/'
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	441 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	442 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	443 continue
88 3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	444 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	445 path = path[len(branchprefix):]
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	446 if kind == 'f':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	447 files.append(path)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	448 elif kind == 'd':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	449 if e.action == 'M':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	450 # Ignore property changes for now
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	451 continue
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	452 dirpath = branchprefix + path
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	453 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	454 if k == 'f':
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	455 files.append(path + '/' + child)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	456 else:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	457 if path in parentctx:
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	458 files.append(path)
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	459 continue
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	460 # 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	461 path = path + '/'
3b60f223893a fetch_command: handle nullid parent in stupid non-diffy mode Patrick Mezard <pmezard@gmail.com> parents: 87 diff changeset	462 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	463 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	464
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	465 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	466
77 ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	467 def filectxfn(repo, memctx, path):
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	468 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	469 isexec = 'x' in mode
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	470 islink = 'l' in mode
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	471 copied = copies.get(path)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	472 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	473 isexec=isexec, copied=copied)
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	474
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	475 return files, filectxfn
ed3dd5bf45da fetch_command: bypass export3() and checkout manually Patrick Mezard <pmezard@gmail.com> parents: 76 diff changeset	476
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	477 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	478 # this server fails at replay
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	479 branches = hg_editor.branches_in_paths(r.paths)
133 2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	480 deleted_branches = {}
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	481 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	482 date += ' -0000'
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	483 for b in branches:
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	484 parentctx = hg_editor.repo[hg_editor.get_parent_revision(r.revnum, b)]
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	485 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	486 if kind != 'd':
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	487 # 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	488 # 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	489 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	490 continue
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	491 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	492 try:
119 ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	493 files_touched, filectxfn = stupid_diff_branchrev(
127 7e45bcf52b64 fetch_command: patch files in memory in stupid mode Patrick Mezard <pmezard@gmail.com> parents: 119 diff changeset	494 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	495 except BadPatchApply, e:
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	496 # Either this revision or the previous one does not exist.
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	497 ui.status("fetching entire rev: %s.\n" % e.message)
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	498 files_touched, filectxfn = stupid_fetch_branchrev(
ea65fe2b0856 hg_delta_editor: fix update of stray files in branches/ Patrick Mezard <pmezard@gmail.com> parents: 118 diff changeset	499 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	500
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	501 extra = {}
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	502 if b:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	503 extra['branch'] = b
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	504 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	505 files_touched.remove('')
110 a4dcffaa6538 fetch_command: pass parent changectx instead of identifier Patrick Mezard <pmezard@gmail.com> parents: 109 diff changeset	506 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	507 # 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	508 for f in files_touched:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	509 if f:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	510 assert f[0] != '/'
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	511 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	512 [parentctx.node(), revlog.nullid],
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	513 r.message or '...',
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	514 files_touched,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	515 filectxfn,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	516 '%s%s' % (r.author,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	517 hg_editor.author_host),
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	518 date,
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	519 extra)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	520 ha = hg_editor.repo.commitctx(current_ctx)
33 a9c15cae50e5 Faster append-only revmap implementation. Andreas Hartmetz <ahartmetz@gmail.com> parents: 32 diff changeset	521 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	522 hg_editor._save_metadata()
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	523 ui.status('committed as %s on branch %s\n' %
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	524 (node.hex(ha), 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	525 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	526 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	527 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	528 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	529 if parentctx.children():
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	530 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	531 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	532 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	533 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	534 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	535 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	536 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	537 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	538 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	539 parents,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	540 r.message or '...',
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	541 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	542 filectxfn,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	543 '%s%s' % (r.author,
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	544 hg_editor.author_host),
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	545 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	546 {'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	547 ha = hg_editor.repo.commitctx(current_ctx)
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	548 ui.status('Marked branch %s as closed.' % (b or 'default'))
2242dd1163c6 hg_delta_editor: fix bad parent revision calculation in the case of a branch Augie Fackler <durin42@gmail.com> parents: 129 diff changeset	549 hg_editor._save_metadata()
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	550
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	551 class BadPatchApply(Exception):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	552 pass

Mercurial > hgsubversion

annotate fetch_command.py @ 134:22248b34b15a