Launchpad itself

Merge lp:~cjwatson/launchpad/remove-gitnamespace-markers into lp:launchpad

  1. remove-gitnamespace-markers
  2. Merge into devel
Proposed by Colin Watson
Status: Rejected
Rejected by: Colin Watson
Proposed branch: lp:~cjwatson/launchpad/remove-gitnamespace-markers
Merge into: lp:launchpad
Diff against target: 107 lines (+0/-11)
5 files modified
lib/lp/code/interfaces/gitnamespace.py (+0/-1)
lib/lp/code/interfaces/gitrepository.py (+0/-2)
lib/lp/code/model/gitlookup.py (+0/-4)
lib/lp/code/model/gitnamespace.py (+0/-3)
lib/lp/code/model/gitrepository.py (+0/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/remove-gitnamespace-markers
Reviewer Review Type Date Requested Status
William Grant Needs Information
Review via email: mp+258046@code.launchpad.net

Commit message

Remove the ##GITNAMESPACE## markers, now that we're on production.

Description of the change

Now that we're on production and have a stable URL format, there isn't much point in having the ##GITNAMESPACE## markers any more.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

Is there much point in removing them?

Also, after discussions in Austin don't we probably want to add target alternate repos?

review: Needs Information
Revision history for this message
Jes Slow (cluelesscoder) wrote :

Why leave a branch open from 2015? All this cruft makes it hard for community members to poke around and see what's happening. More incentive to find another community...

Revision history for this message
Colin Watson (cjwatson) wrote :

Yeah, I'll close this for now; I suppose these markers may yet be useful information if we decide to make some of the plausible extensions.

Unmerged revisions

17475. By Colin Watson

Remove the ##GITNAMESPACE## markers, now that we're on production.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/interfaces/gitnamespace.py'
--- lib/lp/code/interfaces/gitnamespace.py 2015-04-28 23:25:08 +0000
+++ lib/lp/code/interfaces/gitnamespace.py 2015-05-01 15:38:18 +0000
@@ -188,7 +188,6 @@
188 return getUtility(IGitNamespaceSet).get(owner)188 return getUtility(IGitNamespaceSet).get(owner)
189189
190190
191# Marker for references to Git URL layouts: ##GITNAMESPACE##
192def split_git_unique_name(unique_name):191def split_git_unique_name(unique_name):
193 """Return the namespace and repository names of a unique name."""192 """Return the namespace and repository names of a unique name."""
194 try:193 try:
195194
=== modified file 'lib/lp/code/interfaces/gitrepository.py'
--- lib/lp/code/interfaces/gitrepository.py 2015-04-28 16:39:15 +0000
+++ lib/lp/code/interfaces/gitrepository.py 2015-05-01 15:38:18 +0000
@@ -350,7 +350,6 @@
350 More important related objects are sorted first.350 More important related objects are sorted first.
351 """351 """
352352
353 # Marker for references to Git URL layouts: ##GITNAMESPACE##
354 def getRepositoryIdentities():353 def getRepositoryIdentities():
355 """A list of aliases for a repository.354 """A list of aliases for a repository.
356355
@@ -566,7 +565,6 @@
566 to the target's code sharing policy. (optional)565 to the target's code sharing policy. (optional)
567 """566 """
568567
569 # Marker for references to Git URL layouts: ##GITNAMESPACE##
570 @call_with(user=REQUEST_USER)568 @call_with(user=REQUEST_USER)
571 @operation_parameters(569 @operation_parameters(
572 path=TextLine(title=_("Repository path"), required=True))570 path=TextLine(title=_("Repository path"), required=True))
573571
=== modified file 'lib/lp/code/model/gitlookup.py'
--- lib/lp/code/model/gitlookup.py 2015-03-30 14:47:22 +0000
+++ lib/lp/code/model/gitlookup.py 2015-05-01 15:38:18 +0000
@@ -74,7 +74,6 @@
7474
75 implements(IGitTraversable)75 implements(IGitTraversable)
7676
77 # Marker for references to Git URL layouts: ##GITNAMESPACE##
78 def traverse(self, owner, name, segments):77 def traverse(self, owner, name, segments):
79 """See `IGitTraversable`.78 """See `IGitTraversable`.
8079
@@ -107,7 +106,6 @@
107 def __init__(self, context):106 def __init__(self, context):
108 self.context = context107 self.context = context
109108
110 # Marker for references to Git URL layouts: ##GITNAMESPACE##
111 def traverse(self, owner, name, segments):109 def traverse(self, owner, name, segments):
112 """See `IGitTraversable`.110 """See `IGitTraversable`.
113111
@@ -152,7 +150,6 @@
152 adapts(IDistribution)150 adapts(IDistribution)
153 implements(IGitTraversable)151 implements(IGitTraversable)
154152
155 # Marker for references to Git URL layouts: ##GITNAMESPACE##
156 def traverse(self, owner, name, segments):153 def traverse(self, owner, name, segments):
157 """See `IGitTraversable`.154 """See `IGitTraversable`.
158155
@@ -204,7 +201,6 @@
204 def getNamespace(self, owner):201 def getNamespace(self, owner):
205 return getUtility(IGitNamespaceSet).get(owner)202 return getUtility(IGitNamespaceSet).get(owner)
206203
207 # Marker for references to Git URL layouts: ##GITNAMESPACE##
208 def traverse(self, owner, name, segments):204 def traverse(self, owner, name, segments):
209 """See `IGitTraversable`.205 """See `IGitTraversable`.
210206
211207
=== modified file 'lib/lp/code/model/gitnamespace.py'
--- lib/lp/code/model/gitnamespace.py 2015-04-28 23:25:08 +0000
+++ lib/lp/code/model/gitnamespace.py 2015-05-01 15:38:18 +0000
@@ -249,7 +249,6 @@
249 GitRepository.distribution == None,249 GitRepository.distribution == None,
250 GitRepository.sourcepackagename == None)250 GitRepository.sourcepackagename == None)
251251
252 # Marker for references to Git URL layouts: ##GITNAMESPACE##
253 @property252 @property
254 def name(self):253 def name(self):
255 """See `IGitNamespace`."""254 """See `IGitNamespace`."""
@@ -324,7 +323,6 @@
324 GitRepository.owner == self.owner,323 GitRepository.owner == self.owner,
325 GitRepository.project == self.project)324 GitRepository.project == self.project)
326325
327 # Marker for references to Git URL layouts: ##GITNAMESPACE##
328 @property326 @property
329 def name(self):327 def name(self):
330 """See `IGitNamespace`."""328 """See `IGitNamespace`."""
@@ -411,7 +409,6 @@
411 GitRepository.distribution == dsp.distribution,409 GitRepository.distribution == dsp.distribution,
412 GitRepository.sourcepackagename == dsp.sourcepackagename)410 GitRepository.sourcepackagename == dsp.sourcepackagename)
413411
414 # Marker for references to Git URL layouts: ##GITNAMESPACE##
415 @property412 @property
416 def name(self):413 def name(self):
417 """See `IGitNamespace`."""414 """See `IGitNamespace`."""
418415
=== modified file 'lib/lp/code/model/gitrepository.py'
--- lib/lp/code/model/gitrepository.py 2015-04-28 16:39:15 +0000
+++ lib/lp/code/model/gitrepository.py 2015-05-01 15:38:18 +0000
@@ -209,7 +209,6 @@
209 self.owner_default = False209 self.owner_default = False
210 self.target_default = False210 self.target_default = False
211211
212 # Marker for references to Git URL layouts: ##GITNAMESPACE##
213 @property212 @property
214 def unique_name(self):213 def unique_name(self):
215 names = {"owner": self.owner.name, "repository": self.name}214 names = {"owner": self.owner.name, "repository": self.name}