| 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
|
| Mon, 03 Jan 2011 14:31:22 +0000 |
Chris Cannam |
* Cut down number of command invocations by gleaning default remote path and current branch from hg files directly
|
| Mon, 03 Jan 2011 12:35:13 +0000 |
Chris Cannam |
* Add (rather crappy) program icon. Still lacks platform icon support on OS/X and Linux/X11
|
| Fri, 24 Dec 2010 13:16:12 +0000 |
Chris Cannam |
* Avoid showing hard hyphen on Windows (I had thought this was in previous commit)
|
| Fri, 24 Dec 2010 13:14:45 +0000 |
Chris Cannam |
* Don't close proc input on finished() -- causes crash on program failure on Windows
|
| Mon, 20 Dec 2010 22:39:45 +0000 |
Chris Cannam |
* Fixes to dialog return code handling
|
| Mon, 20 Dec 2010 22:37:42 +0000 |
Chris Cannam |
* Give all of the substantial confirmation dialogs meaningful labels for their OK buttons
|
| Mon, 20 Dec 2010 21:33:42 +0000 |
Chris Cannam |
* Make OK buttons on push/pull dialogs say Push and Pull
|
| Mon, 20 Dec 2010 21:23:13 +0000 |
Chris Cannam |
* Rejig menu
|
| Mon, 20 Dec 2010 17:07:30 +0000 |
Chris Cannam |
* Tiny textual change
|
| Mon, 20 Dec 2010 16:47:00 +0000 |
Chris Cannam |
* Handle failure to start processes at all (e.g. because executable path is wrong)
|
| Mon, 20 Dec 2010 16:15:43 +0000 |
Chris Cannam |
* Set python library path when unbundling extension, generally prefer unbundled copy
|
| Mon, 20 Dec 2010 16:15:19 +0000 |
Chris Cannam |
* Set hand cursor on clickable label
|
| Mon, 20 Dec 2010 14:37:35 +0000 |
Chris Cannam |
* Open local folder in Finder/Explorer/whatever when its path is clicked on
|
| Sun, 19 Dec 2010 19:12:52 +0000 |
Chris Cannam |
* Some rather uncertain modifications to grapher logic for branch homes -- try to place branches close to their "parent branches".
|
| Sun, 19 Dec 2010 19:11:23 +0000 |
Chris Cannam |
* Can edit hgrc even if it doesn't exist yet
|
| Sun, 19 Dec 2010 12:01:37 +0000 |
Chris Cannam |
* Implement "Change Remote Location"
|
| Fri, 17 Dec 2010 10:01:02 +0000 |
Chris Cannam |
* Fix "Serve by HTTP"; stub out "Change Remote Location"
|
| Fri, 17 Dec 2010 09:36:39 +0000 |
Chris Cannam |
* Settings dialog: This Will Do For Now
|
| Fri, 17 Dec 2010 08:53:54 +0000 |
Chris Cannam |
* Similarly, tidier lookup for Hg binary and extension
|
| Fri, 17 Dec 2010 08:48:01 +0000 |
Chris Cannam |
* Tidier lookup for diff, merge, editor binaries
|
| Thu, 16 Dec 2010 22:11:38 +0000 |
Chris Cannam |
* basic external editor selection (for hgignore)
|
| Thu, 16 Dec 2010 20:23:43 +0000 |
Chris Cannam |
* Fixes to external program location logic on Win32
|
| Thu, 16 Dec 2010 18:00:12 +0000 |
Chris Cannam |
* Add option whether to use extension or not, and show path for it in settings
|
| Thu, 16 Dec 2010 17:32:25 +0000 |
Chris Cannam |
* Start implementing Settings dialog; add Test function to run on startup to make sure hg works
|
| Thu, 16 Dec 2010 12:40:04 +0000 |
Chris Cannam |
* Add more helpful reports when a push fails because it would create new heads
|
| Thu, 16 Dec 2010 12:03:09 +0000 |
Chris Cannam |
* Add (examining repository) message for initial state
|
| Wed, 15 Dec 2010 22:07:31 +0000 |
Chris Cannam |
* Fix failure to recognise local uncommitted changes when an untracked file was selected
|
| Tue, 14 Dec 2010 21:16:52 +0000 |
Chris Cannam |
* Remove outdated file
|
| Tue, 14 Dec 2010 21:15:29 +0000 |
Chris Cannam |
* Update .hgignore file
|
| Tue, 14 Dec 2010 20:36:30 +0000 |
Chris Cannam |
* Status text updates
|
| Tue, 14 Dec 2010 17:20:10 +0000 |
Chris Cannam |
* Add "Show summary" feature
|
| Wed, 08 Dec 2010 16:57:18 +0000 |
Chris Cannam |
* Overwrite log file for each run (saving space at expense of long record)
|
| Sun, 05 Dec 2010 19:24:42 +0000 |
Chris Cannam |
* Minor Win32 fixes
|
| Fri, 03 Dec 2010 22:42:24 +0000 |
Chris Cannam |
* Experiment with removing revision numbers from display (hashes only)
|
| Fri, 03 Dec 2010 20:37:40 +0000 |
Chris Cannam |
* (Re)implement tagging
|
| Fri, 03 Dec 2010 19:35:04 +0000 |
Chris Cannam |
* First cut of work on merge/resolve logic
|
| Fri, 03 Dec 2010 14:43:32 +0000 |
Chris Cannam |
* Better handling of empty repositories; some tidying & textual fixes
|
| Fri, 03 Dec 2010 13:36:53 +0000 |
Chris Cannam |
* Start using trivial new easyhg extension (requires PyQt)
|
| Fri, 03 Dec 2010 12:32:59 +0000 |
Chris Cannam |
* That string scraping was much too fiddly -- best keep it simpler for now
|
| Fri, 03 Dec 2010 12:29:57 +0000 |
Chris Cannam |
* Add InConflict state (not yet used)
|
| Fri, 03 Dec 2010 12:29:24 +0000 |
Chris Cannam |
* Some work on portable password prompting
|
| Thu, 02 Dec 2010 21:52:24 +0000 |
Chris Cannam |
* Default merge comments
|
| Thu, 02 Dec 2010 21:32:04 +0000 |
Chris Cannam |
* Another simplification to refresh logic, and some textual fixes
|
| Thu, 02 Dec 2010 21:13:53 +0000 |
Chris Cannam |
* Add translation support -- useful for proper plural handling even in English
|
| Thu, 02 Dec 2010 18:04:21 +0000 |
Chris Cannam |
* Try to reduce unnecessary history updates; add --new-branch option on push
|
| Thu, 02 Dec 2010 17:55:21 +0000 |
Chris Cannam |
* Show both parents of uncommitted merge; fixes to right-button menus
|
