contrib/tcsh_completion
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 20:17:39 -0300
changeset 4359 2e3c54fb79a3
parent 1308 2073e5a71008
permissions -rw-r--r--
actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1156
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     1
#
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     2
# tcsh completion for Mercurial
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     3
#
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     4
# This file has been auto-generated by tcsh_completion_build.sh for
1308
2073e5a71008 Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1264
diff changeset
     5
# Mercurial Distributed SCM (version 325c07fd2ebd)
1156
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     6
#
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     7
# Copyright (C) 2005 TK Soh.
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     8
#
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
     9
# This is free software; you can redistribute it and/or modify it under
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    10
# the terms of the GNU General Public License as published by the Free
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    11
# Software Foundation; either version 2 of the License, or (at your
1308
2073e5a71008 Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1264
diff changeset
    12
# option) any later version.
1156
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    13
#
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    14
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    15
complete hg \
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    16
  'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \
1158
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    17
  'C/-/( -R --repository \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    18
    --cwd \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    19
    -y --noninteractive \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    20
    -q --quiet \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    21
    -v --verbose \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    22
    --debug \
1264
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    23
    --debugger \
1158
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    24
    --traceback \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    25
    --time \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    26
    --profile \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    27
    --version \
4650ec7ef690 Regenerate tcsh_completion after bugfix in generator script
TK Soh <tksoh@freescale.com>
parents: 1156
diff changeset
    28
    -h --help)/' \
1264
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    29
  'p/1/(add addremove annotate bundle cat \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    30
    clone commit ci copy cp \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    31
    debugancestor debugcheckstate debugconfig debugdata debugindex \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    32
    debugindexdot debugrename debugstate debugwalk diff \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    33
    export forget grep heads help \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    34
    identify id import patch incoming \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    35
    in init locate log history \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    36
    manifest outgoing out parents paths \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    37
    pull push rawcommit recover remove \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    38
    rm rename mv revert root \
1156
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    39
    serve status tag tags tip \
1264
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    40
    unbundle undo update up checkout \
be4a14bfaa9c Generated new tcsh_completion with tcsh_completion_build.sh
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1158
diff changeset
    41
    co verify version)/'
1156
1d5996d39c9d Add tcsh_completion to contrib
TK Soh <teekaysoh@yahoo.com>
parents:
diff changeset
    42