Commits

Author Commit Message Labels Comments Date
Nathan Durnan
Added tags "Version 0.2.3" and "Beta" for changeset cf8afdc92ec3
Nathan Durnan
Merge with Release 0.2.3
Tags
Version 0.2.3
Nathan Durnan
Release 0.2.3 (beta) is ready to distribute.
Branches
Release 0.2
Nathan Durnan
Merge with development - Release 0.2.3 - including fixes for command line Mercurial.
Branches
Release 0.2
Nathan Durnan
Merge with BBI#32 - Command Line HG
Branches
development
Nathan Durnan
Close Issue #32 - Extension working with Command Line Mercurial. No feedback from user that originally reported the issue in almost two weeks, so I am considering the issue sufficiently addressed and the fixes ready for release.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Fix consistency of status/note/debug/warn level output statements. * Only output abort statements at matching levels. * Don't try to display timestamp status of unresolved merge. * Change hg status to only display timestamps on --verbose, not all the time (too noisy)
Branches
BBI#32 - Command Line HG
Nathan Durnan
Cleaned up post-merge/post-resolve abort messages for consistency. See Issue #32 at Bitbucket.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Update README to include changes for aborting merge and resolve hooks on unresolved files.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Don't attempt to run Post-Merge or Post-Resolve hooks if there are still unresolved files. Related to Issue #32 at BitBucket. Command Line merge tools can leave non-JSON lines in the middle of the timestamp file. This means the timestamp file can not be read reliably unless the merge is completed. Once all files have been resolved, the Post-Merge and Post-Resolve hooks should run OK.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Python library reference may come from Python install, OR TortoiseHg.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Make sure incoming PythonLibPath variable is a STRING. This was causing an error loading the TortoiseHg workbench when no paths.PythonLibPath was defined. TypeError: coercing to Unicode: need string or buffer, NoneType found
Branches
BBI#32 - Command Line HG
Nathan Durnan
Consolodate release notes (fold 0.2.1 into 0.2.2)
Branches
BBI#32 - Command Line HG
Nathan Durnan
Add note explaining the placement of where the config is accessed.
Branches
BBI#32 - Command Line HG
Nathan Durnan
reposetup: add check for external Python library path from configuration. See Issue #32 at BitBucket
Branches
BBI#32 - Command Line HG
Nathan Durnan
Update README file to reflect intended changes.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Update version references.
Branches
BBI#32 - Command Line HG
Nathan Durnan
Opening BitBucket Issue #32 - Extension v0.2.2 fails with command line Mercurial installation Can not restore timestamps from v0.2.x JSON timestamp file. Timestamps from v0.1.5 CSV file format still work correctly. Fails to import JSON library. Error: *** Exception: (<type 'exceptions.ImportError'>, ImportError('No module named json',), <traceback object at 0x00c62d28>) ***
Branches
BBI#32 - Command Line HG
Nathan Durnan
Backed out changeset: d8c3e4dc134e - Explicit escape characters did not help BitBucket display.
Nathan Durnan
Attempt using more strict character escapes for Markdown README display on BitBucket. BitBucket seems to have changed their Markdown parsing, and the README is not displaying correctly on the Overview page.
Nathan Durnan
Added tags "Version 0.2.2" and "Beta" for changeset bb3cc0157512
Nathan Durnan
Merge with Release 0.2 (pick up forward-compatibility modifications)
Tags
Version 0.2.2
Nathan Durnan
Release 0.2 Beta ready.
Branches
Release 0.2
Nathan Durnan
Merge with development (pick up BBI#31 - Forward-compatibility modification for timestamp file)
Branches
Release 0.2
Nathan Durnan
Merge with BBI#31 - Forward-Compatibility modification for timestamp file.
Branches
development
Nathan Durnan
Closing Issue #31 at BitBucket.
Branches
BBI#31 - Forward-Compatibility
Nathan Durnan
Update Readme file.
Branches
BBI#31 - Forward-Compatibility
Nathan Durnan
Save timestamp as an item within a dict instead of explicit number(float). See issue #31 at BitBucket. This should allow future expansion of the timestamp file without breaking compatibility with this version.
Branches
BBI#31 - Forward-Compatibility
Nathan Durnan
Update version number and comments.
Branches
BBI#31 - Forward-Compatibility
Nathan Durnan
Create new branch for BitBucket Issue #31 - working on forward-compatibility of timestamp file. I realized that I was a bit short-sighted when I made the transition from CSV to JSON for the timestamp file and did not build in enough forward-compatibility into the data architecture. Need to change the data from being just "path\filename": 0000000.00, to a more robust "path\filename": {"timestamp": 0000000.00} to allow for future expansion while remaining readable by previous vers…
Branches
BBI#31 - Forward-Compatibility
  1. Prev
  2. Next