log

age author description
2011-03-11 Chris Cannam Merge from branch "filelist_right_button_menu"
2011-03-11 Chris Cannam Merge fixes: primarily, handle failed merges better filelist_right_button_menu
2011-03-11 Chris Cannam Make Add/Remove active only when Work tab is selected (again!) -- because they are the only selection-modal toolbar buttons now filelist_right_button_menu
2011-03-11 Chris Cannam Implement right-button menu functions for file lists; convert the toolbar-button functions (apart from Add and Remove) to modal only on working copy state rather than selection state filelist_right_button_menu
2011-03-10 Chris Cannam Add right-button menus (not yet functional, but hopefully with the right things in them) filelist_right_button_menu
2011-03-10 Chris Cannam Introduce "activities" enum and functions filelist_right_button_menu
2011-03-10 Chris Cannam * Trivial change, just checkpointing filelist_right_button_menu
2011-03-02 Chris Cannam Remove message about updating to bring changes into the working copy: it isn't always true (e.g. if you have to do a merge next)
2011-03-02 Chris Cannam * We should have a 64-bit Python module now: no longer force to 32
2011-03-02 Chris Cannam Added tag easyhg_v0.4 for changeset 124a3ea9fafb
2011-03-02 Chris Cannam Add comment listing which menu functions are desired where filelist_right_button_menu
2011-03-02 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
2011-03-02 Chris Cannam Fix screwed-up translations caused by accidentally running Qt3 versions of translation tools
2011-03-02 Chris Cannam * Fix up framework paths regardless of their initial values
2011-03-01 Chris Cannam More Mac build material
2011-03-01 Chris Cannam Added tag easyhg_v0.4 for changeset 4b9656471303
2011-03-01 Chris Cannam Update version number to 0.4; another minor textual fix
2011-03-01 Chris Cannam Merge from branch "new-branches-with-status-outside-tabs"
2011-03-01 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
2011-02-28 Chris Cannam Minor textual fix
2011-02-28 Chris Cannam Make a further couple of dialogs use MoreInformationDialog
2011-02-28 Chris Cannam With status outside tabs, no need to switch to Work tab when new branch is introduced new-branches-with-status-outside-tabs
2011-02-28 Chris Cannam Merge branch status_outside_tabs into branch new-branches, and make a new branch new-branches-with-status-outside-tabs
2011-02-26 Chris Cannam Merge from the default branch status_outside_tabs
2011-02-26 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
2011-02-22 Chris Cannam Merge from the default branch status_outside_tabs
2011-02-22 Chris Cannam And another tweak to pull-successful dialog.
2011-02-22 Chris Cannam Another tweak to merge-successful dialog texts
2011-02-22 Chris Cannam Merge from the default branch status_outside_tabs
2011-02-22 Chris Cannam Minor layout & text changes
2011-02-22 Chris Cannam Font adjustment for pull/push confirm dialogs. Better, though the extra text will still be too small on OS/X
2011-02-22 Chris Cannam * Make "More Details" button non-auto-default in more-info dialog
2011-02-22 Chris Cannam Minor layout updates status_outside_tabs
2011-02-22 Chris Cannam Merge from the default branch status_outside_tabs
2011-02-21 Chris Cannam Small fix to clone successful dialog wording
2011-02-21 Chris Cannam Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
2011-02-21 Chris Cannam Merge from branch "more_information_dialog"
2011-02-21 Chris Cannam Return success if the external diff/merge _is_ found, not if it isn't!
2011-02-21 Chris Cannam Make several operations use the new more-information dialog more_information_dialog
2011-02-21 Chris Cannam Make our own message box with a more useful "more information" section than the Qt one more_information_dialog
2011-02-21 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
2011-02-21 Chris Cannam Add "Summarise changes" options to changeset item right-button menu (already existed for uncommitted item)
2011-02-21 Chris Cannam Move work-folder state area outside tabs widget status_outside_tabs
2011-02-21 Chris Cannam Merge from branch "mainwindow_member_tidy" status_outside_tabs
2011-02-21 Chris Cannam Merge from branch "mainwindow_member_tidy"
2011-02-21 Chris Cannam Make MainWindow members private and m_prefixed mainwindow_member_tidy
2011-02-21 Chris Cannam Separate out work-status code from the file status widget status_outside_tabs
2011-02-18 Chris Cannam Merge
2011-02-18 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"
2011-02-17 Chris Cannam * Avoid reporting failure when hg incoming shows a warning (as is the case when site cert could not be verified)
2011-02-10 Chris Cannam Merge
2011-02-09 Chris Cannam Add "Start new branch" function. I'm not quite satisfied with the location of this one new-branches
2011-02-09 Chris Cannam Remove no-longer-used icon files
2011-02-01 Chris Cannam Added tag easyhg_v0.3.2 for changeset cc95394e2392
2011-01-31 Chris Cannam * Some work on separating out the "more information" component from dialog messages. Will need work on layouts more_information_dialog
2011-02-10 Chris Cannam * Use kdiff3 from path if present; return sensible return code
2011-01-25 Chris Cannam * Add warning dialog for "restore default settings"; add option for dates or ages in history list easyhg_v0.3.2
2011-01-25 Chris Cannam * Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)
2011-01-20 Chris Cannam * Bump version to 0.3.2
2011-01-20 Chris Cannam * Update deployment so as to adjust kdiff3 if bundled as well
2011-01-20 Chris Cannam * Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists.
2011-01-17 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.
2011-01-12 Chris Cannam * Correct version number
2011-01-12 Chris Cannam Merge
2011-01-12 Chris Cannam * Add InstallJammer definition file, update hgignore so as not to ignore it!
2011-01-12 Chris Cannam * Fix typo. Uh
2011-01-12 Chris Cannam Added tag easyhg_v0.3.1 for changeset a7843b03b4cf
2011-01-12 Chris Cannam Merge easyhg_v0.3.1
2011-01-12 Chris Cannam * Doh
2011-01-12 Chris Cannam * Version -> 0.3.1 (and update OS/X deploy to handle three-part versions)
2011-01-12 Chris Cannam Merge
2011-01-12 Chris Cannam * Attempt to pop input dialog to front instead of permitting it to open behind EasyMercurial window
2011-01-12 Chris Cannam * Explicitly request 32-bit Python on OS/X 10.6
2011-01-12 Chris Cannam * OS/X deployment fixes
2011-01-12 Chris Cannam Added tag easyhg_v0.3 for changeset c02515e33b5d
2011-01-12 Chris Cannam * Update version number easyhg_v0.3
2011-01-12 Chris Cannam Merge
2011-01-12 Chris Cannam * Handle clone failure more gracefully
2011-01-11 Chris Cannam Merge
2011-01-11 Chris Cannam * Make it possible for changeset items to take two or three lines of description, depending on how much there is
2011-01-11 Chris Cannam * If the hgignore file doesn't exist when the user asks to edit it, create it with a "syntax: glob" line
2011-01-11 Chris Cannam Startup fixes:
2011-01-11 Chris Cannam * Restore previous revision of these files -- with working numerus forms (before I broke 'em)
2011-01-11 Chris Cannam * Be a bit less eager to suspend the fs watcher (e.g. don't suspend on potentially lengthy operations like diff)
2011-01-10 Chris Cannam * Restore release build
2011-01-10 Chris Cannam * Update copyright dates
2011-01-10 Chris Cannam Added tag easyhg_v0.2 for changeset 3f4ba5e4b4be
2011-01-10 Chris Cannam * Bump version easyhg_v0.2
2011-01-10 Chris Cannam * Small simplification to watcher management
2011-01-10 Chris Cannam * Small tidy
2011-01-10 Chris Cannam * Overhaul settings-defaults mechanism, and add Restore Defaults button to settings dialog
2011-01-10 Chris Cannam * Attempt a different way of handling filesystem updates, that's more forgiving of fs changes caused by hg itself
2011-01-10 Chris Cannam * Try to do the right thing when completely reverting a merge (forget that the merge took place)
2011-01-09 Chris Cannam * minor os/x fixes
2011-01-07 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)
2011-01-06 Chris Cannam Added tag easyhg_v0.1 for changeset 3d276e65a7c3
2011-01-06 Chris Cannam * Fix OS/X icon name easyhg_v0.1
2011-01-06 Chris Cannam * Update Mac deployment stuff
2011-01-06 Chris Cannam Merge
2011-01-06 Chris Cannam * Add settings for text verboseness and toolbar labels
2011-01-06 Chris Cannam * Add version number to About box
2011-01-06 Chris Cannam * Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
2011-01-06 Chris Cannam Merge
2011-01-06 Chris Cannam * update version number
2011-01-06 Chris Cannam * Properly handle the case where the working copy is empty but the repo is not (e.g. just after convert)
2011-01-06 Chris Cannam * Add bundle plist file
2011-01-06 Chris Cannam * Sensible (i.e. smaller) font size for About box on OS/X
2011-01-06 Chris Cannam * Update hgignore for common Windows files (sorry, missed in prior commit)
2011-01-06 Chris Cannam * Fix failure to record editor path when OK pressed in settings dialog
2011-01-05 Chris Cannam * Add EasyMercurial to hgignore
2011-01-05 Chris Cannam * Update hgignore file for OS/X build stuff
2011-01-05 Chris Cannam Merge
2011-01-05 Chris Cannam Merge
2011-01-05 Chris Cannam Merge
2011-01-05 Chris Cannam * OS/X: Add icon (not sure this is working though)
2011-01-05 Chris Cannam * Further findInPath fix for absolute paths
2011-01-05 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
2011-01-05 Chris Cannam * OS/X: platform-specific binaries
2011-01-05 Chris Cannam * Report error if hg incoming does authentically fail (e.g. because remote repo is unavailable or unrelated)
2011-01-05 Chris Cannam * OS/X: Add script to run external diff; add space around tab widget; textual fixes
2011-01-04 Chris Cannam Added tag easyhg_v0.002 for changeset fccfd12faac1
2011-01-04 Chris Cannam Merge easyhg_v0.002
2011-01-04 Chris Cannam * comment only
2011-01-04 Chris Cannam Merge
2011-01-04 Chris Cannam * Avoid compiler warning (no functional change)
2011-01-04 Chris Cannam * Fix failure to enable Add button when a "Removed" file was selected
2011-01-04 Chris Cannam Merge
2011-01-04 Chris Cannam * Treat command failure on hg heads as a success, so that following actions happen properly (hg heads fails on empty repo)
2011-01-04 Chris Cannam * Ensure explorer.exe invocation gets backslashes as directory separators, not forward slashes
2011-01-04 Chris Cannam * Separate out the hg test action into two tests, one for plain hg and one with the extension (so can report separately)
2011-01-03 Chris Cannam * Add "Show All Files" toggle to show ignored and clean files
2011-01-03 Chris Cannam * Cut down number of command invocations by gleaning default remote path and current branch from hg files directly
2011-01-03 Chris Cannam * Add (rather crappy) program icon. Still lacks platform icon support on OS/X and Linux/X11
2010-12-24 Chris Cannam * Avoid showing hard hyphen on Windows (I had thought this was in previous commit)
2010-12-24 Chris Cannam * Don't close proc input on finished() -- causes crash on program failure on Windows
2010-12-20 Chris Cannam * Fixes to dialog return code handling
2010-12-20 Chris Cannam * Give all of the substantial confirmation dialogs meaningful labels for their OK buttons
2010-12-20 Chris Cannam * Make OK buttons on push/pull dialogs say Push and Pull
2010-12-20 Chris Cannam * Rejig menu
2010-12-20 Chris Cannam * Tiny textual change
2010-12-20 Chris Cannam * Handle failure to start processes at all (e.g. because executable path is wrong)
2010-12-20 Chris Cannam * Set python library path when unbundling extension, generally prefer unbundled copy
2010-12-20 Chris Cannam * Set hand cursor on clickable label
2010-12-20 Chris Cannam * Open local folder in Finder/Explorer/whatever when its path is clicked on
2010-12-19 Chris Cannam * Some rather uncertain modifications to grapher logic for branch homes -- try to place branches close to their "parent branches".
2010-12-19 Chris Cannam * Can edit hgrc even if it doesn't exist yet
2010-12-19 Chris Cannam * Implement "Change Remote Location"
2010-12-17 Chris Cannam * Fix "Serve by HTTP"; stub out "Change Remote Location"
2010-12-17 Chris Cannam * Settings dialog: This Will Do For Now
2010-12-17 Chris Cannam * Similarly, tidier lookup for Hg binary and extension
2010-12-17 Chris Cannam * Tidier lookup for diff, merge, editor binaries
2010-12-16 Chris Cannam * basic external editor selection (for hgignore)
2010-12-16 Chris Cannam * Fixes to external program location logic on Win32
2010-12-16 Chris Cannam * Add option whether to use extension or not, and show path for it in settings
2010-12-16 Chris Cannam * Start implementing Settings dialog; add Test function to run on startup to make sure hg works
2010-12-16 Chris Cannam * Add more helpful reports when a push fails because it would create new heads
2010-12-16 Chris Cannam * Add (examining repository) message for initial state
2010-12-15 Chris Cannam * Fix failure to recognise local uncommitted changes when an untracked file was selected
2010-12-14 Chris Cannam * Remove outdated file
2010-12-14 Chris Cannam * Update .hgignore file
2010-12-14 Chris Cannam * Status text updates
2010-12-14 Chris Cannam * Add "Show summary" feature
2010-12-08 Chris Cannam * Overwrite log file for each run (saving space at expense of long record)
2010-12-05 Chris Cannam * Minor Win32 fixes
2010-12-03 Chris Cannam * Experiment with removing revision numbers from display (hashes only)
2010-12-03 Chris Cannam * (Re)implement tagging
2010-12-03 Chris Cannam * First cut of work on merge/resolve logic
2010-12-03 Chris Cannam * Better handling of empty repositories; some tidying & textual fixes
2010-12-03 Chris Cannam * Start using trivial new easyhg extension (requires PyQt)
2010-12-03 Chris Cannam * That string scraping was much too fiddly -- best keep it simpler for now
2010-12-03 Chris Cannam * Add InConflict state (not yet used)
2010-12-03 Chris Cannam * Some work on portable password prompting
2010-12-02 Chris Cannam * Default merge comments
2010-12-02 Chris Cannam * Another simplification to refresh logic, and some textual fixes
2010-12-02 Chris Cannam * Add translation support -- useful for proper plural handling even in English
2010-12-02 Chris Cannam * Try to reduce unnecessary history updates; add --new-branch option on push
2010-12-02 Chris Cannam * Show both parents of uncommitted merge; fixes to right-button menus
2010-12-02 Chris Cannam * Set parents (setCurrent) on history widget when we know the new parents, not at each enable-disable actions call
2010-12-02 Chris Cannam * Fix incremental log again (prune option requires number or hash, not compound id)
2010-12-02 Chris Cannam * Attempt to make the sequence of hg commands after a change more rational; avoid incremental log if heads unchanged
2010-12-01 Chris Cannam * minor menu fix
2010-12-01 Chris Cannam * Some implementation of right-button menu actions on changeset item
2010-12-01 Chris Cannam * Don't show tip tag; return to using incremental log on commit
2010-12-01 Chris Cannam * Merge
2010-12-01 Chris Cannam * Include the uncommitted item in general graph layout (in case it is not at the head, when other items will need to avoid it)
2010-12-01 Chris Cannam * win32 build fix
2010-12-01 Chris Cannam * Fix another use of stderr as identifier
2010-12-01 Chris Cannam * Don't try to use stdout and stderr as identifiers! In any case, one of them is stderr
2010-11-30 Chris Cannam * Start hooking up right-button menus on changeset & uncommitted items
2010-11-30 Chris Cannam * First cut at (not yet operational) right-button menu
2010-11-30 Chris Cannam * Avoid unnecessary duplicate layout; fix off-by-one in resetting changeset children
2010-11-30 Chris Cannam * Minor adjustment to scene lifecycle, delete old scene before creating new one to use less memory &c
2010-11-30 Chris Cannam * Include closed branches in heads check (see comment)
2010-11-30 Chris Cannam * Avoid null pointer dereference
2010-11-30 Chris Cannam * Ensure only one list can contain a selection at once in file status widget
2010-11-30 Chris Cannam * Have a go at switching to new items in history widget when something happens in repo
2010-11-30 Chris Cannam * Better attempt at retaining current visible area when history scene changes; first cut at highlighting new items
2010-11-30 Chris Cannam * Ensure panned rect stays current when size changes; update panner cache when scene changes
2010-11-30 Chris Cannam * Add connecting line to uncommitted item; turn Revert icon blue; cut down menus to things that actually work (well, mostly)
2010-11-29 Chris Cannam * Do full log after commit (so as to get the right tip tag)
2010-11-29 Chris Cannam * Initial work on showing uncommitted changes (as dashed box) in history graph
2010-11-29 Chris Cannam * Show tags and current working copy parents in history graph
2010-11-29 Chris Cannam * Don't provide file list when committing, if the user didn't select files. Previously we (perhaps inadvertantly) used a list of all files because we had generated that for display -- but it breaks merge-commits and it's probably unwise to mess with very long command lines.
2010-11-29 Chris Cannam * Add confirm dialogs for pull and push
2010-11-29 Chris Cannam * Add Incoming dialog and better layouts for dialogs generally
2010-11-29 Chris Cannam * Fixes to changeset details display; show on right instead of below to avoid disrupting flow
2010-11-29 Chris Cannam * Another fix to incremental log -- ensure children are not duplicated in changeset
2010-11-29 Chris Cannam * Further fix to incremental log (put new changesets on the correct end of the list!)
2010-11-29 Chris Cannam * Fix incremental log (was referring to "new" parents and so not actually returning anything)
2010-11-29 Chris Cannam * Add incremental log (though not incremental relayout)
2010-11-28 Chris Cannam * Make scene remember which item has its details showing, and remove the previous one when a new one is clicked
2010-11-26 Chris Cannam * Rudimentary version of the popup showing more information when you click on a changeset in history graph
2010-11-26 Chris Cannam * Start to sketch thing that shows the details of a changeset in the history view
2010-11-26 Chris Cannam * Pull history tab out into its own widget
2010-11-26 Chris Cannam * Add useful state message to file status page.
2010-11-26 Chris Cannam * minor output fixes
2010-11-26 Chris Cannam * Better error handling/reporting; some futile changes to termios handling; avoid weirdly stretching panned view in panner
2010-11-26 Chris Cannam * Make diff binary a settings property; some tidying
2010-11-26 Chris Cannam * Fixes to terminal lifecycle (only the first of a series of interactive commands was working before). Also switch from openpty to POSIX/Unix98 openpt
2010-11-26 Chris Cannam * Separate out the hgrunner output into stdout and stderr again (merging them was a failed experiment)
2010-11-26 Chris Cannam * Add a queueing mechanism for Hg actions, instead of refusing to start an action if something else is already happening. This is essential now that actions can be prompted by asynchronous events (e.g. filesystem watcher).
2010-11-25 Chris Cannam * Enable/disable update and merge actions depending on whether default update and merge will actually do anything
2010-11-25 Chris Cannam * Make interactivity optional in hgrunner (makes running non-interactive, local commands a bit quicker)
2010-11-25 Chris Cannam * Retrieve and store current branch and heads; some refactoring
2010-11-25 Chris Cannam * Better-behaved comment dialog; avoid empty comments. Also ignore signals from closing ptys
2010-11-25 Chris Cannam * Slightly more useful commit dialog
2010-11-24 Chris Cannam * Start to use the confirm-comment dialog for commits; much work still needed
2010-11-24 Chris Cannam * Add ConfirmCommentDialog
2010-11-24 Chris Cannam * Layout fix
2010-11-24 Chris Cannam * Helpful texts
2010-11-24 Chris Cannam * Minor text and layout changes; ensure path widgets are updated when repo changes
2010-11-24 Chris Cannam * Wire up the basic Hg actions again
2010-11-24 Chris Cannam * Update About box
2010-11-24 Chris Cannam * Rename HgExpWidget to HgTabWidget
2010-11-24 Chris Cannam * Update actions appropriately when selections are changed
2010-11-24 Chris Cannam * Clear selections when Esc pressed; some refactoring
2010-11-24 Chris Cannam * Highlight untracked files that are newer than last repo interaction
2010-11-24 Chris Cannam * Rename StatParser to FileStates; start thinking about selections
2010-11-23 Chris Cannam * Remove some old code in preparation for rebuilding it with the newer structure
2010-11-23 Chris Cannam * Add filesystem watcher; initial work on enable/disable logic for actions in new scheme