Mercurial > hgsubversion
view __init__.py @ 313:942f198b8ff5
hg_delta_editor: detect new branches issued from non-branch directories
This fix solves the following case: let's /dumb/layout/project be an existing
project. To normalize the trunk/branches/tags layout, people may do:
$ mkdir /project
$ mv /dumb/layout/project /project/project
# Oups, should have been trunk!
$ mv /project/project /project/trunk
trunk creation was ignore because:
- update_branch_map() sees it come from a non-branch copy source and ignores it
(case #3).
- since it is not in self.branches, add_directory() ignores the non-existing path.
Then trunk is left uninitialized.
To solve this, we allow update_branch_map() to detect branches copied from
non-canonical locations.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 03 May 2009 21:42:42 -0500 |
parents | ba8e91a7c077 |
children | ce676eff002b |
line wrap: on
line source
'''integration with Subversion repositories This extension allows Mercurial to act as a Subversion client, for fast incremental, bidirectional updates. It is *not* ready yet for production use. You should only be using this if you're ready to hack on it, and go diving into the internals of Mercurial and/or Subversion. Before using hgsubversion, it is *strongly* encouraged to run the automated tests. See `README' in the hgsubversion directory for details. ''' import os import sys import traceback from mercurial import commands from mercurial import extensions from mercurial import util as hgutil from svn import core import svncommands import tag_repo import util import wrappers import svnexternals def reposetup(ui, repo): if not util.is_svn_repo(repo): return repo.__class__ = tag_repo.generate_repo_class(ui, repo) def uisetup(ui): """Do our UI setup. Does the following wrappings: * parent -> utility_commands.parent * outgoing -> utility_commands.outgoing """ entry = extensions.wrapcommand(commands.table, 'parents', wrappers.parent) entry[1].append(('', 'svn', None, "show parent svn revision instead")) entry = extensions.wrapcommand(commands.table, 'outgoing', wrappers.outgoing) entry[1].append(('', 'svn', None, "show revisions outgoing to subversion")) entry = extensions.wrapcommand(commands.table, 'diff', wrappers.diff) entry[1].append(('', 'svn', None, "show svn-style diffs, default against svn parent")) entry = extensions.wrapcommand(commands.table, 'push', wrappers.push) entry[1].append(('', 'svn', None, "push to subversion")) entry[1].append(('', 'svn-stupid', None, "use stupid replay during push to svn")) entry = extensions.wrapcommand(commands.table, 'pull', wrappers.pull) entry[1].append(('', 'svn', None, "pull from subversion")) entry[1].append(('', 'svn-stupid', None, "use stupid replay during pull from svn")) entry = extensions.wrapcommand(commands.table, 'clone', wrappers.clone) entry[1].extend([#('', 'skipto-rev', '0', 'skip commits before this revision.'), ('', 'svn-stupid', False, 'be stupid and use diffy replay.'), ('', 'svn-tag-locations', 'tags', 'Relative path to Subversion tags.'), ('', 'svn-authors', '', 'username mapping filename'), ('', 'svn-filemap', '', 'remap file to exclude paths or include only certain paths'), ]) try: rebase = extensions.find('rebase') if rebase: entry = extensions.wrapcommand(rebase.cmdtable, 'rebase', wrappers.rebase) entry[1].append(('', 'svn', None, 'automatic svn rebase', )) except: pass def svn(ui, repo, subcommand, *args, **opts): '''see detailed help for list of subcommands''' # guess command if prefix if subcommand not in svncommands.table: candidates = [] for c in svncommands.table: if c.startswith(subcommand): candidates.append(c) if len(candidates) == 1: subcommand = candidates[0] path = os.path.dirname(repo.path) try: commandfunc = svncommands.table[subcommand] if subcommand not in svncommands.nourl: opts['svn_url'] = open(os.path.join(repo.path, 'svn', 'url')).read() return commandfunc(ui, args=args, hg_repo_path=path, repo=repo, **opts) except core.SubversionException, e: if e.apr_err == core.SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED: raise hgutil.Abort('It appears svn does not trust the ssl cert for this site.\n' 'Please try running svn ls on that url first.') raise except TypeError: tb = traceback.extract_tb(sys.exc_info()[2]) if len(tb) == 1: ui.status('Bad arguments for subcommand %s\n' % subcommand) else: raise except KeyError, e: tb = traceback.extract_tb(sys.exc_info()[2]) if len(tb) == 1: ui.status('Unknown subcommand %s\n' % subcommand) else: raise cmdtable = { "svn": (svn, [('u', 'svn-url', '', 'path to the Subversion server.'), ('', 'stupid', False, 'be stupid and use diffy replay.'), ('A', 'authors', '', 'username mapping filename'), ('', 'filemap', '', 'remap file to exclude paths or include only certain paths'), ('', 'force', False, 'force an operation to happen'), ('', 'username', '', 'username for authentication'), ('', 'password', '', 'password for authentication'), ], svncommands._helpgen(), ), }