hgsubversion: cmdutil.py annotate

annotate cmdutil.py @ 311:b6a9cdee2f68

cmdutil: fix svn path normalization corner case When the subpath is empty we ended with "path/" instead of "path".

author	Patrick Mezard <pmezard@gmail.com>
date	Wed, 29 Apr 2009 12:01:31 +0200
parents	75d4fde9aa2e
children	067914ecb4eb

rev	line source
244 28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	1 #!/usr/bin/python
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	2 import re
256 7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	3 import os
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	4 import urllib
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	5
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	6 from mercurial import util as hgutil
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	7
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	8 from svn import core
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	9
254 9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	10 import util
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	11 import svnwrap
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	12 import svnexternals
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	13
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	14
244 28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	15 b_re = re.compile(r'^\+\+\+ b\/([^\n]*)', re.MULTILINE)
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	16 a_re = re.compile(r'^--- a\/([^\n]*)', re.MULTILINE)
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	17 devnull_re = re.compile(r'^([-+]{3}) /dev/null', re.MULTILINE)
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	18 header_re = re.compile(r'^diff --git .* b\/(.*)', re.MULTILINE)
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	19 newfile_devnull_re = re.compile(r'^--- /dev/null\n\+\+\+ b/([^\n]*)',
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	20 re.MULTILINE)
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	21
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	22
243 2027f851d60c Small cleanups: remove unneeded imports, useless superclass. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 242 diff changeset	23 class NoFilesException(Exception):
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	24 """Exception raised when you try and commit without files.
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	25 """
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	26
256 7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	27 def formatrev(rev):
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	28 if rev == -1:
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	29 return '\t(working copy)'
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	30 return '\t(revision %d)' % rev
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	31
256 7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	32
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	33 def filterdiff(diff, oldrev, newrev):
244 28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	34 diff = newfile_devnull_re.sub(r'--- \1\t(revision 0)' '\n'
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	35 r'+++ \1\t(working copy)',
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	36 diff)
256 7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	37 oldrev = formatrev(oldrev)
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	38 newrev = formatrev(newrev)
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	39 diff = a_re.sub(r'--- \1'+ oldrev, diff)
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	40 diff = b_re.sub(r'+++ \1' + newrev, diff)
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	41 diff = devnull_re.sub(r'\1 /dev/null\t(working copy)', diff)
244 28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	42 diff = header_re.sub(r'Index: \1' + '\n' + ('=' * 67), diff)
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	43 return diff
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	44
28d0ee605308 Move diff to svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 243 diff changeset	45
254 9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	46 def parentrev(ui, repo, hge, svn_commit_hashes):
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	47 """Find the svn parent revision of the repo's dirstate.
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	48 """
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	49 workingctx = repo.parents()[0]
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	50 outrev = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes,
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	51 workingctx.node())
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	52 if outrev:
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	53 workingctx = repo[outrev[-1]].parents()[0]
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	54 return workingctx
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	55
9ba31af57e4b Move utility_commands.find_wc_parent_rev() to cmdutil.parentrev(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	56
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	57 def replay_convert_rev(hg_editor, svn, r):
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	58 hg_editor.set_current_rev(r)
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	59 svn.get_replay(r.revnum, hg_editor)
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	60 i = 1
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	61 if hg_editor.missing_plaintexts:
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	62 hg_editor.ui.debug('Fetching %s files that could not use replay.\n' %
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	63 len(hg_editor.missing_plaintexts))
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	64 files_to_grab = set()
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	65 rootpath = svn.subdir and svn.subdir[1:] or ''
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	66 for p in hg_editor.missing_plaintexts:
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	67 hg_editor.ui.note('.')
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	68 hg_editor.ui.flush()
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	69 if p[-1] == '/':
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	70 dirpath = p[len(rootpath):]
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	71 files_to_grab.update([dirpath + f for f,k in
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	72 svn.list_files(dirpath, r.revnum)
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	73 if k == 'f'])
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	74 else:
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	75 files_to_grab.add(p[len(rootpath):])
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	76 hg_editor.ui.note('\nFetching files...\n')
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	77 for p in files_to_grab:
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	78 hg_editor.ui.note('.')
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	79 hg_editor.ui.flush()
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	80 if i % 50 == 0:
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	81 svn.init_ra_and_client()
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	82 i += 1
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	83 data, mode = svn.get_file(p, r.revnum)
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	84 hg_editor.set_file(p, data, 'x' in mode, 'l' in mode)
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	85 hg_editor.missing_plaintexts = set()
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	86 hg_editor.ui.note('\n')
4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	87 hg_editor.commit_current_delta()
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	88
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	89
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	90 def _isdir(svn, branchpath, svndir):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	91 try:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	92 svn.list_dir('%s/%s' % (branchpath, svndir))
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	93 return True
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	94 except core.SubversionException:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	95 return False
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	96
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	97
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	98 def _getdirchanges(svn, branchpath, parentctx, ctx, changedfiles, extchanges):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	99 """Compute directories to add or delete when moving from parentctx
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	100 to ctx, assuming only 'changedfiles' files changed, and 'extchanges'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	101 external references changed (as returned by svnexternals.diff()).
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	102
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	103 Return (added, deleted) where 'added' is the list of all added
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	104 directories and 'deleted' the list of deleted directories.
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	105 Intermediate directories are included: if a/b/c is new and requires
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	106 the addition of a/b and a, those will be listed too. Intermediate
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	107 deleted directories are also listed, but item order of undefined
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	108 in either list.
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	109 """
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	110 def finddirs(path, includeself=False):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	111 if includeself:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	112 yield path
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	113 pos = path.rfind('/')
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	114 while pos != -1:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	115 yield path[:pos]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	116 pos = path.rfind('/', 0, pos)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	117
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	118 def getctxdirs(ctx, keptdirs, extdirs):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	119 dirs = {}
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	120 for f in ctx.manifest():
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	121 for d in finddirs(f):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	122 if d in dirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	123 break
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	124 if d in keptdirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	125 dirs[d] = 1
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	126 for extdir in extdirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	127 for d in finddirs(extdir, True):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	128 dirs[d] = 1
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	129 return dirs
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	130
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	131 deleted, added = [], []
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	132 changeddirs = {}
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	133 for f in changedfiles:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	134 if f in parentctx and f in ctx:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	135 # Updated files cannot cause directories to be created
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	136 # or removed.
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	137 continue
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	138 for d in finddirs(f):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	139 changeddirs[d] = 1
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	140 for e in extchanges:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	141 if not e[1] or not e[2]:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	142 for d in finddirs(e[0], True):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	143 changeddirs[d] = 1
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	144 if not changeddirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	145 return added, deleted
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	146 olddirs = getctxdirs(parentctx, changeddirs,
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	147 [e[0] for e in extchanges if e[1]])
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	148 newdirs = getctxdirs(ctx, changeddirs,
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	149 [e[0] for e in extchanges if e[2]])
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	150
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	151 for d in newdirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	152 if d not in olddirs and not _isdir(svn, branchpath, d):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	153 added.append(d)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	154
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	155 for d in olddirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	156 if d not in newdirs and _isdir(svn, branchpath, d):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	157 deleted.append(d)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	158
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	159 return added, deleted
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	160
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	161
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	162 def _externals(ctx):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	163 ext = svnexternals.externalsfile()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	164 if '.hgsvnexternals' in ctx:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	165 ext.read(ctx['.hgsvnexternals'].data())
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	166 return ext
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	167
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	168
243 2027f851d60c Small cleanups: remove unneeded imports, useless superclass. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 242 diff changeset	169 def commit_from_rev(ui, repo, rev_ctx, hg_editor, svn_url, base_revision,
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	170 username, password):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	171 """Build and send a commit from Mercurial to Subversion.
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	172 """
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	173 file_data = {}
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	174 svn = svnwrap.SubversionRepo(svn_url, username, password)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	175 parent = rev_ctx.parents()[0]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	176 parent_branch = rev_ctx.parents()[0].branch()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	177 branch_path = 'trunk'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	178
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	179 if parent_branch and parent_branch != 'default':
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	180 branch_path = 'branches/%s' % parent_branch
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	181
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	182 extchanges = list(svnexternals.diff(_externals(parent),
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	183 _externals(rev_ctx)))
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	184 addeddirs, deleteddirs = _getdirchanges(svn, branch_path, parent, rev_ctx,
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	185 rev_ctx.files(), extchanges)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	186 deleteddirs = set(deleteddirs)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	187
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	188 props = {}
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	189 copies = {}
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	190 for file in rev_ctx.files():
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	191 if file == '.hgsvnexternals':
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	192 continue
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	193 new_data = base_data = ''
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	194 action = ''
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	195 if file in rev_ctx:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	196 fctx = rev_ctx.filectx(file)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	197 new_data = fctx.data()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	198
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	199 if 'x' in fctx.flags():
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	200 props.setdefault(file, {})['svn:executable'] = '*'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	201 if 'l' in fctx.flags():
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	202 props.setdefault(file, {})['svn:special'] = '*'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	203
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	204 if file not in parent:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	205 renamed = fctx.renamed()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	206 if renamed:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	207 # TODO current model (and perhaps svn model) does not support
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	208 # this kind of renames: a -> b, b -> c
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	209 copies[file] = renamed[0]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	210 base_data = parent[renamed[0]].data()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	211
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	212 action = 'add'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	213 dirname = '/'.join(file.split('/')[:-1] + [''])
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	214 else:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	215 base_data = parent.filectx(file).data()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	216 if ('x' in parent.filectx(file).flags()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	217 and 'x' not in rev_ctx.filectx(file).flags()):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	218 props.setdefault(file, {})['svn:executable'] = None
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	219 if ('l' in parent.filectx(file).flags()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	220 and 'l' not in rev_ctx.filectx(file).flags()):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	221 props.setdefault(file, {})['svn:special'] = None
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	222 action = 'modify'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	223 else:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	224 pos = file.rfind('/')
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	225 if pos >= 0:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	226 if file[:pos] in deleteddirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	227 # This file will be removed when its directory is removed
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	228 continue
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	229 action = 'delete'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	230 file_data[file] = base_data, new_data, action
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	231
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	232 def svnpath(p):
311 b6a9cdee2f68 cmdutil: fix svn path normalization corner case Patrick Mezard <pmezard@gmail.com> parents: 289 diff changeset	233 return ('%s/%s' % (branch_path, p)).rstrip('/')
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	234
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	235 changeddirs = []
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	236 for d, v1, v2 in extchanges:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	237 props.setdefault(svnpath(d), {})['svn:externals'] = v2
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	238 if d not in deleteddirs and d not in addeddirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	239 changeddirs.append(svnpath(d))
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	240
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	241 # Now we are done with files, we can prune deleted directories
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	242 # against themselves: ignore a/b if a/ is already removed
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	243 deleteddirs2 = list(deleteddirs)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	244 deleteddirs2.sort(reverse=True)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	245 for d in deleteddirs2:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	246 pos = d.rfind('/')
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	247 if pos >= 0 and d[:pos] in deleteddirs:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	248 deleteddirs.remove(d[:pos])
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	249
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	250 newcopies = {}
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	251 for source, dest in copies.iteritems():
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	252 newcopies[svnpath(source)] = (svnpath(dest), base_revision)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	253
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	254 new_target_files = [svnpath(f) for f in file_data]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	255 for tf, ntf in zip(file_data, new_target_files):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	256 if tf in file_data:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	257 file_data[ntf] = file_data[tf]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	258 if tf in props:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	259 props[ntf] = props[tf]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	260 del props[tf]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	261 if hgutil.binary(file_data[ntf][1]):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	262 props.setdefault(ntf, {}).update(props.get(ntf, {}))
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	263 props.setdefault(ntf, {})['svn:mime-type'] = 'application/octet-stream'
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	264 del file_data[tf]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	265
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	266 addeddirs = [svnpath(d) for d in addeddirs]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	267 deleteddirs = [svnpath(d) for d in deleteddirs]
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	268 new_target_files += addeddirs + deleteddirs + changeddirs
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	269 if not new_target_files:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	270 raise NoFilesException()
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	271 try:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	272 svn.commit(new_target_files, rev_ctx.description(), file_data,
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	273 base_revision, set(addeddirs), set(deleteddirs),
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	274 props, newcopies)
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	275 except core.SubversionException, e:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	276 if hasattr(e, 'apr_err') and (e.apr_err == core.SVN_ERR_FS_TXN_OUT_OF_DATE
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	277 or e.apr_err == core.SVN_ERR_FS_CONFLICT):
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	278 raise hgutil.Abort('Base text was out of date, maybe rebase?')
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	279 else:
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	280 raise
256 7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	281
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	282 return True
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	283
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	284 def islocalrepo(url):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	285 if not url.startswith('file:///'):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	286 return False
284 f8f9a2993705 Implement parseurl support (#revision in repository urls) Martijn Pieters <mj@zopatista.com> parents: 257 diff changeset	287 if '#' in url.split('/')[-1]: # strip off #anchor
f8f9a2993705 Implement parseurl support (#revision in repository urls) Martijn Pieters <mj@zopatista.com> parents: 257 diff changeset	288 url = url[:url.rfind('#')]
289 75d4fde9aa2e cmdutil: fix islocalrepo() under Windows Patrick Mezard <pmezard@gmail.com> parents: 284 diff changeset	289 path = url[len('file://'):]
75d4fde9aa2e cmdutil: fix islocalrepo() under Windows Patrick Mezard <pmezard@gmail.com> parents: 284 diff changeset	290 path = urllib.url2pathname(path).replace(os.sep, '/')
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	291 while '/' in path:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	292 if reduce(lambda x,y: x and y,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	293 map(lambda p: os.path.exists(os.path.join(path, p)),
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	294 ('hooks', 'format', 'db', ))):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	295 return True
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	296 path = path.rsplit('/', 1)[0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	297 return False
256 7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	298
7932d098cb5f Refactor commands to wrap their hg equivalent adding a --svn flag where sane. Augie Fackler <durin42@gmail.com> parents: 254 diff changeset	299 def issvnurl(url):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: 256 diff changeset	300 return url.startswith('svn') or islocalrepo(url)

Mercurial > hgsubversion

annotate cmdutil.py @ 311:b6a9cdee2f68