Commits

Author Commit Message Labels Comments Date
p2
Added branch name to window title and commit sheet TODO: Incorporate branch name fetching into standard hg log operation
p2
Bugfix
p2
Made BWToolkit a subrepo
p2
Changes to UI files to build successfully with 10.7 SDK. UI still has glitches, but at least it builds and runs.
p2
Dirty source adjustments to make Murky build with SDK 10.7 and in 64 bit
David Keegan
updating credits list
Alessandro Bahgat
Added a descriptive alert to the clone panel. The new alert is displayed when the user fails to specify the source and/or destination URLs.
Alessandro Bahgat
Initialize field values in the Clone Panel for the ( ! srcURL || ! dstURL ) check in runClonePanel to work properly
Alessandro Bahgat
Fixed the behaviour of MercuiralApp so that ClonePanel is correctly closed even after an unexpected event
Alessandro Bahgat
Added a notification when removing files with local modifications. The user is now given the possibility to move local files to the Trash instead or to delete them. This may solve issue #157
David Keegan
Added tag 0.8.3 for changeset 0d7e9c2d87b7
David Keegan
updating to 0.8.3
Tags
0.8.3
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…
  1. Prev
  2. Next