[MERGE] Stacked branches UI part 1 - push

Ian Clatworthy ian.clatworthy at canonical.com
Fri Jun 6 05:37:19 BST 2008


The attached merge directive contains the next in the
stacked branches series and the first of the UI related ones.
This one covers push. Two new options are added:

* --reference URL - create a shallow branch that refers to URL

* --shallow - create a shallow branch that refers to the
  public location of the parent branch, or just the parent
  branch if there's no public location.

I've reviewed and tweaked Robert's code. The tweaks fell
into two categories:

1. A refactoring of cmd_push to use a helper function.
   (The run() method was huge before Robert's changes with
   a TODO at the top suggesting this.) A minor change to
   tests/commands/test_push.py become necessary because of
   this refactoring.

2. Miscellaneous minor changes. Beyond some tweaking to the
   help for the new options, I made --reference override
   --shallow if both were set and added two extra warnings
   for the edge cases were users asked for a referenced
   branch yet a branch or repo already exists.

Also there is no NEWS item for this by design. That comes
in the next patch and covers both push and branch.

Assuming Robert approves my tweaks and the refactoring of
cmd_push doesn't cause large grief for others working on
things targeted for 1.6, I believe this is now ready for
merging to bzr.dev. Well, once the earlier patches land
at least.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: push-with-reference.patch
Type: text/x-diff
Size: 41343 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080606/582d610b/attachment-0001.bin 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: igc-tweaks-push-with-reference.txt
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080606/582d610b/attachment-0001.txt 


More information about the bazaar mailing list