bzr-eclipse : Code : Bazaar Plugin for Eclipse

Get this branch:: bzr branch lp:~alex-idereal/bzr-eclipse/bzr-eclipse

Only Alexander Taler can upload to this branch. If you are Alexander Taler please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:bzr-eclipse at revision 224

Piotr Piastucki: Approve on 2013-02-19

Diff: 3815 lines (+1777/-1324)

61 files modified

.bzrignore (+4/-11)
HowToCompileAndRun.txt (+41/-1)
org.apache.commons.logging/pom.xml (+1/-1)
org.kxml2/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.client/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.core.tests/META-INF/MANIFEST.MF (+2/-2)
org.vcs.bazaar.eclipse.core.tests/pom.xml (+2/-2)
org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/repository/BranchFactoryTest.java (+2/-2)
org.vcs.bazaar.eclipse.core/META-INF/MANIFEST.MF (+1/-1)
org.vcs.bazaar.eclipse.core/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/model/IBzrBranch.java (+11/-0)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchFactory.java (+27/-41)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/repository/BranchLocationManager.java (+1/-0)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranch.java (+5/-0)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/BzrBranchLocator.java (+188/-0)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/LocalBranch.java (+4/-4)
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/internal/core/model/RemoteBranch.java (+11/-1)
org.vcs.bazaar.eclipse.feature/feature.xml (+5/-3)
org.vcs.bazaar.eclipse.feature/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.site/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.site/site.xml (+3/-10)
org.vcs.bazaar.eclipse.tests-feature/feature.xml (+1/-1)
org.vcs.bazaar.eclipse.tests-feature/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.ui/META-INF/MANIFEST.MF (+3/-3)
org.vcs.bazaar.eclipse.ui/plugin.properties (+4/-2)
org.vcs.bazaar.eclipse.ui/plugin.xml (+29/-36)
org.vcs.bazaar.eclipse.ui/pom.xml (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/EclipseBazaarUI.java (+5/-3)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BindAction.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/BranchAction.java (+2/-10)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/EditConflictsAction.java (+78/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MergeAction.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/MissingAction.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PullAction.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/PushAction.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/SwitchAction.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/UpdateAction.java (+39/-13)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/compare/ConflictingFileEditorInput.java (+165/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/MergeDialog.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/SendDialog.java (+1/-1)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/BranchAsProjectOperation.java (+0/-137)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CheckoutAsProjectOperation.java (+0/-70)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/operations/CreateBazaarProjectOperation.java (+198/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectAdvancedPage.java (+69/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectBranchType.java (+90/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectEntry.java (+166/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectLocation.java (+53/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectName.java (+51/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectPage.java (+115/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRemoteBranch.java (+101/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectRevision.java (+106/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java (+176/-0)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchFromProjectWizard.java (+0/-93)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizard.java (+0/-250)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardBranchLocationPage.java (+0/-143)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardProjectPage.java (+0/-176)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/BranchWizardSelectionPage.java (+0/-188)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutFromProjectWizard.java (+0/-57)
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/project/CheckoutWizard.java (+0/-45)
pom.xml (+2/-2)
redstone.xmlrpc/pom.xml (+1/-1)

Related bugs

Link a bug report

Related blueprints

Branch information

Owner:: Alexander Taler

Project:: Bazaar Plugin for Eclipse

Status:: Merged

Recent revisions

265. By Alexander Taler on 2012-12-27

CreateProjectWizard: Fix compilation problem exception

264. By dissent on 2012-12-27

CreateProjectWizard: Log exceptions.

263. By Alexander Taler on 2012-12-27

CreateProjectWizard: Better error handling for working with branches

Missing local branches were causing unhandled runtime exceptions,
and preventing the wizard from displaying.

Updates to getBranchLocator() method:
  + Move it from LocalBranch to superclass BzrBranch.
  + Throw BazaarException instead of promoting to RuntimeException.
  + Catch and log exceptions in both places it is used
    CreateProjectRemoteBranch, and CreateProjectWizard

262. By Alexander Taler on 2012-12-23

Packaging: Increase version, update instructionst

+ Update HowToCompileAndRun.txt for site building and version change
+ Update version in all relevant places
+ Reorganize features to align with main Eclipse archives
+ Update .bzrignore for site-building

261. By Alexander Taler on 2012-12-21

CreateProjectWizard: Discover and create multiple projects from branch

+ Rewrite core logic of CreateBazaarProejctOperation to discover
and create projects.
+ Remove isDefaultLocation() stuff from other Page and Wizard,
since that's checked in a different way now.

260. By Alexander Taler on 2012-12-21

CreateProjectWizard: Validate correctness of location

+ Introduce a new class to hold location: CreateProjectLocation
+ Use new class in CreateProjectPage
+ Make project name visible in Wizard.

259. By Alexander Taler on 2012-12-21

CreateProjectWizard: Fix bug where page validity wasn't being removed

258. By Alexander Taler on 2012-12-20

CreateProjectWizard: Obey the user's chosen project location

+ CreateBazaarProjectOperation -- Adapt call to create project
for when location is specified.
+ Update CreateProjectPage and CreateProjectWizard to convey if
the project is going to the expected default location.

257. By Alexander Taler on 2012-12-20

CreateProjectWizard: Replace the operation classes with a single new one.

This is a preparatory step for supporting the creation of
multiple projects from a single checkout.

+ Remove BranchAsProjectOperation and CheckoutAsProjectOperation
+ Introduce CreateBazaarProjectOperation
+ Move type definitions from CreateProjectWizard to new class
+ Modify BazaarProjectWizard to use the new class
+ Introduce common error handling in BazaarProjectWizard

256. By Alexander Taler on 2012-12-19

CreateProjectWizard: Make destination project location readable by Wizard

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp:bzr-eclipse

Bazaar Plugin for Eclipse

lp:~alex-idereal/bzr-eclipse/bzr-eclipse

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers