Commits

Author Commit Message Labels Comments Date
Greg Ward
Use opts.get(...) rather than opts[...]. This makes it easier for scripts or other extensions to use attic as a Python API: they can just pass in empty opts rather than add the keys that attic requires to be present.
Greg Ward
Document attic.trymerge by explaining how unshelve works.
Greg Ward
Use opts.get(...) rather than opts[...]. This makes it easier for scripts or other extensions to use attic as a Python API: they can just pass in empty opts rather than add the keys that attic requires to be present.
Bill_Barry
update tests because all really are passing
John Hein
Catch up to updatedir api change in hg 1.7 (retain backwards compatibility for < 1.7).
Greg Ward
Use ui.pushbuffer() to silence revert. It is unnecessarily chatty in the context of attic. The user probably doesn't care about which files are being reverted/removed/forgotten; he just wants to know that his outstanding changes were successfully shelved.
Greg Ward
After revert, remove added files. This means unshelve will be able to re-add the files. Without this change, the user has to remember to remove the new files before unshelving, or unshelve fails with conflicts.
Greg Ward
Instruct revert not to keep backups (.orig files). The reverted changes are saved in the attic, so no need to save them in the working dir too.
Greg Ward
Only pass options to revert that it actually needs. Reusing the options dict created for the 'shelve' command seems risky.
Greg Ward
In cleanup(), always use revert. Currently, you get different behaviour if you specify filenames or patterns on the command-line: revert is verbose and leaves behind .orig files, whereas hg.clean() does neither. This change gives consistent behaviour regardless of command-line args.
Greg Ward
Append a newline to .applied and .current. Makes it much easier to explore the attic with Unix command-line tools.
Greg Ward
Add config setting attic.trymerge (boolean, default true). Controls whether unshelve should try to apply a patch by merging with a temporary changeset, or just apply it directly. (This is a workaround for the fact that committing a temporary changeset does not work when there are pretxncommit hooks that will reject attic's commit. Hopefully this is a temporary measure and we can find a way to do 3-way merge withot a temporary commit.)
Greg Ward
Use Python 2.4 syntax for try/except/finally.
bbarry
fixes for hg 1.3 and dos patches based on debugging
bbarry
workaround for issue1763 in hg bts
bbarry
fixing warning "del lock depreciated, use lock.release instead"
rcohen
Remove the mq dependency
rcohen
Add reverse option to unshelve, like patch -R. Uses merging when possible.
rcohen
Save the parent rev when shelving and use it to unshelve with merge tech instead of patching.
Bill_Barry
fixing tests
Bill_Barry
check if parents[0] is not null as well
bbarry
bug: parent[0] may not exist under certain circumstances
rcohen
Get rid of readheaders() in favor of patch.extract() and always using HG changeset patches.
rcohen
Fix for losing changes when specific files are listed for shelving.
rcohen
Fix for properly including/excluding hunks during interactive shelve.
rcohen
Fix handling of metadata operations add, remove, copy and rename.
bbarry
fixing testcase output
Greg Ward
Remove unused imports.
Greg Ward
Help message: fix spelling, remove extraneous word.
bbarry
using os.chdir to switch to working copy root before doing shelving/unshelving patch from Ross Cohen
  1. Prev
  2. Next