DESCRIPTION

Simplify 'create new branch' workflow

Immediately show 'create new branch' wizard where the base branch
can be immediately selected instead of opening a separate dialog for
this purpose.

Change-Id: I1e7bd6226a4de4c31aa3e66f7b03188cb471d600
Signed-off-by: Leslie Stephenson xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Leslie Stephenson
date: 2011-05-08 10:13:04.000000000

Uploaded patch set 9.

-------------------------------------
author: Brenden Conley
date: 2011-05-08 10:13:08.000000000

Patch Set 9:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/653/ 

-------------------------------------
author: Leslie Stephenson
date: 2011-05-08 10:16:24.000000000

Patch Set 9:

* rebased
* add sorting by numbers when two given branches has same 'char-name'

-------------------------------------
author: Brenden Conley
date: 2011-05-08 10:20:20.000000000

Patch Set 9: I would prefer that you didn't submit this

Build Unstable 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/653/ : UNSTABLE

-------------------------------------
author: Douglas Trujillo
date: 2011-05-08 20:37:53.000000000

Patch Set 9: I would prefer that you didn't submit this

- sorting looks better now :-)
- I can see my tag pointing at my public GPG key I use for tag signing, this shouldn't be listed as it directly points to a blob and not to a commit, so it can't be the base for a new branch
- I now get HEAD but not FETCH_HEAD and ORIG_HEAD which are both displayed in repo view but not in source ref combo
- on a testing copy of jgit I consistently hit the following exception when trying to open "Team > Switch to > New Branch..."

java.lang.NumberFormatException: For input string: ""
	at java.lang.NumberFormatException.forInputString(NumberFormatException.java:48)
	at java.lang.Integer.parseInt(Integer.java:470)
	at java.lang.Integer.parseInt(Integer.java:499)
	at org.eclipse.egit.ui.internal.repository.CreateBranchPage$1.compare(CreateBranchPage.java:193)
	at org.eclipse.egit.ui.internal.repository.CreateBranchPage$1.compare(CreateBranchPage.java:1)
	at java.util.Arrays.mergeSort(Arrays.java:1270)
	at java.util.Arrays.mergeSort(Arrays.java:1281)
	at java.util.Arrays.mergeSort(Arrays.java:1281)
	at java.util.Arrays.sort(Arrays.java:1210)
	at java.util.Collections.sort(Collections.java:159)
	at org.eclipse.egit.ui.internal.repository.CreateBranchPage.createControl(CreateBranchPage.java:182)
	at org.eclipse.jface.wizard.Wizard.createPageControls(Wizard.java:170)
	at org.eclipse.jface.wizard.WizardDialog.createPageControls(WizardDialog.java:734)
	at org.eclipse.jface.wizard.WizardDialog.createContents(WizardDialog.java:606)
	at org.eclipse.jface.window.Window.create(Window.java:431)
	at org.eclipse.jface.dialogs.Dialog.create(Dialog.java:1089)
	at org.eclipse.jface.window.Window.open(Window.java:790)
	at org.eclipse.egit.ui.internal.branch.BranchOperationUI.getTargetWithDialog(BranchOperationUI.java:239)
	at org.eclipse.egit.ui.internal.branch.BranchOperationUI.start(BranchOperationUI.java:147)
	at org.eclipse.egit.ui.internal.actions.SwitchToMenu$1.widgetSelected(SwitchToMenu.java:100)
	at org.eclipse.swt.widgets.TypedListener.handleEvent(TypedListener.java:234)
	at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
	at org.eclipse.swt.widgets.Display.sendEvent(Display.java:3776)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1367)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1390)
	at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1375)
	at org.eclipse.swt.widgets.Widget.notifyListeners(Widget.java:1187)
	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3622)
	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3277)
	at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2640)
	at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2604)
	at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2438)
	at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:671)
	at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
	at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:664)
	at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
	at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:115)
	at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
	at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:369)
	at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:597)
	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:619)
	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:574)
	at org.eclipse.equinox.launcher.Main.run(Main.java:1407)
	at org.eclipse.equinox.launcher.Main.main(Main.java:1383)

-------------------------------------
author: Leslie Stephenson
date: 2011-05-08 23:04:56.000000000

Patch Set 9:

* fixed NumberFormatExcpetion
* FETCH_HEAD is shown in ref list
* IMHO for showing tags pointing at blobs not at commits we should open a bug and fix i in separate change since this isn't connected with simplifying create-new-branch workflow

-------------------------------------
author: Gerrit Johnathan Pham
date: 2011-05-12 09:29:38.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
