After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 479644 - request method to set vc plugin order.
request method to set vc plugin order.
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: general
1.1.x
Other All
: Normal enhancement
: ---
Assigned To: Vincent Legoll
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2007-09-23 23:32 UTC by Grant Edwards
Modified: 2009-03-07 10:23 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
NO-OP refactorization to allow easy GUI chooser implementation (1002 bytes, patch)
2009-02-20 10:20 UTC, Vincent Legoll
committed Details | Review
GUI chooser implementation (1.53 KB, patch)
2009-02-20 10:21 UTC, Vincent Legoll
committed Details | Review
Add preference pane to allow configuration of vc plugin chooser method (13.17 KB, patch)
2009-03-04 20:05 UTC, Vincent Legoll
rejected Details | Review

Description Grant Edwards 2007-09-23 23:32:37 UTC
When you have a project that's under both CVS and svn contorl, meld always chooses to use CVS, even through svn is what we use for day-to-day work.
Comment 1 Vincent Legoll 2009-02-20 10:19:07 UTC
I have created the following 2 patches for that.
Please review, test and report.

The first is just a NO-OP preparation for the second which implements a very simple (hints accepted as to what would be better) GUI chooser.

Tested with git+hg repository.
Comment 2 Vincent Legoll 2009-02-20 10:20:57 UTC
Created attachment 129131 [details] [review]
NO-OP refactorization to allow easy GUI chooser implementation
Comment 3 Vincent Legoll 2009-02-20 10:21:39 UTC
Created attachment 129132 [details] [review]
GUI chooser implementation
Comment 4 Vincent Legoll 2009-02-20 10:32:24 UTC
test with:

mkdir git+hg
cd git+hg

echo .hg > .gitignore
echo .hgignore >> .gitignore

git init
git add .gitignore
git commit -m "ignore list"

echo .git > .hgignore
echo .gitignore >> .hgignore

hg init
hg add .hgignore
hg commit -m "ignore list"

touch test.txt

hg add test.txt
hg commit -m initial

git add test.txt
git commit -m initial

echo a > test.txt

meld .
Comment 5 Stephen Kennedy 2009-02-21 19:58:34 UTC
Very nice clean patch. This is good to commit.
Comment 6 Vincent Legoll 2009-02-23 21:54:47 UTC
committed the 2 patches in rev 1159 & 1160
Comment 7 Vincent Legoll 2009-03-04 20:05:51 UTC
Created attachment 130058 [details] [review]
Add preference pane to allow configuration of vc plugin chooser method

This patch is against trunk rev # r1217
Comment 8 Vincent Legoll 2009-03-04 20:13:53 UTC
That last patch #130058 is adding a "Version Control" preference tab,
with a "Multiple version control system" option with a radio button,
allowing to choose method used when multiple version control systems
are detected in the same directory:

1) Old way: guess by taking the one with the longest working directory path
2) Ask the user with the GUI chooser implemented in the previous 2 patches
3) Pick first match from a user specified list

Only the second option is interactive, the other 2 are automatic.

The old automatic method is used when there is a problem with the user specified list from option 3) and an error dialog box asks the user to fix the problem in the preferences.