[feature] UI for changing branch stacking

Bug #498063 reported by Dimitri John Ledkov
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Invalid
Undecided
Unassigned
Launchpad itself
Triaged
Low
Unassigned

Bug Description

$ bzr reconfigure lp:~xiphos-devel/xiphos/trunk --stacked-on bzr+ssh://bazaar.launchpad.net/~dmitrij.ledkov/xiphos/trunk
bzr+ssh://bazaar.launchpad.net/~xiphos-devel/xiphos/trunk/ is now stacked on ../../../~dmitrij.ledkov/xiphos/trunk

dmitrij@jauntybook:~$ bzr info lp:~xiphos-devel/xiphos/trunk
Repository branch (format: unnamed)
Location:
  shared repository: bzr+ssh://bazaar.launchpad.net/~xiphos-devel/xiphos/trunk/
  repository branch: bzr+ssh://bazaar.launchpad.net/~xiphos-devel/xiphos/trunk/

Related branches:
  parent branch: svn+https://gnomesword.svn.sourceforge.net/svnroot/gnomesword/trunk
     stacked on: ../../../~dmitrij.ledkov/xiphos/trunk

Note the last bit. It results in a warning displayed on lp:~xiphos-devel/xiphos/trunk page saying "Unsupported protocol for url "lp-hosted://../../../~dmitrij.ledkov/xiphos/trunk" "

Tags: lp-code
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Ok after some testing I believe it is impossible to restack any lp branch onto another lp branch.

eg if you run

$bzr reconfigure lp:~someone/project/branch --stacked-on bzr+ssh://bazaar.launchpad.net/~someoneelse/project/other

then

$bzr info lp:~someone/project/branch
<tratatata>
Related branches:
stacked on: ../../~someoneelse/project/other

This is not recongnised by launchpad as a valid brach (Branch has errors)

Where the correct result should be:

$bzr info lp:~someone/project/branch
<tratatata>
stacked on: bzr+ssh://bazaar.launchpad.net/~someoneelse/project/other

Basicly bazaar did url expansion to local directory on launchpad, when it shouldn't have since it's hosted branch.

summary: - Redonfiguring lp branch (which is used as --stacked-on by other
- branches) to be --stacked-on to something else ruins it.
+ restacking lp branch results in stacking onto filesystem url instead of
+ bzr+ssh
summary: - restacking lp branch results in stacking onto filesystem url instead of
- bzr+ssh
+ restacking lp branch results in branch stacked onto filesystem url
+ instead of bzr+ssh url
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

A solution on irc was to still use bzr reconfigure and then use bzrlib to reset stacked-on branch to correct url.

I would like to request launchpad UI to change stacking in branch configs (next to change branch owner & branch name)

summary: - restacking lp branch results in branch stacked onto filesystem url
- instead of bzr+ssh url
+ [feature] UI for changing branch stacking
Revision history for this message
Martin Pool (mbp) wrote :

I think you should be passing a relative url to the stacked-on setting.

If this bug is asking for a Launchpad UI to change this, then I'm not sure what change is wanted in bzr.

Changed in bzr:
status: New → Incomplete
Revision history for this message
Martin Pool (mbp) wrote :

I think this is already addressed in bzr through 'reconfigure --stacked-on/--unstacked'. If you think that's not enough, please reopen the bug and tell us why and how.

Changed in bzr:
status: Incomplete → Invalid
Revision history for this message
Dimitri John Ledkov (xnox) wrote : Re: [Bug 498063] Re: [feature] UI for changing branch stacking

2009/12/21 Martin Pool <email address hidden>:
> I think this is already addressed in bzr through 'reconfigure --stacked-
> on/--unstacked'.  If you think that's not enough, please reopen the bug
> and tell us why and how.
>

The how:

$ bzr ci --unchanged -m "Commit 1"
$ bzr push lp:~dmitrij.ledkov/xiphos/commit-1
Using default stacking branch /~xiphos-devel/xiphos/trunk at
lp-64802192:///~dmitrij.ledkov/xiphos
Created new stacked branch referring to /~xiphos-devel/xiphos/trunk.

$ bzr ci --unchanged -m "Commit 2"
$ bzr push lp:~dmitrij.ledkov/xiphos/commit-2
Using default stacking branch /~xiphos-devel/xiphos/trunk at
lp-64802192:///~dmitrij.ledkov/xiphos
Created new stacked branch referring to /~xiphos-devel/xiphos/trunk.

$ bzr reconfigure lp:~dmitrij.ledkov/xiphos/commit-2 --stacked-on
lp:~dmitrij.ledkov/xiphos/commit-1
bzr: ERROR: Not a branch:
"/home/dmitrij/src/upstream/xiphos/bla/lp:~dmitrij.ledkov/xiphos/commit-1/".

#trying harder
$ bzr reconfigure lp:~dmitrij.ledkov/xiphos/commit-2 --stacked-on
bzr+ssh://bazaar.launchpad.net/~dmitrij.ledkov/xiphos/commit-1
bzr+ssh://bazaar.launchpad.net/~dmitrij.ledkov/xiphos/commit-2/ is now
stacked on ../commit-1

lp:~dmitrij.ledkov/xiphos/commit-2 is now a broken branch (still up on
launchpad)

The why: resulting branch is broken (not valid).

--
With best regards

Dmitrijs Ledkovs (for short Dima),
Ледков Дмитрий Юрьевич

() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments

Changed in bzr:
status: Invalid → New
Revision history for this message
Robert Collins (lifeless) wrote :

relative stacked paths work in the core. I think this is an lp code issue really.

Changed in bzr:
status: New → Invalid
Revision history for this message
Dimitri John Ledkov (xnox) wrote : Dmitrijs Ledkovs wants to stay in touch on LinkedIn

LinkedIn
------------

Bug,

I'd like to add you to my professional network on LinkedIn.

- Dmitrijs Ledkovs

Dmitrijs Ledkovs
Student at The University of Hull
United Kingdom

Confirm that you know Dmitrijs Ledkovs
https://www.linkedin.com/e/isd/1067430380/ui_H3N0C/

------
(c) 2010, LinkedIn Corporation

Revision history for this message
Tim Penhey (thumper) wrote :

Michael, is this where we should modify the stacked on url to be relative properly on the codehost side?

Changed in launchpad-code:
importance: Undecided → Medium
status: New → Triaged
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Yes, probably.

This whole area basically makes me want to cry.

Curtis Hovey (sinzui)
Changed in launchpad:
importance: Medium → Low
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.