Launchpad itself

Merge lp:~jml/launchpad/git-and-hg into lp:launchpad

  1. git-and-hg
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: 11069
Proposed branch: lp:~jml/launchpad/git-and-hg
Merge into: lp:launchpad
Diff against target: 32 lines (+5/-6)
2 files modified
lib/lp/code/stories/branches/xx-product-branches.txt (+2/-2)
lib/lp/code/templates/product-branch-summary.pt (+3/-4)
To merge this branch: bzr merge lp:~jml/launchpad/git-and-hg
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+28527@code.launchpad.net

Commit message

On the project page, say that you can import from git and mercurial as well as svn and cvs.

Description of the change

The branch listing page for a product says that you can import stuff from Subversion and CVS. This is true, but you can also import stuff from git and mercurial as well.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)
Revision history for this message
Robert Collins (lifeless) wrote :

Just wanted to mention that it seems a little weird to manually
enumerate a list that we also have as a selector in the system.
Couldn't we list-and-stringify?

-Rob

Revision history for this message
Jonathan Lange (jml) wrote :

On Fri, Jun 25, 2010 at 9:19 PM, Robert Collins
<email address hidden> wrote:
> Just wanted to mention that it seems a little weird to manually
> enumerate a list that we also have as a selector in the system.
> Couldn't we list-and-stringify?
>

Patches accepted.

jml

Revision history for this message
Jonathan Lange (jml) wrote :

On Fri, Jun 25, 2010 at 9:27 PM, Jonathan Lange <email address hidden> wrote:
> On Fri, Jun 25, 2010 at 9:19 PM, Robert Collins
> <email address hidden> wrote:
>> Just wanted to mention that it seems a little weird to manually
>> enumerate a list that we also have as a selector in the system.
>> Couldn't we list-and-stringify?
>>
>
> Patches accepted.
>

Which is to say, you're right and that would be a better approach.
However, I made the trade-off at the time of fixing a simple bug as
soon as I noticed it, and have no personal motivation to continue
improving this particular part of Launchpad right now.

jml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/stories/branches/xx-product-branches.txt'
2--- lib/lp/code/stories/branches/xx-product-branches.txt 2010-05-13 16:22:19 +0000
3+++ lib/lp/code/stories/branches/xx-product-branches.txt 2010-06-28 14:02:38 +0000
4@@ -43,8 +43,8 @@
5 by registering a Mirrored branch. Read more.
6 Launchpad can also act as a primary location for Bazaar branches of
7 Gnome Applets. Read more.
8- Launchpad can import code from CVS or Subversion into Bazaar branches.
9- Read more.
10+ Launchpad can import code from CVS, Subversion, Mercurial or Git
11+ into Bazaar branches. Read more.
12
13 The 'Read more' links go to the help wiki.
14
15
16=== modified file 'lib/lp/code/templates/product-branch-summary.pt'
17--- lib/lp/code/templates/product-branch-summary.pt 2010-01-08 14:22:42 +0000
18+++ lib/lp/code/templates/product-branch-summary.pt 2010-06-28 14:02:38 +0000
19@@ -26,10 +26,9 @@
20 <a href="https://help.launchpad.net/Code/UploadingABranch">Read more.</a>
21 </li>
22
23- <li>Launchpad can import code from CVS or Subversion into Bazaar
24- branches.
25- <a href="https://help.launchpad.net/VcsImports">Read more.</a>
26- </li>
27+ <li>Launchpad can import code from CVS, Subversion, Mercurial or Git
28+ into Bazaar branches. <a
29+ href="https://help.launchpad.net/VcsImports">Read more.</a> </li>
30
31 </ul>
32 </tal:no-branches>