Commits

Author Commit Message Labels Comments Date
David Keegan
status_conflict was using the wrong icon
David Keegan
updating some icons
David Keegan
updating "no file" image
David Keegan
Revising all the icons. The source files are now photoshop files instead of DrawIt.
David Keegan
Removing dependency on json, this should fix issue #169.
Jens Alfke
Added tag 0.8.2 for changeset 2dda2f0f216e
Jens Alfke
Fixed: Conflict/merge support didn't recognize conflicts between *uncommitted* local changes and newly pulled revisions. Also, the merge-related contextual menu commands didn't work right when right-clicking an unselected row.
Tags
0.8.2
Jens Alfke
Two tweaks to HgOperation: * Set HGPLAIN environment var to disable any custom formatting like ANSI colors which might confuse Murky. * Prepend the "-y" (aka --noninteractive) flag so hg knows it can't prompt for user input.
David Keegan
*adding status icons for new merge states *refining status icons for test and delete
Jens Alfke
Update parents of uncommitted revision more carefully to avoid assertion failures. (Speculatively fixes #147.)
Jens Alfke
Now using a subrepo for MYUtilities; it lives in the 'ext' subdirectory.
Jens Alfke
Added tag 0.8.1 for changeset 15ac96888840
Jens Alfke
Bumped version to 0.8.1
Tags
0.8.1
Jens Alfke
Add Enter as a key equivalent to the Commit button in the sheet. Also fixed a bug in error handling in Localize.py.
Jens Alfke
When a revision is selected, switch info pane to show revision log. And when a file is selected, switch to showing the diff (if the revision log was showing.)
Jens Alfke
* Display number of conflicts in the file-status bar at the bottom left. * Renamed "Compare Conflicts" to "Merge Conflict Again". * Added the above command to the file context menu.
Jens Alfke
Took out the "{repo}" item in the xmlminimal style template. I wasn't using it for anything, and for some reason it made the 'hg log' command take about 50 times longer on large repositories! (fixes #122)
Jens Alfke
Improved GUI file comparison: * Code is abstracted into a new CompareTool class. * Multiple tools (not just opendiff / FileMerge) can be configured by editing CompareTools.plist. This is part of #26, but the app code is still hardwired to use opendiff, though (see -[RepoController showComparisonFromRevision:...].) * When comparing an uncommitted change, the Save command in FileMerge is activated, and will save the changes back…
Jens Alfke
Added tag 0.8 for changeset 6aefe80b3dd9
Jens Alfke
* Added support for merging (fixes #7). * Window title-bar icon indicates whether working tree is modified or a merge. * Fixed: graph column wasn't updating in some cases where the list of revisions didn't change (fixes #77). * Fixed: file status icons sometimes didn't update. * Fixed: status sometimes wouldn't refresh after changes were noticed in the '.hg' directory. * Fixed: directory-change watcher would miss changes that happened w…
Tags
0.8
Jens Alfke
Ignore unparseable URLs in hgrc instead of throwing an exception. Fixes #141.
David Keegan
keys in Localize.json are now sorted #139
Jens Alfke
Merged.
Jens Alfke
* Ignore nil path from MYDirectoryEvent (still not sure what causes this, but at least this will prevent an exception from being thrown.) * Bumped Info.plist version number to 1.7.2.
Jens Alfke
Added tag 0.7.2 for changeset d3c6eb46caa9
Jens Alfke
* Fix incompatibility with hg 1.5. * Add some error handling to HgRepository. * Force 4-char indentation on all source files. * Stop building the BWToolkit IB plugin, which we don't need.
Tags
0.7.2
Jens Alfke
FileViewer: Added menu commands. Made slider continuous when viewing plain source. Disabled opening on a directory.
Jens Alfke
Merged with trunk.
Jens Alfke
More FileViewer work: Enable blame links, suppress duplicate windows.
Jens Alfke
Merged with trunk
  1. Prev
  2. Next