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

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
1=== modified file 'lib/lp/code/interfaces/gitnamespace.py'
2--- lib/lp/code/interfaces/gitnamespace.py 2015-04-28 23:25:08 +0000
3+++ lib/lp/code/interfaces/gitnamespace.py 2015-05-01 15:38:18 +0000
4@@ -188,7 +188,6 @@
5 return getUtility(IGitNamespaceSet).get(owner)
6
7
8-# Marker for references to Git URL layouts: ##GITNAMESPACE##
9 def split_git_unique_name(unique_name):
10 """Return the namespace and repository names of a unique name."""
11 try:
12
13=== modified file 'lib/lp/code/interfaces/gitrepository.py'
14--- lib/lp/code/interfaces/gitrepository.py 2015-04-28 16:39:15 +0000
15+++ lib/lp/code/interfaces/gitrepository.py 2015-05-01 15:38:18 +0000
16@@ -350,7 +350,6 @@
17 More important related objects are sorted first.
18 """
19
20- # Marker for references to Git URL layouts: ##GITNAMESPACE##
21 def getRepositoryIdentities():
22 """A list of aliases for a repository.
23
24@@ -566,7 +565,6 @@
25 to the target's code sharing policy. (optional)
26 """
27
28- # Marker for references to Git URL layouts: ##GITNAMESPACE##
29 @call_with(user=REQUEST_USER)
30 @operation_parameters(
31 path=TextLine(title=_("Repository path"), required=True))
32
33=== modified file 'lib/lp/code/model/gitlookup.py'
34--- lib/lp/code/model/gitlookup.py 2015-03-30 14:47:22 +0000
35+++ lib/lp/code/model/gitlookup.py 2015-05-01 15:38:18 +0000
36@@ -74,7 +74,6 @@
37
38 implements(IGitTraversable)
39
40- # Marker for references to Git URL layouts: ##GITNAMESPACE##
41 def traverse(self, owner, name, segments):
42 """See `IGitTraversable`.
43
44@@ -107,7 +106,6 @@
45 def __init__(self, context):
46 self.context = context
47
48- # Marker for references to Git URL layouts: ##GITNAMESPACE##
49 def traverse(self, owner, name, segments):
50 """See `IGitTraversable`.
51
52@@ -152,7 +150,6 @@
53 adapts(IDistribution)
54 implements(IGitTraversable)
55
56- # Marker for references to Git URL layouts: ##GITNAMESPACE##
57 def traverse(self, owner, name, segments):
58 """See `IGitTraversable`.
59
60@@ -204,7 +201,6 @@
61 def getNamespace(self, owner):
62 return getUtility(IGitNamespaceSet).get(owner)
63
64- # Marker for references to Git URL layouts: ##GITNAMESPACE##
65 def traverse(self, owner, name, segments):
66 """See `IGitTraversable`.
67
68
69=== modified file 'lib/lp/code/model/gitnamespace.py'
70--- lib/lp/code/model/gitnamespace.py 2015-04-28 23:25:08 +0000
71+++ lib/lp/code/model/gitnamespace.py 2015-05-01 15:38:18 +0000
72@@ -249,7 +249,6 @@
73 GitRepository.distribution == None,
74 GitRepository.sourcepackagename == None)
75
76- # Marker for references to Git URL layouts: ##GITNAMESPACE##
77 @property
78 def name(self):
79 """See `IGitNamespace`."""
80@@ -324,7 +323,6 @@
81 GitRepository.owner == self.owner,
82 GitRepository.project == self.project)
83
84- # Marker for references to Git URL layouts: ##GITNAMESPACE##
85 @property
86 def name(self):
87 """See `IGitNamespace`."""
88@@ -411,7 +409,6 @@
89 GitRepository.distribution == dsp.distribution,
90 GitRepository.sourcepackagename == dsp.sourcepackagename)
91
92- # Marker for references to Git URL layouts: ##GITNAMESPACE##
93 @property
94 def name(self):
95 """See `IGitNamespace`."""
96
97=== modified file 'lib/lp/code/model/gitrepository.py'
98--- lib/lp/code/model/gitrepository.py 2015-04-28 16:39:15 +0000
99+++ lib/lp/code/model/gitrepository.py 2015-05-01 15:38:18 +0000
100@@ -209,7 +209,6 @@
101 self.owner_default = False
102 self.target_default = False
103
104- # Marker for references to Git URL layouts: ##GITNAMESPACE##
105 @property
106 def unique_name(self):
107 names = {"owner": self.owner.name, "repository": self.name}