Mercurial > hg-stable
changeset 4809:4582c28e2874
Merge with crew
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 05 Jul 2007 12:00:43 -0700 |
| parents | 244a2609c199 (current diff) 79210a63f452 (diff) |
| children | c2d529f288a1 |
| files | |
| diffstat | 6 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Jul 05 12:00:26 2007 -0700 +++ b/mercurial/commands.py Thu Jul 05 12:00:43 2007 -0700 @@ -2254,7 +2254,7 @@ directory, the reverted files will thus appear modified afterwards. - If a file has been deleted, it is recreated. If the executable + If a file has been deleted, it is restored. If the executable mode of a file was changed, it is reset. If names are given, all files matching the names are reverted.
--- a/mercurial/util.py Thu Jul 05 12:00:26 2007 -0700 +++ b/mercurial/util.py Thu Jul 05 12:00:43 2007 -0700 @@ -968,6 +968,12 @@ return p_name_ext return default + def set_signal_handler(): + try: + set_signal_handler_win32() + except NameError: + pass + try: # override functions with win32 versions if possible from util_win32 import *
--- a/mercurial/util_win32.py Thu Jul 05 12:00:26 2007 -0700 +++ b/mercurial/util_win32.py Thu Jul 05 12:00:43 2007 -0700 @@ -300,7 +300,7 @@ getuser_fallback = win32api.GetUserName -def set_signal_handler(): +def set_signal_handler_win32(): """Register a termination handler for console events including CTRL+C. python signal handlers do not work well with socket operations.
--- a/tests/test-archive Thu Jul 05 12:00:26 2007 -0700 +++ b/tests/test-archive Thu Jul 05 12:00:43 2007 -0700 @@ -39,16 +39,22 @@ hg archive -t tgz -p %b-%h test-%h.tar.gz gzip -dc test-$QTIP.tar.gz | tar tf - | sed "s/$QTIP/TIP/" -cat > md5check.py <<EOF +cat > md5comp.py <<EOF import md5, sys -print md5.md5(file(sys.argv[1], 'rb').read()).hexdigest() +f1, f2 = sys.argv[1:3] +h1 = md5.md5(file(f1, 'rb').read()).hexdigest() +h2 = md5.md5(file(f2, 'rb').read()).hexdigest() +print h1 == h2 or "md5 differ: " + repr((h1, h2)) EOF +# archive name is stored in the archive, so create similar +# archives and rename them afterwards. hg archive -t tgz tip.tar.gz -python md5check.py tip.tar.gz +mv tip.tar.gz tip1.tar.gz sleep 1 hg archive -t tgz tip.tar.gz -python md5check.py tip.tar.gz +mv tip.tar.gz tip2.tar.gz +python md5comp.py tip1.tar.gz tip2.tar.gz hg archive -t zip -p /illegal test.zip hg archive -t zip -p very/../bad test.zip
--- a/tests/test-archive.out Thu Jul 05 12:00:26 2007 -0700 +++ b/tests/test-archive.out Thu Jul 05 12:00:43 2007 -0700 @@ -26,8 +26,7 @@ test-TIP/bar test-TIP/baz/bletch test-TIP/foo -76ce33f5d5cf8151558e2d9a396c7504 -76ce33f5d5cf8151558e2d9a396c7504 +True abort: archive prefix contains illegal components Archive: test.zip testing: test/.hg_archival.txt OK