How do I use the Merge window?
+Every time I push some changes, I have to type my password again
-If you are working with other people on a project, it is likely that -at some point you'll find that more than one of you have edited the -same lines in the same file, in different ways.
+When you push to a remote repository with an “https:" prefix on its +URL, EasyMercurial's password dialog should ask whether you want to +remember your login details.
-When that happens and you try to merge the two versions, EasyMercurial -will pop up a merge window that looks a bit like this.
+If you say yes, the details will be stored until EasyMercurial +exits—so you won't have to enter them if you push or pull again +while the present EasyMercurial session is running. Your password will +be stored, encrypted with a session key, in a file which is deleted +when EasyMercurial exits.
-
If this option does not appear
-(This is actually a separate program, not part of EasyMercurial: it's -a merge tool called kdiff3.)
+... and if you're using OS/X, then you need to install the PyCrypto +library before EasyMercurial will be able to store encrypted passwords +for you.
-This looks a bit complicated, but it is there to help you pick which -of the changes from each of the two “rival” versions of the file you -want to use in your merged version.
+Try running sudo easy_install pycrypto in a terminal window.
The top middle one is your current version. That's - the one you had before you decided to merge the other version into - it.
+Not using an https repository?
-At top right is the version you're merging. That's the other - rival version – the one that the other person can see in their copy - of the repository.
+If your remote repository uses ssh or some other protocol, then +EasyMercurial won't be able to help. You might consider using ssh +public key authentication and an ssh agent—talk to the admin of your +remote repository for more details.
-At top left is the common ancestor. That's the version that both - of you had, before you started editing it in different ways.
- -At the bottom is the output.
- -Each conflict (a line which you have both changed in different ways) -is shown with Merge Conflict in the output at the bottom. To sort -out the conflicts and get the right output, you need to go through -them one by one, for each one pressing the A, B, or C button to say -whether for this line you want the top-left, top-middle, or top-right -version to “win”. (You can choose more than one, if you want both -versions of a line to appear.)
- -Then having resolved a conflict, press the three-arrows-down toolbar -button to go to the next one – and when you've done them all, save -and exit.
- -The most important thing to remember is that whatever appears in the -bottom pane is what you'll get as a result.
- -No matter how confusing the process, just remember that if it looks -correct in the bottom pane, it will be correct when you save and -exit. You can even edit the file directly in the bottom pane if you -aren't happy with the way the merge is going.
- - - - diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/a-35.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/a-35.html Mon Mar 12 14:58:40 2012 +0000 @@ -0,0 +1,57 @@ + + + +How do I use the Merge window?
+ +If you are working with other people on a project, it is likely that +at some point you'll find that more than one of you have edited the +same lines in the same file, in different ways.
+ +When that happens and you try to merge the two versions, EasyMercurial +will pop up a merge window that looks a bit like this.
+ +(This is actually a separate program, not part of EasyMercurial: it's +a merge tool called kdiff3.)
+ +This looks a bit complicated, but it is there to help you pick which +of the changes from each of the two “rival” versions of the file you +want to use in your merged version.
+ +The top middle one is your current version. That's + the one you had before you decided to merge the other version into + it.
+ +At top right is the version you're merging. That's the other + rival version – the one that the other person can see in their copy + of the repository.
+ +At top left is the common ancestor. That's the version that both + of you had, before you started editing it in different ways.
+ +At the bottom is the output.
+ +Each conflict (a line which you have both changed in different ways) +is shown with Merge Conflict in the output at the bottom. To sort +out the conflicts and get the right output, you need to go through +them one by one, for each one pressing the A, B, or C button to say +whether for this line you want the top-left, top-middle, or top-right +version to “win”. (You can choose more than one, if you want both +versions of a line to appear.)
+ +Then having resolved a conflict, press the three-arrows-down toolbar +button to go to the next one – and when you've done them all, save +and exit.
+ +The most important thing to remember is that whatever appears in the +bottom pane is what you'll get as a result.
+ +No matter how confusing the process, just remember that if it looks +correct in the bottom pane, it will be correct when you save and +exit. You can even edit the file directly in the bottom pane if you +aren't happy with the way the merge is going.
+ + + + diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/images/openfolder50.png Binary file help/images/openfolder50.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/images/openlocal50.png Binary file help/images/openlocal50.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/images/openremote50.png Binary file help/images/openremote50.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/topics.html --- a/help/topics.html Tue Feb 14 17:53:29 2012 +0000 +++ b/help/topics.html Mon Mar 12 14:58:40 2012 +0000 @@ -20,6 +20,7 @@I want to let my colleagues pull changes directly from my local repository
I want to put my changes into a master repository shared with my colleagues
-How do I use the Merge window?
+Every time I push some changes, I have to type my password again
+How do I use the Merge window?
See also
diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/topics/34.txt --- a/help/topics/34.txt Tue Feb 14 17:53:29 2012 +0000 +++ b/help/topics/34.txt Mon Mar 12 14:58:40 2012 +0000 @@ -1,56 +1,28 @@ {Sharing changes} -How do I use the Merge window? +Every time I push some changes, I have to type my password again -If you are working with other people on a project, it is likely that -at some point you'll find that more than one of you have edited the -same lines in the same file, in different ways. +When you push to a remote repository with an "https:" prefix on its +URL, EasyMercurial's password dialog should ask whether you want to +remember your login details. -When that happens and you try to merge the two versions, EasyMercurial -will pop up a merge window that looks a bit like this. +If you say yes, the details will be stored until EasyMercurial +exits---so you won't have to enter them if you push or pull again +while the present EasyMercurial session is running. Your password will +be stored, encrypted with a session key, in a file which is deleted +when EasyMercurial exits. -#merge50 +*If this option does not appear* -(This is actually a separate program, not part of EasyMercurial: it's -a merge tool called kdiff3.) +... and if you're using OS/X, then you need to install the PyCrypto +library before EasyMercurial will be able to store encrypted passwords +for you. -This looks a bit complicated, but it is there to help you pick which -of the changes from each of the two "rival" versions of the file you -want to use in your merged version. +Try running @sudo easy_install pycrypto@ in a terminal window. - *The top middle one is _your current version_.* That's - the one you had before you decided to merge the other version into - it. +*Not using an https repository?* - *At top right is _the version you're merging_.* That's the other - rival version -- the one that the other person can see in their copy - of the repository. - - *At top left is _the common ancestor_.* That's the version that both - of you had, before you started editing it in different ways. - - *At the bottom is the output.* - -Each _conflict_ (a line which you have both changed in different ways) -is shown with *Merge Conflict* in the output at the bottom. To sort -out the conflicts and get the right output, you need to go through -them one by one, for each one pressing the A, B, or C button to say -whether for this line you want the top-left, top-middle, or top-right -version to "win". (You can choose more than one, if you want both -versions of a line to appear.) - -Then having resolved a conflict, press the three-arrows-down toolbar -button to go to the next one -- and when you've done them all, save -and exit. - -The most important thing to remember is that _whatever appears in the -bottom pane is what you'll get as a result_. - -No matter how confusing the process, just remember that if it looks -correct in the bottom pane, it will be correct when you save and -exit. You can even edit the file directly in the bottom pane if you -aren't happy with the way the merge is going. - - - - +If your remote repository uses ssh or some other protocol, then +EasyMercurial won't be able to help. You might consider using ssh +public key authentication and an ssh agent---talk to the admin of your +remote repository for more details. diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/topics/35.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/topics/35.txt Mon Mar 12 14:58:40 2012 +0000 @@ -0,0 +1,56 @@ +{Sharing changes} + +How do I use the Merge window? + +If you are working with other people on a project, it is likely that +at some point you'll find that more than one of you have edited the +same lines in the same file, in different ways. + +When that happens and you try to merge the two versions, EasyMercurial +will pop up a merge window that looks a bit like this. + +#merge50 + +(This is actually a separate program, not part of EasyMercurial: it's +a merge tool called kdiff3.) + +This looks a bit complicated, but it is there to help you pick which +of the changes from each of the two "rival" versions of the file you +want to use in your merged version. + + *The top middle one is _your current version_.* That's + the one you had before you decided to merge the other version into + it. + + *At top right is _the version you're merging_.* That's the other + rival version -- the one that the other person can see in their copy + of the repository. + + *At top left is _the common ancestor_.* That's the version that both + of you had, before you started editing it in different ways. + + *At the bottom is the output.* + +Each _conflict_ (a line which you have both changed in different ways) +is shown with *Merge Conflict* in the output at the bottom. To sort +out the conflicts and get the right output, you need to go through +them one by one, for each one pressing the A, B, or C button to say +whether for this line you want the top-left, top-middle, or top-right +version to "win". (You can choose more than one, if you want both +versions of a line to appear.) + +Then having resolved a conflict, press the three-arrows-down toolbar +button to go to the next one -- and when you've done them all, save +and exit. + +The most important thing to remember is that _whatever appears in the +bottom pane is what you'll get as a result_. + +No matter how confusing the process, just remember that if it looks +correct in the bottom pane, it will be correct when you save and +exit. You can even edit the file directly in the bottom pane if you +aren't happy with the way the merge is going. + + + + diff -r 9f91d1b2ed51 -r e40e3ebe9f2e help/topics/40.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/help/topics/40.txt Mon Mar 12 14:58:40 2012 +0000 @@ -0,0 +1,8 @@ +{See also} + +Video tutorials + +There are some very simple video tutorials available on the EasyMercurial website. + +Please see [[http://easyhg.org/videos.html]]. + diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/cancel-small.png Binary file images/cancel-small.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/crappy-icon-design.xcf Binary file images/crappy-icon-design.xcf has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/crappy-icon.png Binary file images/crappy-icon.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-128.png Binary file images/easyhg-icon-128.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-16.png Binary file images/easyhg-icon-16.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-192.png Binary file images/easyhg-icon-192.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-22.png Binary file images/easyhg-icon-22.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-24.png Binary file images/easyhg-icon-24.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-256.png Binary file images/easyhg-icon-256.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-32.png Binary file images/easyhg-icon-32.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-48.png Binary file images/easyhg-icon-48.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon-64.png Binary file images/easyhg-icon-64.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon.png Binary file images/easyhg-icon.png has changed diff -r 9f91d1b2ed51 -r e40e3ebe9f2e images/easyhg-icon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/images/easyhg-icon.svg Mon Mar 12 14:58:40 2012 +0000 @@ -0,0 +1,140 @@ + + + + diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/annotatedialog.cpp --- a/src/annotatedialog.cpp Tue Feb 14 17:53:29 2012 +0000 +++ b/src/annotatedialog.cpp Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/annotatedialog.h --- a/src/annotatedialog.h Tue Feb 14 17:53:29 2012 +0000 +++ b/src/annotatedialog.h Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/changeset.cpp --- a/src/changeset.cpp Tue Feb 14 17:53:29 2012 +0000 +++ b/src/changeset.cpp Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/changeset.h --- a/src/changeset.h Tue Feb 14 17:53:29 2012 +0000 +++ b/src/changeset.h Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/changesetdetailitem.cpp --- a/src/changesetdetailitem.cpp Tue Feb 14 17:53:29 2012 +0000 +++ b/src/changesetdetailitem.cpp Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/changesetdetailitem.h --- a/src/changesetdetailitem.h Tue Feb 14 17:53:29 2012 +0000 +++ b/src/changesetdetailitem.h Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/changesetitem.cpp --- a/src/changesetitem.cpp Tue Feb 14 17:53:29 2012 +0000 +++ b/src/changesetitem.cpp Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -38,7 +38,7 @@ ChangesetItem::ChangesetItem(Changeset *cs) : m_changeset(cs), m_detail(0), m_showBranch(false), m_column(0), m_row(0), m_wide(false), - m_current(false), m_closing(false), m_new(false) + m_current(false), m_closing(false), m_new(false), m_searchMatches(false) { m_font = QFont(); m_font.setPixelSize(11); @@ -91,6 +91,22 @@ emit detailHidden(); } +bool +ChangesetItem::matchSearchText(QString text) +{ + m_searchText = text; + m_searchMatches = false; + if (m_showBranch) { + m_searchMatches = (m_changeset->branch().contains + (text, Qt::CaseInsensitive)); + } + if (!m_searchMatches) { + m_searchMatches = (m_changeset->comment().contains + (text, Qt::CaseInsensitive)); + } + return m_searchMatches; +} + void ChangesetItem::mousePressEvent(QGraphicsSceneMouseEvent *e) { @@ -296,6 +312,17 @@ bool showText = (scale >= 0.2); bool showProperLines = (scale >= 0.1); + if (m_searchText != "") { + if (m_searchMatches) { + userColour = QColor("#008400"); + showProperLines = true; + showText = true; + } else { + branchColour = Qt::gray; + userColour = Qt::gray; + } + } + if (!showProperLines) { paint->setPen(QPen(branchColour, 0)); } else { @@ -452,6 +479,8 @@ paint->setFont(f); + if (m_searchMatches) paint->setPen(userColour); + for (int i = 0; i < lines.size(); ++i) { paint->drawText(x0 + 3, i * fh + fh + fm.ascent(), lines[i].trimmed()); } diff -r 9f91d1b2ed51 -r e40e3ebe9f2e src/changesetitem.h --- a/src/changesetitem.h Tue Feb 14 17:53:29 2012 +0000 +++ b/src/changesetitem.h Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -65,6 +65,8 @@ bool showBranch() const { return m_showBranch; } void setShowBranch(bool s) { m_showBranch = s; } + bool matchSearchText(QString text); // return true and records the match if it matches + signals: void detailShown(); void detailHidden(); @@ -110,6 +112,8 @@ bool m_current; bool m_closing; bool m_new; + QString m_searchText; + bool m_searchMatches; QMapNone of the modified files have matching filenames.
Select Show all file states to find matches among unmodified and untracked files as well.
No files have matching filenames.
At the moment you have no uncommitted changes.
To see changes previously made to the repository,
switch to the History tab.
%1
EasyMercurial is based on HgExplorer by " "Jari Korhonen, with thanks.
" ""
- "Copyright © 2011 Queen Mary, University of London.
"
+ "Copyright © 2012 Queen Mary, University of London.
"
"Copyright © 2010 Jari Korhonen.
"
- "Copyright © 2011 Chris Cannam."
+ "Copyright © 2012 Chris Cannam."
"
"
"This program requires Mercurial, by Matt Mackall and others.
"
@@ -282,6 +289,8 @@
path = s.value("default").toString();
}
+// std::cerr << "hgQueryPaths: setting m_remoteRepoPath to " << m_remoteRepoPath << " from file " << hgrc.absoluteFilePath() << std::endl;
+
m_remoteRepoPath = path;
// We have to do this here, because commandCompleted won't be called
@@ -1484,7 +1493,8 @@
d->addChoice("remote",
tr("![](\":images/browser-64.png\")
Remote repository