Mercurial > hg > easyhg
changeset 647:a03264984ef8
Merge
| author | Chris Cannam |
|---|---|
| date | Mon, 21 Jan 2013 10:22:44 +0000 |
| parents | 6653fc50a546 (current diff) ae67ea0af696 (diff) |
| children | b55466f7b8bf |
| files | src/fswatcher.cpp src/mainwindow.cpp src/version.h |
| diffstat | 79 files changed, 183 insertions(+), 159 deletions(-) [+] |
line wrap: on
line diff
--- a/README.txt Fri Jan 11 10:29:36 2013 +0000 +++ b/README.txt Mon Jan 21 10:22:44 2013 +0000 @@ -44,8 +44,8 @@ EasyMercurial is Copyright 2010 Jari Korhonen -Copyright 2010-2012 Chris Cannam -Copyright 2010-2012 Queen Mary, University of London +Copyright 2010-2013 Chris Cannam +Copyright 2010-2013 Queen Mary, University of London
--- a/src/annotatedialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/annotatedialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/annotatedialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/annotatedialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changeset.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changeset.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changeset.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changeset.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetdetailitem.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetdetailitem.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetdetailitem.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetdetailitem.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetitem.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetitem.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetitem.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetitem.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetscene.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetscene.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetscene.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetscene.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetview.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetview.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/changesetview.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/changesetview.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/clickablelabel.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/clickablelabel.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/colourset.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/colourset.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/colourset.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/colourset.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/common.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/common.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/common.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/common.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/confirmcommentdialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/confirmcommentdialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/confirmcommentdialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/confirmcommentdialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/connectionitem.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/connectionitem.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/connectionitem.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/connectionitem.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/debug.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/debug.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/debug.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/debug.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/filestates.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/filestates.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/filestates.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/filestates.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/filestatuswidget.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/filestatuswidget.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/filestatuswidget.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/filestatuswidget.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/findwidget.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/findwidget.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/findwidget.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/findwidget.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/fswatcher.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/fswatcher.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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 @@ -154,7 +154,9 @@ FsWatcher *watcher = reinterpret_cast<FsWatcher *>(clientCallBackInfo); const char *const *cpaths = reinterpret_cast<const char *const *>(paths); for (size_t i = 0; i < numEvents; ++i) { +#ifdef DEBUG_FSWATCHER std::cerr << "path " << i << " = " << cpaths[i] << std::endl; +#endif watcher->fsDirectoryChanged(QString::fromLocal8Bit(cpaths[i])); } } @@ -371,7 +373,9 @@ bool FsWatcher::manuallyCheckTrackedFiles() { +#ifdef DEBUG_FSWATCHER std::cerr << "FsWatcher::manuallyCheckTrackedFiles" << std::endl; +#endif bool foundChanges = false; for (PathTimeMap::iterator i = m_trackedFileUpdates.begin();
--- a/src/fswatcher.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/fswatcher.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/grapher.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/grapher.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/grapher.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/grapher.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgaction.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgaction.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgignoredialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgignoredialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgignoredialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgignoredialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgrunner.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgrunner.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgrunner.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgrunner.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgtabwidget.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgtabwidget.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/hgtabwidget.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/hgtabwidget.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/historywidget.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/historywidget.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/historywidget.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/historywidget.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/incomingdialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/incomingdialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/incomingdialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/incomingdialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/logparser.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/logparser.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/logparser.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/logparser.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/main.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/main.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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 @@ -18,13 +18,33 @@ #include "mainwindow.h" #include "common.h" #include "debug.h" +#include "version.h" #include <QApplication> #include <QTranslator> #include <QDir> +using std::cout; +using std::endl; + int main(int argc, char *argv[]) { + if (argc == 2 && + (!strcmp(argv[1], "-v") || + !strcmp(argv[1], "--version"))) { + cout << "EasyMercurial v" << EASYHG_VERSION << "\n" + << "Copyright (c) 2010 Jari Korhonen\n" + << "Copyright (c) 2013 Chris Cannam\n" + << "Copyright (c) 2013 Queen Mary, University of London\n" + << "This program is free software; you can redistribute it and/or\n" + << "modify it under the terms of the GNU General Public License as\n" + << "published by the Free Software Foundation; either version 2 of the\n" + << "License, or (at your option) any later version. See the file\n" + << "COPYING included with this distribution for more information." + << endl; + return 0; + } + QApplication app(argc, argv); QApplication::setOrganizationName("easymercurial");
--- a/src/mainwindow.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/mainwindow.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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 @@ -193,9 +193,9 @@ "<p>EasyMercurial is based on HgExplorer by " "Jari Korhonen, with thanks.</p>" "<p style=\"margin-left: 2em;\">" - "Copyright © 2012 Queen Mary, University of London.<br>" + "Copyright © 2013 Queen Mary, University of London.<br>" "Copyright © 2010 Jari Korhonen.<br>" - "Copyright © 2012 Chris Cannam." + "Copyright © 2013 Chris Cannam." "</p>" "<p style=\"margin-left: 2em;\">" "This program requires Mercurial, by Matt Mackall and others.<br>"
--- a/src/mainwindow.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/mainwindow.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/moreinformationdialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/moreinformationdialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/moreinformationdialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/moreinformationdialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/multichoicedialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/multichoicedialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/multichoicedialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/multichoicedialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/panned.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/panned.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/panned.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/panned.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/panner.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/panner.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/panner.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/panner.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/recentfiles.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/recentfiles.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/recentfiles.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/recentfiles.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/repositorydialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/repositorydialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/repositorydialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/repositorydialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/selectablelabel.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/selectablelabel.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/selectablelabel.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/selectablelabel.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/settingsdialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/settingsdialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/settingsdialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/settingsdialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/squeezedlabel.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/squeezedlabel.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/squeezedlabel.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/squeezedlabel.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/startupdialog.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/startupdialog.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/startupdialog.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/startupdialog.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/textabbrev.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/textabbrev.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/textabbrev.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/textabbrev.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/uncommitteditem.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/uncommitteditem.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/uncommitteditem.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/uncommitteditem.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/version.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/version.h Mon Jan 21 10:22:44 2013 +0000 @@ -1,1 +1,1 @@ -#define EASYHG_VERSION "1.2.2" +#define EASYHG_VERSION "1.3"
--- a/src/versiontester.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/versiontester.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/versiontester.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/versiontester.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on hgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/workstatuswidget.cpp Fri Jan 11 10:29:36 2013 +0000 +++ b/src/workstatuswidget.cpp Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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
--- a/src/workstatuswidget.h Fri Jan 11 10:29:36 2013 +0000 +++ b/src/workstatuswidget.h Mon Jan 21 10:22:44 2013 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2012 Chris Cannam - Copyright (c) 2012 Queen Mary, University of London + Copyright (c) 2013 Chris Cannam + Copyright (c) 2013 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