Commits

Show all
Author Commit Message Labels Comments Date
Matt Mackall
Merge with crew
Tags
0.8
Brendan Cully
Safer version of FileMerge merge
Benoit Boissinot
return a non-zero exit code when a merge failed
Thomas Arendsen Hein
Added missing quote in warning text to tests, too.
Thomas Arendsen Hein
Added missing quote in warning text.
Matt Mackall
Fix revlog signature check for empty revlogs
Matt Mackall
Add revlog version signature check
Matt Mackall
doc: clone and outgoing point to pull for valid path docs
Matt Mackall
deprecate the rawcommit command
Matt Mackall
convert-repo: use commit rather than rawcommit
Matt Mackall
convert-repo: automatically create empty map file
Benoit Boissinot
deprecate the use of 'hg tag NAME [REV]' add some tests and some doc
Matt Mackall
hgweb: show copy/rename links in file history
Peter van Dijk
unbreak templates/summary-gitweb.tmpl
Matt Mackall
Fix comment syntax
Peter van Dijk
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Matt Mackall
hgweb: fix breakage on manifest subdirs from path cleaning
Petr Mazanec
Process working files through encode filters in dodiff()
Christian Ebert
Use of opendiff as merge program on MacOS X Hello, If one has the developer tools installed on MacOS X there's another alternative for the merge program. Invocation could be done somehow like in the attached patch for hgmerge.
Matt Mackall
Clean up paths passed to hgweb (spotted by Peter van Dijk)
Benoit Boissinot
add removed files to the changelog file list - this should allow better detection of removed file when walking in the history (like hg log) it doesn't help for the fast path of hg log where we only look at the filelog - users of the changelog file list shouldn't assume anymore that the file still exist (anyway it won't be found in the manifest like in 5ecf05541e11) - fix the tests (some hashes changed)
ma...@suse.com
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
Alexis S. L. Carvalho
bash_completion: ignore hg help error messages They are usually not useful when you're completing stuff and end up cluttering the screen.
Alexis S. L. Carvalho
bash_completion: always use single quotes with compgen -W This avoids a bug in bash 2.05a
Alexis S. L. Carvalho
bash_completion: be more careful about whitespaces - use awk to parse the output of hg help. - print one completion candidate per line - print the debug commands after regular commands (this eases the shell side of the parsing) - don't print aliases that are simple abbreviations (e.g. up/update, id/identify)
Thomas Arendsen Hein
Added hint to hg-ssh that you can use shell pattern matching.
Thomas Arendsen Hein
_hg_status improvements in bash_completion: - Use "hg status -n" option instead of cut command. - Sort status flags accoring to "hg status --help" - Show deleted files instead of "hg remove"d for "hg remove"
Alexis S. L. Carvalho
bash_completion: small updates and fixes - $result in _hg_commands is not an array - use "hg status ." - update "hg cat" completion - let bash itself generate the default completion
ma...@suse.com
Add new bdiff based unidiff generation.
Matt Mackall
contrib: add Chris Mason's stand-alone diff tool This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
  1. Prev
  2. Next