rhodecode-vcsserver Compare - rhodecode-vcsserver@2582dee7dd4c0f1028fd5a55cdf1913c32cb520a > rhodecode-vcsserver@5682a2ff63e2d0d10d3e1e4aa81010bff74b5011

Compare Commits

Target:

Source:

Actions:

Compare Commits Swap

Time	Author	Commit		Description
0 commits hidden, click expand to show them.
No commits in this compare

Collapse all files

vcsserver/exceptions.py

0 0 -2

             URLError = functools.partial(_make_exception, 'url_error')
-            SubrepoMergeException = functools.partial(_make_exception, 'subrepo_merge_error')
             class HTTPRepoLocked(HTTPLocked):
                 """

vcsserver/hg.py

0 0 -7

                     repo = self._factory.repo(wire)
                     baseui = self._factory._create_config(wire['config'])
                     repo.ui.setconfig('ui', 'merge', 'internal:dump')
-                    # In case of sub repositories are used mercurial prompts the user in
-                    # case of merge conflicts or different sub repository sources. By
-                    # setting the interactive flag to `False` mercurial doesn't prompt the
-                    # used but instead uses a default value.
-                    repo.ui.setconfig('ui', 'interactive', False)
                     commands.merge(baseui, repo, rev=revision)
                 @reraise_safe_exceptions

vcsserver/hgcompat.py

0 0 -1

             from mercurial import unionrepo
             from mercurial import localrepo
             from mercurial import merge as hg_merge
-            from mercurial import subrepo
             from mercurial.commands import clone, nullid, pull
             from mercurial.context import memctx, memfilectx

vcsserver/hgpatches.py

0 0 -74

@@ -58,77 +58,3 b' def _dynamic_capabilities_wrapper(lfprot'
58	return calc_capabilities(repo, proto)	58	return calc_capabilities(repo, proto)
59		59
60	return _dynamic_capabilities	60	return _dynamic_capabilities
61
62
63	def patch_subrepo_type_mapping():
64	from collections import defaultdict
65	from hgcompat import subrepo
66	from exceptions import SubrepoMergeException
67
68	class NoOpSubrepo(subrepo.abstractsubrepo):
69
70	def __init__(self, ctx, path, args, *kwargs):
71	"""Initialize abstractsubrepo part
72
73	``ctx`` is the context referring this subrepository in the
74	parent repository.
75
76	``path`` is the path to this subrepository as seen from
77	innermost repository.
78	"""
79	self.ui = ctx.repo().ui
80	self._ctx = ctx
81	self._path = path
82
83	def storeclean(self, path):
84	"""
85	returns true if the repository has not changed since it was last
86	cloned from or pushed to a given repository.
87	"""
88	return True
89
90	def dirty(self, ignoreupdate=False):
91	"""returns true if the dirstate of the subrepo is dirty or does not
92	match current stored state. If ignoreupdate is true, only check
93	whether the subrepo has uncommitted changes in its dirstate.
94	"""
95	return False
96
97	def basestate(self):
98	"""current working directory base state, disregarding .hgsubstate
99	state and working directory modifications"""
100	substate = subrepo.state(self._ctx, self.ui)
101	file_system_path, rev, repotype = substate.get(self._path)
102	return rev
103
104	def remove(self):
105	"""remove the subrepo
106
107	(should verify the dirstate is not dirty first)
108	"""
109	pass
110
111	def get(self, state, overwrite=False):
112	"""run whatever commands are needed to put the subrepo into
113	this state
114	"""
115	pass
116
117	def merge(self, state):
118	"""merge currently-saved state with the new state."""
119	raise SubrepoMergeException()
120
121	def push(self, opts):
122	"""perform whatever action is analogous to 'hg push'
123
124	This may be a no-op on some systems.
125	"""
126	pass
127
128	# Patch subrepo type mapping to always return our NoOpSubrepo class
129	# whenever a subrepo class is looked up.
130	subrepo.types = {
131	'hg': NoOpSubrepo,
132	'git': NoOpSubrepo,
133	'svn': NoOpSubrepo
134	}

vcsserver/http_main.py

0 0 -1

             def main(global_config, **settings):
                 if MercurialFactory:
                     hgpatches.patch_largefiles_capabilities()
-                    hgpatches.patch_subrepo_type_mapping()
                 app = HTTPApplication(settings=settings)
                 return app.wsgi_app()

vcsserver/main.py

0 0 -1

             def main(argv=sys.argv, quiet=False):
                 if MercurialFactory:
                     hgpatches.patch_largefiles_capabilities()
-                    hgpatches.patch_subrepo_type_mapping()
                 command = VcsServerCommand(argv, quiet=quiet)
                 return command.run()

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages