Skip to main content
AgeCommit message (Collapse)AuthorFilesLines
2010-09-06Merge "Add NotIgnoredFilter to standard RevWalk for ChangeSet"Stefan Lay3-42/+13
2010-09-06Fix AddOperationTestJens Baumgart1-1/+1
Fixed small bug in AddOperationTest. Change-Id: Ib15b43cf9341f669911fcf65671e139373eb13ee Signed-off-by: Jens Baumgart <>
2010-09-06Add NotIgnoredFilter to standard RevWalk for ChangeSetDariusz Luksza3-42/+13
The NotIgnoredFilter can be used together with ANY_DIFF in standard RevWalk configuration for collecting data in ChangeSet implementation. Change-Id: I6b02a60a3c97f1864b4191978ee3a68e259b488d Signed-off-by: Dariusz Luksza <>
2010-09-06Fix IgnoreOperationTestJens Baumgart1-0/+10
IgnoreOperationTest did not clean up .gitignore in the workspace folder. This caused subsequent test to fail. Change-Id: Icc3e3e02302a8189ae2009e24682206d8bff086e Signed-off-by: Jens Baumgart <>
2010-09-06Merge "History View: always show selected resource"Stefan Lay3-16/+94
2010-09-06History View: always show selected resourceMathias Kinzler3-16/+94
The behavior of the history view is quite confusing for most users: instead of showing the current input, a combination of input and the currently checked button is displayed above the list. Not only do the users have a hard time to understand what they are seeing and why they have certain context menus available at a given time, but also when the "Repository" button is selected, the repository name is always shown as input, no matter where you click. Subsequently, the navigation history will contain the same String several times, and you don't see what you have in fact visited. This change does replace the current String with something like "File: MyProject/folder/File.txt [myRepository]", or "Project: MyProject [myRepository]" etc. The getDescription() method was also changed to return something like the above appended with a description of the current "filter" setting, for example "All changes in Repository of this Resource" or "All changes of this Resource", but unfortunately, this information is never rendered (the javadoc says it might be rendered as tooltip or such)... I opened bug 324386 for this one. Bug: 320998 Change-Id: I9409728d133a70875f9ee16ff93cce33a94361fb Signed-off-by: Mathias Kinzler <>
2010-09-06Merge changes Ida4d4cb0,Ide20e315Mathias Kinzler1-58/+50
* changes: Don't start SourceBranchPage with a warning Cleanup of SourceBranchPage
2010-09-06Merge "[repoView] Use "New Project" wizard instead of "New" wizard"Stefan Lay1-2/+2
2010-09-04cleanup: Remove unnecessary @SuppressWarningsRobin Rosenberg1-8/+0
Change-Id: Ic9a424cfdfcebbf2ff548f6741d2f96a1494df0e Signed-off-by: Robin Rosenberg <>
2010-09-04Merge "Use API to open up the Preferences dialog"Chris Aniszczyk1-2/+6
2010-09-04Use API to open up the Preferences dialogBenjamin Muskalla1-2/+6
In change I46fc0dab, internal API is used to open up the preferences dialog. We should use proper API instead to avoid warnings and further breakage. Change-Id: I796df7be87b99e66c29845e7ca32ed2cec1fc55b Signed-off-by: Benjamin Muskalla <>
2010-09-04Use mnemonics and descriptive labels in Synchronize dialogBenjamin Muskalla4-23/+51
In order to support mnemonics in the dialog, the creation of widgets had to be changed slightly as SWT always refers to the next widget in case a mnemonic on a label is hit. Labels now also reflect the source and destination. Change-Id: I59a6b4dd7700182a8fbbf38c19c9c6776f35af35 Signed-off-by: Benjamin Muskalla <>
2010-09-03Merge "Load branch name in branch rename dialog"Chris Aniszczyk1-4/+4
2010-09-03Merge "History View: Use Repository Icon instead of filter icon"Chris Aniszczyk3-5/+1
2010-09-03Merge "Fix UI tests on Mac"Matthias Sohn5-40/+23
2010-09-03Load branch name in branch rename dialogDariusz Luksza1-4/+4
This is a small usability improvement. It loads branch name in rename dialog. Change-Id: Ibc2c8e90ffaf05296fb07fdd6882b82699521b5b Signed-off-by: Dariusz Luksza <>
2010-09-03Fix UI tests on MacJens Baumgart5-40/+23
GlobalConfigurationPageTest is not working on Mac because the preferences dialog is triggered via Eclipse->settings on Mac. Now the preferences dialog is opened programmatically. Remove usage of mnemonics to select radio buttons since mnemonics are not supported on Mac. Change-Id: I46fc0dab7acbd17e3a933f42bec183c80a00d0cd Signed-off-by: Jens Baumgart <>
2010-09-03[repoView] Use "New Project" wizard instead of "New" wizardMathias Kinzler1-2/+2
Bug: 324186 Change-Id: I7d778c06a57eeead4748be65bfa293c03f706f8d Signed-off-by: Mathias Kinzler <>
2010-09-03History View: Use Repository Icon instead of filter iconMathias Kinzler3-5/+1
Since the "Show all changes for the Repository" option is in fact not a filter, we should not use a filter icon for it. Change-Id: If90e2f787ec08fb115304b06620bcdcba9d604fa Signed-off-by: Mathias Kinzler <>
2010-09-03Don't start SourceBranchPage with a warningBenjamin Muskalla1-6/+10
Currently the SourceBranchPage starts with the warning that the repository is empty as we're just about to fetch the refs. We should only check if the repository is empty when we are done with fetching its branches. This avoids a warning the user should only see in the case the repository really is empty. Change-Id: Ida4d4cb0ed0d1881d8a263d8b51caacbb5450fa7 Signed-off-by: Benjamin Muskalla <>
2010-09-03Cleanup of SourceBranchPageBenjamin Muskalla1-52/+40
By using the CheckboxTableViewer, we can get rid of much boilerplate code that was introduced for the checked-state handling. In addition, content and labels are cleanly separated by the providers. Added icon to help the user identifying the content of the list. Change-Id: Ide20e315249fb4278731c3e7551cbeab0525278e Signed-off-by: Benjamin Muskalla <>
2010-09-03Fixed several warnings by removing dead codeBenjamin Muskalla1-38/+1
As the method is never used in EGit anymore, we can get rid of it together with the deprecated warnings. Change-Id: I867792b36ba312b0e465098d4209e35a14bb45f1 Signed-off-by: Benjamin Muskalla <>
2010-09-02Adapt to incompatible change in DiffFormaterMatthias Sohn1-1/+1
JGit commit ec2fdbf2ba changed public void formatEdits(final RawText a, final RawText b, final EditList edits) incompatibly to public void format(final EditList edits, final RawText a, final RawText b) Change-Id: I634a9154d3fc6f3c8f1500b34f71879ccf888070 Signed-off-by: Jens Baumgart <> Signed-off-by: Matthias Sohn <>
2010-09-02Fix a failing UI testMathias Kinzler1-20/+20
Just a matter of sequence.... Change-Id: I62ffa2bada0c00cc233bbfdd52d8b5378de271ff Signed-off-by: Mathias Kinzler <>
2010-09-02Merge "Use eclipse's encoding to render diff"Chris Aniszczyk4-16/+81
2010-09-02Reset now resets merging stateJens Baumgart3-2/+28
ResetOperation did not reset the repository state merging / merging resolved on a hard / mixed reset. Now MERGE_HEAD and MERGE_MSG are removed on hard / mixed reset. Change-Id: If9cc7cfa5c32aa1f9d98d0a2b3998c222a18e38c Signed-off-by: Jens Baumgart <>
2010-09-02Use eclipse's encoding to render diffStefan Lay4-16/+81
It is not sufficient to use the default system encoding to render diffs. Instead, the settings in eclipse are used. This setting has to be determined for each file because it can be set on resource and on project level. Bug: 320785 Change-Id: I27e12e6251bebfb4652bf11aa6845d7e5ca86fb7 Signed-off-by: Stefan Lay <>
2010-09-02Git Repositories View: Hierarchical branches representation toggleMathias Kinzler9-28/+315
Similar to the package explorer which supports flat vs. hierarchical package representation, this allows to toggle between flat vs. hierarchical branch representation. If the toggle is on, then the "/" used in the branch names is interpreted as hierarchy separator and the branches are presented correspondingly. Other than the suggestion in bug 315567, this does not eliminate the "Remote Branches" node altogether in "hierarchical" mode, since there might be remote branches without "/" separators which would result in a confusing representation. Bug: 315567 Bug: 323950 Change-Id: I085dc24a2cd517a76b9d210c9f74d2832dfe9ff4 Signed-off-by: Mathias Kinzler <> Signed-off-by: Chris Aniszczyk <>
2010-09-01Fix EGit to use JGit's api.errors packageShawn O. Pearce6-15/+17
Change-Id: I27ec972b0d42b495c1f0c26ec0d76e644224e590 Signed-off-by: Shawn O. Pearce <>
2010-09-01Fix bugs in MergeCommandJens Baumgart1-21/+16
1. Add missing scheduling rule to execution job. 2. The information dialog sometimes closed automatically. This was caused by the usage of the wrong parent shell. Change-Id: I12b7e6c214726b4b54b6bacf3b4a0fc1cfe96adf Signed-off-by: Jens Baumgart <>
2010-08-31Merge "Remove usage of deprecated PersonIdent constructor"Chris Aniszczyk6-26/+17
2010-08-31Git Repositories View: fix "Merge..." context menuMathias Kinzler2-1/+49
This does in fact make sense if it works: the same dialog as in Team > Merge (on a project) should be displayed. Unfortunately, this was broken due to improper handler registration. Bug: 323979 Change-Id: Ib53a81a2ffed743ab74ff6f115c9e5cf392bbe3a Signed-off-by: Mathias Kinzler <>
2010-08-31Revert performance improvement in sync viewDariusz Luksza1-7/+0
It appears that commit "Fix NPE while opening CompareView for oldest commit" with was fixing bug 322732 was only workaround. In previous implementation of GitModelRepository.getChildrenImpl() we were using LogCommand to calculate complete list of commits between to given points. LogCommand.addRange(AnyObjectId, AnyObjectId) internally calls RevWalk.markUnimportant(RevCommit) on first given AnyObjectId to addRange() method. RevWalk implementation disposes commits that was marked as unimportant when traversal has finish. Because we were joining results of two LogCommands (since common ancestor to destination and since ancestor to source) the common ancestor commit was included in commits list but it was disposed by RevWalk, therefore we got an NPE while launching Compare view. Current implementation of GitModelRepository.getChildrenImpl() uses single RevWalk instance and don't mark any commit as unimportant therefore it is free from NPE in CommitFileRevision. Change-Id: Idad83c4e14878d51e5c3f32f0a0f6863d82d8003 Signed-off-by: Dariusz Luksza <>
2010-08-31Fix problems when pushing to a remote that has only a Push URLMathias Kinzler6-29/+55
Push dosen't work if the remote to push to has only Push URLs, but no URL. Bug: 317389 Bug: 321527 Change-Id: If681dcdd8dc38bcc1282d65e7361fa610d67620c Signed-off-by: Mathias Kinzler <>
2010-08-31Merge "Remove a "discouraged access" warning introduced by Javadoc"Chris Aniszczyk1-1/+1
2010-08-31Remove usage of deprecated PersonIdent constructorMathias Kinzler6-26/+17
Change-Id: I7706a916f8388bbae948d550005584cadb1e836a Signed-off-by: Mathias Kinzler <>
2010-08-31Merge "Fix broken encoding in Diff"Matthias Sohn2-12/+28
2010-08-31Fix broken encoding in DiffStefan Lay2-12/+28
The Diff shown in history view and in patches created from "Create Patch..." did not take into account encoding. Now a ByteArrayOutputStream is used which takes platform's default character set. Bug: 320785 Change-Id: I4a6baab761bc053474180dcd68eeeb019e32d1fc Signed-off-by: Stefan Lay <> Signed-off-by: Matthias Sohn <>
2010-08-31Remove a "discouraged access" warning introduced by JavadocMathias Kinzler1-1/+1
Change-Id: I9b32006588991abed3c564816ee4138528320e24 Signed-off-by: Mathias Kinzler <>
2010-08-31Fix bugs in MergeActionHandlerJens Baumgart1-22/+18
1. Add missing scheduling rule to execution job. 2. The information dialog sometimes closed automatically. This was caused by the usage of the wrong parent shell. Change-Id: I0764c163cb643d68a3013801eba5a82e08ad8dc7 Signed-off-by: Jens Baumgart <>
2010-08-30Remove "only fast forward" message from Merge DialogStefan Lay3-6/+1
Change-Id: Ie77ce45855d70e15840a4acd553cb208173e57de Signed-off-by: Stefan Lay <> Signed-off-by: Chris Aniszczyk <>
2010-08-30Add tests for IgnoreOperationBenjamin Muskalla5-8/+132
In order to have a better test coverage before fixing and refactoring other changes, we need to ensure to have at least most of the features covered by tests. In addition, fixed minor bug to really use the scheduling rules we create. Change-Id: If63a9632b28aeb7d6ef585f889876ec42dac2c0c Signed-off-by: Benjamin Muskalla <> Signed-off-by: Chris Aniszczyk <>
2010-08-30Display details of push resultJens Baumgart4-24/+103
PushResultTable was enhanced to show the details of a push result. Error messages and the information returned by the push operation (e.g. the gerrit review URL) are shown in a separate text control. The colors of the result status (green, red) were replaced by an icon. Bug: 319974 Change-Id: I4000c80b8a3365dea3b4b6977f3e03271e634154 Signed-off-by: Jens Baumgart <> Signed-off-by: Chris Aniszczyk <>
2010-08-30Make it easier to see what ResetOperation does and remove unnecessary workRobin Rosenberg1-35/+23
Hard reset performed an unnecessary index write Change-Id: Ia667570979de75aa055f2050552968d6cea568b2 Signed-off-by: Robin Rosenberg <> Signed-off-by: Chris Aniszczyk <>
2010-08-30Remove dead code and fix some UI testsMathias Kinzler14-50/+37
Some dead code is removed found in the tests, activates a test that is working and fixes some failing tests. Change-Id: Ie3be2d69e23f83f65f6ad5d65ce2e9f25d4c85c1 Signed-off-by: Mathias Kinzler <> Signed-off-by: Chris Aniszczyk <>
2010-08-30Add JGit source feature to update site and fix JGit categoryMatthias Sohn1-1/+9
Change-Id: I50aab40f569bc701652b0acf14b72344573cdd9e Signed-off-by: Matthias Sohn <> Signed-off-by: Chris Aniszczyk <>
2010-08-30Merge "Git Repositories View: wrong enablement of "Rename Branch" action"Chris Aniszczyk1-10/+6
2010-08-30Remove Eclipse 3.6 resource filter from egit source feature .projectMathias Kinzler1-11/+0
Bug: 323390 Change-Id: Ic23caf875319c282884328f2b48b770ed5af5da0 Signed-off-by: Mathias Kinzler <>
2010-08-30Git Repositories View: wrong enablement of "Rename Branch" actionMathias Kinzler1-10/+6
Bug: 323928 Change-Id: I3afe35a0820bc16ef04d722430889de0beed9ec3 Signed-off-by: Mathias Kinzler <>
2010-08-30Fix Tag dialog: Catch exception when parsing a lightweight tagStefan Lay1-1/+4
Currently the Tag dialog only works with annotated tags. It gets them from the method getRevTags(). This method uses repo.getTags() which returns also lightweight tags. With this commit the expected exception is just caught. Bug: 322302 Change-Id: I3d37eded5b76cda612f6c01bc983f92a4130faa2 Signed-off-by: Stefan Lay <>

Back to the top