| Wed, 02 Mar 2011 12:38:17 +0000 |
Chris Cannam |
Merge, and add a helpful warning when you try to push before committing your merge (I just did this and the ensuing warning was misleading)
easyhg_v0.4
|
| Wed, 02 Mar 2011 12:32:50 +0000 |
Chris Cannam |
Fix screwed-up translations caused by accidentally running Qt3 versions of translation tools
|
| Wed, 02 Mar 2011 12:29:45 +0000 |
Chris Cannam |
* Fix up framework paths regardless of their initial values
|
| Tue, 01 Mar 2011 16:50:06 +0000 |
Chris Cannam |
More Mac build material
|
| Tue, 01 Mar 2011 15:51:41 +0000 |
Chris Cannam |
Added tag easyhg_v0.4 for changeset 4b9656471303
|
| Tue, 01 Mar 2011 15:51:28 +0000 |
Chris Cannam |
Update version number to 0.4; another minor textual fix
|
| Tue, 01 Mar 2011 14:22:53 +0000 |
Chris Cannam |
Merge from branch "new-branches-with-status-outside-tabs"
|
| Tue, 01 Mar 2011 14:22:29 +0000 |
Chris Cannam |
Add Start New Branch and Cancel New Branch to uncommitted item menu; add branch name to Commit dialog
new-branches-with-status-outside-tabs
|
| Mon, 28 Feb 2011 17:35:55 +0000 |
Chris Cannam |
Minor textual fix
|
| Mon, 28 Feb 2011 14:31:57 +0000 |
Chris Cannam |
Make a further couple of dialogs use MoreInformationDialog
|
| Mon, 28 Feb 2011 14:24:14 +0000 |
Chris Cannam |
With status outside tabs, no need to switch to Work tab when new branch is introduced
new-branches-with-status-outside-tabs
|
| Mon, 28 Feb 2011 13:09:37 +0000 |
Chris Cannam |
Merge branch status_outside_tabs into branch new-branches, and make a new branch
new-branches-with-status-outside-tabs
|
| Sat, 26 Feb 2011 23:04:18 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Sat, 26 Feb 2011 23:04:05 +0000 |
Chris Cannam |
Avoid exception when incremental log is called for in a situation where the heads have not actually been determined yet -- we could end up adding all existing history as an incremental update and getting a duplicate changeset error
|
| Tue, 22 Feb 2011 15:57:09 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Tue, 22 Feb 2011 15:55:13 +0000 |
Chris Cannam |
And another tweak to pull-successful dialog.
|
| Tue, 22 Feb 2011 15:53:49 +0000 |
Chris Cannam |
Another tweak to merge-successful dialog texts
|
| Tue, 22 Feb 2011 15:52:22 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Tue, 22 Feb 2011 15:51:47 +0000 |
Chris Cannam |
Minor layout & text changes
|
| Tue, 22 Feb 2011 15:32:00 +0000 |
Chris Cannam |
Font adjustment for pull/push confirm dialogs. Better, though the extra text will still be too small on OS/X
|
| Tue, 22 Feb 2011 15:12:56 +0000 |
Chris Cannam |
* Make "More Details" button non-auto-default in more-info dialog
|
| Tue, 22 Feb 2011 13:12:16 +0000 |
Chris Cannam |
Minor layout updates
status_outside_tabs
|
| Tue, 22 Feb 2011 13:03:03 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Mon, 21 Feb 2011 19:22:29 +0000 |
Chris Cannam |
Small fix to clone successful dialog wording
|
| Mon, 21 Feb 2011 18:20:29 +0000 |
Chris Cannam |
Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
|
| Mon, 21 Feb 2011 18:17:18 +0000 |
Chris Cannam |
Merge from branch "more_information_dialog"
|
| Mon, 21 Feb 2011 18:16:15 +0000 |
Chris Cannam |
Return success if the external diff/merge _is_ found, not if it isn't!
|
| Mon, 21 Feb 2011 15:55:39 +0000 |
Chris Cannam |
Make several operations use the new more-information dialog
more_information_dialog
|
| Mon, 21 Feb 2011 14:23:02 +0000 |
Chris Cannam |
Make our own message box with a more useful "more information" section than the Qt one
more_information_dialog
|
| Mon, 21 Feb 2011 12:15:04 +0000 |
Chris Cannam |
We can provide a better interface for most common cases by essentially showing a formatted log for the summary rather than a diff only
|
| Mon, 21 Feb 2011 11:37:58 +0000 |
Chris Cannam |
Add "Summarise changes" options to changeset item right-button menu (already existed for uncommitted item)
|
| Mon, 21 Feb 2011 11:07:21 +0000 |
Chris Cannam |
Move work-folder state area outside tabs widget
status_outside_tabs
|
| Mon, 21 Feb 2011 09:13:33 +0000 |
Chris Cannam |
Merge from branch "mainwindow_member_tidy"
status_outside_tabs
|
| Mon, 21 Feb 2011 09:13:22 +0000 |
Chris Cannam |
Merge from branch "mainwindow_member_tidy"
|
| Mon, 21 Feb 2011 09:08:55 +0000 |
Chris Cannam |
Make MainWindow members private and m_prefixed
mainwindow_member_tidy
|
| Mon, 21 Feb 2011 08:48:31 +0000 |
Chris Cannam |
Separate out work-status code from the file status widget
status_outside_tabs
|
| Fri, 18 Feb 2011 13:39:16 +0000 |
Chris Cannam |
Merge
|
| Fri, 18 Feb 2011 13:38:31 +0000 |
Chris Cannam |
* Change "diff to parent <id>" menu entries in changeset item right-button menu to "diff to left parent" and "diff to right parent"
|
| Thu, 17 Feb 2011 12:10:09 +0000 |
Chris Cannam |
* Avoid reporting failure when hg incoming shows a warning (as is the case when site cert could not be verified)
|
| Thu, 10 Feb 2011 18:49:47 +0000 |
Chris Cannam |
Merge
|
| Wed, 09 Feb 2011 12:03:15 +0000 |
Chris Cannam |
Add "Start new branch" function. I'm not quite satisfied with the location of this one
new-branches
|
| Wed, 09 Feb 2011 12:02:53 +0000 |
Chris Cannam |
Remove no-longer-used icon files
|
| Tue, 01 Feb 2011 12:40:40 +0000 |
Chris Cannam |
Added tag easyhg_v0.3.2 for changeset cc95394e2392
|
| Mon, 31 Jan 2011 17:23:10 +0000 |
Chris Cannam |
* Some work on separating out the "more information" component from dialog messages. Will need work on layouts
more_information_dialog
|
| Thu, 10 Feb 2011 18:49:01 +0000 |
Chris Cannam |
* Use kdiff3 from path if present; return sensible return code
|
| Tue, 25 Jan 2011 16:41:40 +0000 |
Chris Cannam |
* Add warning dialog for "restore default settings"; add option for dates or ages in history list
easyhg_v0.3.2
|
| Tue, 25 Jan 2011 16:12:23 +0000 |
Chris Cannam |
* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)
|
| Thu, 20 Jan 2011 13:56:01 +0000 |
Chris Cannam |
* Bump version to 0.3.2
|
| Thu, 20 Jan 2011 13:55:33 +0000 |
Chris Cannam |
* Update deployment so as to adjust kdiff3 if bundled as well
|
| Thu, 20 Jan 2011 13:37:00 +0000 |
Chris Cannam |
* Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists.
|
| Mon, 17 Jan 2011 11:44:17 +0000 |
Chris Cannam |
* Revert the grapher change from revision ec2baee80833 on Dec 19th 2010. The change definitely performed worse than the original (now reinstated) logic in the real-world soundsoftware-site case, with far more connection overlaps and ambiguous placements.
|
| Wed, 12 Jan 2011 16:38:13 +0000 |
Chris Cannam |
* Correct version number
|
| Wed, 12 Jan 2011 16:31:28 +0000 |
Chris Cannam |
Merge
|
| Wed, 12 Jan 2011 16:30:46 +0000 |
Chris Cannam |
* Add InstallJammer definition file, update hgignore so as not to ignore it!
|
| Wed, 12 Jan 2011 16:14:43 +0000 |
Chris Cannam |
* Fix typo. Uh
|
| Wed, 12 Jan 2011 15:54:56 +0000 |
Chris Cannam |
Added tag easyhg_v0.3.1 for changeset a7843b03b4cf
|
| Wed, 12 Jan 2011 15:54:08 +0000 |
Chris Cannam |
Merge
easyhg_v0.3.1
|
| Wed, 12 Jan 2011 15:53:46 +0000 |
Chris Cannam |
* Doh
|
| Wed, 12 Jan 2011 15:52:53 +0000 |
Chris Cannam |
* Version -> 0.3.1 (and update OS/X deploy to handle three-part versions)
|
| Wed, 12 Jan 2011 15:46:37 +0000 |
Chris Cannam |
Merge
|
| Wed, 12 Jan 2011 15:46:24 +0000 |
Chris Cannam |
* Attempt to pop input dialog to front instead of permitting it to open behind EasyMercurial window
|
| Wed, 12 Jan 2011 15:46:05 +0000 |
Chris Cannam |
* Explicitly request 32-bit Python on OS/X 10.6
|
| Wed, 12 Jan 2011 15:02:11 +0000 |
Chris Cannam |
* OS/X deployment fixes
|
| Wed, 12 Jan 2011 13:08:39 +0000 |
Chris Cannam |
Added tag easyhg_v0.3 for changeset c02515e33b5d
|
| Wed, 12 Jan 2011 13:08:31 +0000 |
Chris Cannam |
* Update version number
easyhg_v0.3
|
| Wed, 12 Jan 2011 12:48:04 +0000 |
Chris Cannam |
Merge
|
| Wed, 12 Jan 2011 12:47:56 +0000 |
Chris Cannam |
* Handle clone failure more gracefully
|
| Tue, 11 Jan 2011 20:19:19 +0000 |
Chris Cannam |
Merge
|
| Tue, 11 Jan 2011 17:58:14 +0000 |
Chris Cannam |
* Make it possible for changeset items to take two or three lines of description, depending on how much there is
|
| Tue, 11 Jan 2011 17:56:22 +0000 |
Chris Cannam |
* If the hgignore file doesn't exist when the user asks to edit it, create it with a "syntax: glob" line
|
| Tue, 11 Jan 2011 13:56:48 +0000 |
Chris Cannam |
Startup fixes:
|
| Tue, 11 Jan 2011 13:52:54 +0000 |
Chris Cannam |
* Restore previous revision of these files -- with working numerus forms (before I broke 'em)
|
| Tue, 11 Jan 2011 20:18:37 +0000 |
Chris Cannam |
* Be a bit less eager to suspend the fs watcher (e.g. don't suspend on potentially lengthy operations like diff)
|
| Mon, 10 Jan 2011 15:39:27 +0000 |
Chris Cannam |
* Restore release build
|
| Mon, 10 Jan 2011 15:38:28 +0000 |
Chris Cannam |
* Update copyright dates
|
| Mon, 10 Jan 2011 15:34:23 +0000 |
Chris Cannam |
Added tag easyhg_v0.2 for changeset 3f4ba5e4b4be
|
| Mon, 10 Jan 2011 15:34:15 +0000 |
Chris Cannam |
* Bump version
easyhg_v0.2
|
| Mon, 10 Jan 2011 15:34:05 +0000 |
Chris Cannam |
* Small simplification to watcher management
|
| Mon, 10 Jan 2011 15:23:53 +0000 |
Chris Cannam |
* Small tidy
|
| Mon, 10 Jan 2011 15:18:21 +0000 |
Chris Cannam |
* Overhaul settings-defaults mechanism, and add Restore Defaults button to settings dialog
|
| Mon, 10 Jan 2011 13:30:19 +0000 |
Chris Cannam |
* Attempt a different way of handling filesystem updates, that's more forgiving of fs changes caused by hg itself
|
| Mon, 10 Jan 2011 12:44:03 +0000 |
Chris Cannam |
* Try to do the right thing when completely reverting a merge (forget that the merge took place)
|
| Sun, 09 Jan 2011 10:08:42 +0000 |
Chris Cannam |
* minor os/x fixes
|
| Fri, 07 Jan 2011 21:58:38 +0000 |
Chris Cannam |
* Better handling for case where we've just created a new branch but not yet committed it (i.e. no heads are on our current branch)
|
| Thu, 06 Jan 2011 16:06:53 +0000 |
Chris Cannam |
Added tag easyhg_v0.1 for changeset 3d276e65a7c3
|
| Thu, 06 Jan 2011 15:54:40 +0000 |
Chris Cannam |
* Fix OS/X icon name
easyhg_v0.1
|
| Thu, 06 Jan 2011 15:33:52 +0000 |
Chris Cannam |
* Update Mac deployment stuff
|
| Thu, 06 Jan 2011 15:15:43 +0000 |
Chris Cannam |
Merge
|
| Thu, 06 Jan 2011 15:15:02 +0000 |
Chris Cannam |
* Add settings for text verboseness and toolbar labels
|
| Thu, 06 Jan 2011 13:16:34 +0000 |
Chris Cannam |
* Add version number to About box
|
| Thu, 06 Jan 2011 12:22:56 +0000 |
Chris Cannam |
* Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
|
| Thu, 06 Jan 2011 12:07:06 +0000 |
Chris Cannam |
Merge
|
| Thu, 06 Jan 2011 12:05:34 +0000 |
Chris Cannam |
* update version number
|
| Thu, 06 Jan 2011 11:52:23 +0000 |
Chris Cannam |
* Properly handle the case where the working copy is empty but the repo is not (e.g. just after convert)
|
| Thu, 06 Jan 2011 14:17:35 +0000 |
Chris Cannam |
* Add bundle plist file
|
| Thu, 06 Jan 2011 11:48:56 +0000 |
Chris Cannam |
* Sensible (i.e. smaller) font size for About box on OS/X
|
| Thu, 06 Jan 2011 11:09:47 +0000 |
Chris Cannam |
* Update hgignore for common Windows files (sorry, missed in prior commit)
|
| Thu, 06 Jan 2011 11:09:20 +0000 |
Chris Cannam |
* Fix failure to record editor path when OK pressed in settings dialog
|
| Wed, 05 Jan 2011 20:59:48 +0000 |
Chris Cannam |
* Add EasyMercurial to hgignore
|
| Wed, 05 Jan 2011 16:26:43 +0000 |
Chris Cannam |
* Update hgignore file for OS/X build stuff
|
| Wed, 05 Jan 2011 16:20:47 +0000 |
Chris Cannam |
Merge
|
| Wed, 05 Jan 2011 16:09:23 +0000 |
Chris Cannam |
Merge
|
| Wed, 05 Jan 2011 15:58:58 +0000 |
Chris Cannam |
Merge
|
| Wed, 05 Jan 2011 15:58:34 +0000 |
Chris Cannam |
* OS/X: Add icon (not sure this is working though)
|
| Wed, 05 Jan 2011 16:20:20 +0000 |
Chris Cannam |
* Further findInPath fix for absolute paths
|
| Wed, 05 Jan 2011 16:08:37 +0000 |
Chris Cannam |
* Make findInPath return empty string if not found -- previous hopelessly fragile behaviour failed in situations where it was called with an absolute path
|
| Wed, 05 Jan 2011 15:55:36 +0000 |
Chris Cannam |
* OS/X: platform-specific binaries
|
| Wed, 05 Jan 2011 15:05:45 +0000 |
Chris Cannam |
* Report error if hg incoming does authentically fail (e.g. because remote repo is unavailable or unrelated)
|
| Wed, 05 Jan 2011 14:31:07 +0000 |
Chris Cannam |
* OS/X: Add script to run external diff; add space around tab widget; textual fixes
|
| Tue, 04 Jan 2011 16:34:33 +0000 |
Chris Cannam |
Added tag easyhg_v0.002 for changeset fccfd12faac1
|
| Tue, 04 Jan 2011 16:34:03 +0000 |
Chris Cannam |
Merge
easyhg_v0.002
|
| Tue, 04 Jan 2011 16:33:56 +0000 |
Chris Cannam |
* comment only
|
| Tue, 04 Jan 2011 16:24:27 +0000 |
Chris Cannam |
Merge
|
| Tue, 04 Jan 2011 15:34:12 +0000 |
Chris Cannam |
* Avoid compiler warning (no functional change)
|
| Tue, 04 Jan 2011 15:22:07 +0000 |
Chris Cannam |
* Fix failure to enable Add button when a "Removed" file was selected
|
| Tue, 04 Jan 2011 14:31:30 +0000 |
Chris Cannam |
Merge
|
| Tue, 04 Jan 2011 14:31:22 +0000 |
Chris Cannam |
* Treat command failure on hg heads as a success, so that following actions happen properly (hg heads fails on empty repo)
|
| Tue, 04 Jan 2011 14:05:17 +0000 |
Chris Cannam |
* Ensure explorer.exe invocation gets backslashes as directory separators, not forward slashes
|
| Tue, 04 Jan 2011 12:42:28 +0000 |
Chris Cannam |
* Separate out the hg test action into two tests, one for plain hg and one with the extension (so can report separately)
|
| Mon, 03 Jan 2011 22:02:08 +0000 |
Chris Cannam |
* Add "Show All Files" toggle to show ignored and clean files
|
