hg-fast-export.sh/hg-reset.sh: replace egrep with grep According to the POSIX standard, egrep is an obsolescent equivalent of grep -E. In fact, the patterns actually being used with egrep do not require use of extended regular expressions at all, so a plain 'grep' can be used rather than 'grep -E'. Replace egrep with grep to improve compatibility across systems.
Merge branch 'from-jmcmullan' into develop Conflicts: hg-fast-export.py
hg export: Support tag movement HG tag movement is now supported with this patch. This patch creates a .git/hg2git-mapping file, which maps HG revision numbers to HG hashes. Combined with the .git/hg2git-marks file, which maps HG revisions to GIT hashes, we can now reprocess all tags at the end of each hg export operation.
hg2git: Update copyrights and maintainership information. Signed-off-by: Rocco Rutte <pdmef@gmx.net>
hg-fast-export: work still if git-commands are not in PATH In git 1.6.0, most git tools with a dash in the name will no longer be installed in $bindir. This patch makes hg-fast-export use the "git <command>" form so it will work even if "git" is the only piece of git machinery in the user's PATH. On the other hand, the "git <command>" form does not help for sourcing a shell script (with "."). So use the full path to source "git-sh-setup". Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Fix shell substitution typo Signed-off-by: Rocco Rutte <pdmef@gmx.net>
Allow for $PYTHON environment variable specifying python binary to use Signed-off-by: Rocco Rutte <pdmef@gmx.net>
hg-reset.sh: Helper for partially re-importing from hg Given a hg revision to reset to, these scripts get the latest changes per hg branch and print git SHA1. The user then needs to manually reset branches as needed, tune the state file and can re-import things again. Signed-off-by: Rocco Rutte <pdmef@gmx.net>