tests: don't use alias

alias doesn't work in Solaris sh.

contrib/check-code.py

@@ -1,429 +1,430 b''
 #!/usr/bin/env python
 #
 # check-code - a style and portability checker for Mercurial
 #
 # Copyright 2010 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import re, glob, os, sys
 import keyword
 import optparse
 
 def repquote(m):
     t = re.sub(r"\w", "x", m.group('text'))
     t = re.sub(r"[^\s\nx]", "o", t)
     return m.group('quote') + t + m.group('quote')
 
 def reppython(m):
     comment = m.group('comment')
     if comment:
         return "#" * len(comment)
     return repquote(m)
 
 def repcomment(m):
     return m.group(1) + "#" * len(m.group(2))
 
 def repccomment(m):
     t = re.sub(r"((?<=\n) )|\S", "x", m.group(2))
     return m.group(1) + t + "*/"
 
 def repcallspaces(m):
     t = re.sub(r"\n\s+", "\n", m.group(2))
     return m.group(1) + t
 
 def repinclude(m):
     return m.group(1) + "<foo>"
 
 def rephere(m):
     t = re.sub(r"\S", "x", m.group(2))
     return m.group(1) + t
 
 
 testpats = [
   [
     (r'(pushd|popd)', "don't use 'pushd' or 'popd', use 'cd'"),
     (r'\W\$?\(\([^\)\n]*\)\)', "don't use (()) or $(()), use 'expr'"),
     (r'^function', "don't use 'function', use old style"),
     (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"),
     (r'echo.*\\n', "don't use 'echo \\n', use printf"),
     (r'echo -n', "don't use 'echo -n', use printf"),
     (r'^diff.*-\w*N', "don't use 'diff -N'"),
     (r'(^| )wc[^|]*$\n(?!.*\(re\))', "filter wc output"),
     (r'head -c', "don't use 'head -c', use 'dd'"),
     (r'sha1sum', "don't use sha1sum, use $TESTDIR/md5sum.py"),
     (r'ls.*-\w*R', "don't use 'ls -R', use 'find'"),
     (r'printf.*\\\d\d\d', "don't use 'printf \NNN', use Python"),
     (r'printf.*\\x', "don't use printf \\x, use Python"),
     (r'\$\(.*\)', "don't use $(expr), use `expr`"),
     (r'rm -rf \*', "don't use naked rm -rf, target a directory"),
     (r'(^|\|\s*)grep (-\w\s+)*[^|]*[(|]\w',
      "use egrep for extended grep syntax"),
     (r'/bin/', "don't use explicit paths for tools"),
     (r'\$PWD', "don't use $PWD, use `pwd`"),
     (r'[^\n]\Z', "no trailing newline"),
     (r'export.*=', "don't export and assign at once"),
     (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\\^', "^ must be quoted"),
     (r'^source\b', "don't use 'source', use '.'"),
     (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"),
     (r'ls +[^|\n-]+ +-', "options to 'ls' must come before filenames"),
     (r'[^>\n]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"),
     (r'^stop\(\)', "don't use 'stop' as a shell function name"),
     (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"),
+    (r'^alias\b.*=', "don't use alias, use a function"),
   ],
   # warnings
   []
 ]
 
 testfilters = [
     (r"( *)(#([^\n]*\S)?)", repcomment),
     (r"<<(\S+)((.|\n)*?\n\1)", rephere),
 ]
 
 uprefix = r"^  \$ "
 uprefixc = r"^  > "
 utestpats = [
   [
     (r'^(\S|  $ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
     (uprefix + r'.*\|\s*sed', "use regex test output patterns instead of sed"),
     (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"),
     (uprefix + r'.*(?<!\[)\$\?', "explicit exit code checks unnecessary"),
     (uprefix + r'.*\|\| echo.*(fail|error)',
      "explicit exit code checks unnecessary"),
     (uprefix + r'set -e', "don't use set -e"),
     (uprefixc + r'( *)\t', "don't use tabs to indent"),
   ],
   # warnings
   []
 ]
 
 for i in [0, 1]:
     for p, m in testpats[i]:
         if p.startswith(r'^'):
             p = uprefix + p[1:]
         else:
             p = uprefix + ".*" + p
         utestpats[i].append((p, m))
 
 utestfilters = [
     (r"( *)(#([^\n]*\S)?)", repcomment),
 ]
 
 pypats = [
   [
     (r'^\s*def\s*\w+\s*\(.*,\s*\(',
      "tuple parameter unpacking not available in Python 3+"),
     (r'lambda\s*\(.*,.*\)',
      "tuple parameter unpacking not available in Python 3+"),
     (r'(?<!def)\s+(cmp)\(', "cmp is not available in Python 3+"),
     (r'\breduce\s*\(.*', "reduce is not available in Python 3+"),
     (r'\.has_key\b', "dict.has_key is not available in Python 3+"),
     (r'^\s*\t', "don't use tabs"),
     (r'\S;\s*\n', "semicolon"),
     (r'\w,\w', "missing whitespace after ,"),
     (r'\w[+/*\-<>]\w', "missing whitespace in expression"),
     (r'^\s+\w+=\w+[^,)\n]$', "missing whitespace in assignment"),
     (r'(\s+)try:\n((?:\n|\1\s.*\n)+?)\1except.*?:\n'
      r'((?:\n|\1\s.*\n)+?)\1finally:', 'no try/except/finally in Py2.4'),
     (r'.{85}', "line too long"),
     (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'),
     (r'[^\n]\Z', "no trailing newline"),
     (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"),
 #    (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', "don't use underbars in identifiers"),
     (r'^\s+(self\.)?[A-za-z][a-z0-9]+[A-Z]\w* = ',
      "don't use camelcase in identifiers"),
     (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+',
      "linebreak after :"),
     (r'class\s[^( \n]+:', "old-style class, use class foo(object)"),
     (r'class\s[^( \n]+\(\):',
      "class foo() not available in Python 2.4, use class foo(object)"),
     (r'\b(%s)\(' % '|'.join(keyword.kwlist),
      "Python keyword is not a function"),
     (r',]', "unneeded trailing ',' in list"),
 #    (r'class\s[A-Z][^\(]*\((?!Exception)',
 #     "don't capitalize non-exception classes"),
 #    (r'in range\(', "use xrange"),
 #    (r'^\s*print\s+', "avoid using print in core and extensions"),
     (r'[\x80-\xff]', "non-ASCII character literal"),
     (r'("\')\.format\(', "str.format() not available in Python 2.4"),
     (r'^\s*with\s+', "with not available in Python 2.4"),
     (r'\.isdisjoint\(', "set.isdisjoint not available in Python 2.4"),
     (r'^\s*except.* as .*:', "except as not available in Python 2.4"),
     (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"),
     (r'(?<!def)\s+(any|all|format)\(',
      "any/all/format not available in Python 2.4"),
     (r'(?<!def)\s+(callable)\(',
      "callable not available in Python 3, use getattr(f, '__call__', None)"),
     (r'if\s.*\selse', "if ... else form not available in Python 2.4"),
     (r'^\s*(%s)\s\s' % '|'.join(keyword.kwlist),
      "gratuitous whitespace after Python keyword"),
     (r'([\(\[][ \t]\S)|(\S[ \t][\)\]])', "gratuitous whitespace in () or []"),
 #    (r'\s\s=', "gratuitous whitespace before ="),
     (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\S',
      "missing whitespace around operator"),
     (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\s',
      "missing whitespace around operator"),
     (r'\s(\+=|-=|!=|<>|<=|>=|<<=|>>=)\S',
      "missing whitespace around operator"),
     (r'[^+=*/!<>&| -](\s=|=\s)[^= ]',
      "wrong whitespace around ="),
     (r'raise Exception', "don't raise generic exceptions"),
     (r' is\s+(not\s+)?["\'0-9-]', "object comparison with literal"),
     (r' [=!]=\s+(True|False|None)',
      "comparison with singleton, use 'is' or 'is not' instead"),
     (r'^\s*(while|if) [01]:',
      "use True/False for constant Boolean expression"),
     (r'(?<!def)\s+hasattr',
      'hasattr(foo, bar) is broken, use util.safehasattr(foo, bar) instead'),
     (r'opener\([^)]*\).read\(',
      "use opener.read() instead"),
     (r'BaseException', 'not in Py2.4, use Exception'),
     (r'os\.path\.relpath', 'os.path.relpath is not in Py2.5'),
     (r'opener\([^)]*\).write\(',
      "use opener.write() instead"),
     (r'[\s\(](open|file)\([^)]*\)\.read\(',
      "use util.readfile() instead"),
     (r'[\s\(](open|file)\([^)]*\)\.write\(',
      "use util.readfile() instead"),
     (r'^[\s\(]*(open(er)?|file)\([^)]*\)',
      "always assign an opened file to a variable, and close it afterwards"),
     (r'[\s\(](open|file)\([^)]*\)\.',
      "always assign an opened file to a variable, and close it afterwards"),
     (r'(?i)descendent', "the proper spelling is descendAnt"),
     (r'\.debug\(\_', "don't mark debug messages for translation"),
   ],
   # warnings
   [
     (r'.{81}', "warning: line over 80 characters"),
     (r'^\s*except:$', "warning: naked except clause"),
     (r'ui\.(status|progress|write|note|warn)\([\'\"]x',
      "warning: unwrapped ui message"),
   ]
 ]
 
 pyfilters = [
     (r"""(?msx)(?P<comment>\#.*?$)|
          ((?P<quote>('''|\"\"\"|(?<!')'(?!')|(?<!")"(?!")))
           (?P<text>(([^\\]|\\.)*?))
           (?P=quote))""", reppython),
 ]
 
 cpats = [
   [
     (r'//', "don't use //-style comments"),
     (r'^  ', "don't use spaces to indent"),
     (r'\S\t', "don't use tabs except for indent"),
     (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"),
     (r'.{85}', "line too long"),
     (r'(while|if|do|for)\(', "use space after while/if/do/for"),
     (r'return\(', "return is not a function"),
     (r' ;', "no space before ;"),
     (r'\w+\* \w+', "use int *foo, not int* foo"),
     (r'\([^\)]+\) \w+', "use (int)foo, not (int) foo"),
     (r'\S+ (\+\+|--)', "use foo++, not foo ++"),
     (r'\w,\w', "missing whitespace after ,"),
     (r'^[^#]\w[+/*]\w', "missing whitespace in expression"),
     (r'^#\s+\w', "use #foo, not # foo"),
     (r'[^\n]\Z', "no trailing newline"),
     (r'^\s*#import\b', "use only #include in standard C code"),
   ],
   # warnings
   []
 ]
 
 cfilters = [
     (r'(/\*)(((\*(?!/))|[^*])*)\*/', repccomment),
     (r'''(?P<quote>(?<!")")(?P<text>([^"]|\\")+)"(?!")''', repquote),
     (r'''(#\s*include\s+<)([^>]+)>''', repinclude),
     (r'(\()([^)]+\))', repcallspaces),
 ]
 
 inutilpats = [
   [
     (r'\bui\.', "don't use ui in util"),
   ],
   # warnings
   []
 ]
 
 inrevlogpats = [
   [
     (r'\brepo\.', "don't use repo in revlog"),
   ],
   # warnings
   []
 ]
 
 checks = [
     ('python', r'.*\.(py|cgi)$', pyfilters, pypats),
     ('test script', r'(.*/)?test-[^.~]*$', testfilters, testpats),
     ('c', r'.*\.c$', cfilters, cpats),
     ('unified test', r'.*\.t$', utestfilters, utestpats),
     ('layering violation repo in revlog', r'mercurial/revlog\.py', pyfilters,
      inrevlogpats),
     ('layering violation ui in util', r'mercurial/util\.py', pyfilters,
      inutilpats),
 ]
 
 class norepeatlogger(object):
     def __init__(self):
         self._lastseen = None
 
     def log(self, fname, lineno, line, msg, blame):
         """print error related a to given line of a given file.
 
         The faulty line will also be printed but only once in the case
         of multiple errors.
 
         :fname: filename
         :lineno: line number
         :line: actual content of the line
         :msg: error message
         """
         msgid = fname, lineno, line
         if msgid != self._lastseen:
             if blame:
                 print "%s:%d (%s):" % (fname, lineno, blame)
             else:
                 print "%s:%d:" % (fname, lineno)
             print " > %s" % line
             self._lastseen = msgid
         print " " + msg
 
 _defaultlogger = norepeatlogger()
 
 def getblame(f):
     lines = []
     for l in os.popen('hg annotate -un %s' % f):
         start, line = l.split(':', 1)
         user, rev = start.split()
         lines.append((line[1:-1], user, rev))
     return lines
 
 def checkfile(f, logfunc=_defaultlogger.log, maxerr=None, warnings=False,
               blame=False, debug=False, lineno=True):
     """checks style and portability of a given file
 
     :f: filepath
     :logfunc: function used to report error
               logfunc(filename, linenumber, linecontent, errormessage)
     :maxerr: number of error to display before arborting.
              Set to false (default) to report all errors
 
     return True if no error is found, False otherwise.
     """
     blamecache = None
     result = True
     for name, match, filters, pats in checks:
         if debug:
             print name, f
         fc = 0
         if not re.match(match, f):
             if debug:
                 print "Skipping %s for %s it doesn't match %s" % (
                        name, match, f)
             continue
         fp = open(f)
         pre = post = fp.read()
         fp.close()
         if "no-" + "check-code" in pre:
             if debug:
                 print "Skipping %s for %s it has no- and check-code" % (
                        name, f)
             break
         for p, r in filters:
             post = re.sub(p, r, post)
         if warnings:
             pats = pats[0] + pats[1]
         else:
             pats = pats[0]
         # print post # uncomment to show filtered version
 
         if debug:
             print "Checking %s for %s" % (name, f)
 
         prelines = None
         errors = []
         for p, msg in pats:
             # fix-up regexes for multiline searches
             po = p
             # \s doesn't match \n
             p = re.sub(r'(?<!\\)\\s', r'[ \\t]', p)
             # [^...] doesn't match newline
             p = re.sub(r'(?<!\\)\[\^', r'[^\\n', p)
 
             #print po, '=>', p
 
             pos = 0
             n = 0
             for m in re.finditer(p, post, re.MULTILINE):
                 if prelines is None:
                     prelines = pre.splitlines()
                     postlines = post.splitlines(True)
 
                 start = m.start()
                 while n < len(postlines):
                     step = len(postlines[n])
                     if pos + step > start:
                         break
                     pos += step
                     n += 1
                 l = prelines[n]
 
                 if "check-code" + "-ignore" in l:
                     if debug:
                         print "Skipping %s for %s:%s (check-code -ignore)" % (
                             name, f, n)
                     continue
                 bd = ""
                 if blame:
                     bd = 'working directory'
                     if not blamecache:
                         blamecache = getblame(f)
                     if n < len(blamecache):
                         bl, bu, br = blamecache[n]
                         if bl == l:
                             bd = '%s@%s' % (bu, br)
                 errors.append((f, lineno and n + 1, l, msg, bd))
                 result = False
 
         errors.sort()
         for e in errors:
             logfunc(*e)
             fc += 1
             if maxerr and fc >= maxerr:
                 print " (too many errors, giving up)"
                 break
 
     return result
 
 if __name__ == "__main__":
     parser = optparse.OptionParser("%prog [options] [files]")
     parser.add_option("-w", "--warnings", action="store_true",
                       help="include warning-level checks")
     parser.add_option("-p", "--per-file", type="int",
                       help="max warnings per file")
     parser.add_option("-b", "--blame", action="store_true",
                       help="use annotate to generate blame info")
     parser.add_option("", "--debug", action="store_true",
                       help="show debug information")
     parser.add_option("", "--nolineno", action="store_false",
                       dest='lineno', help="don't show line numbers")
 
     parser.set_defaults(per_file=15, warnings=False, blame=False, debug=False,
                         lineno=True)
     (options, args) = parser.parse_args()
 
     if len(args) == 0:
         check = glob.glob("*")
     else:
         check = args
 
     ret = 0
     for f in check:
         if not checkfile(f, maxerr=options.per_file, warnings=options.warnings,
                          blame=options.blame, debug=options.debug,
                          lineno=options.lineno):
             ret = 1
     sys.exit(ret)

tests/test-phases-exchange.t

@@ -1,1018 +1,1018 b''
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
   > EOF
-  $ alias hgph='hg log -G --template "{rev} {phase} {desc} - {node|short}\n"'
+  $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
 
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    message="$1"
   >    shift
   >    hg ci -m "$message" $*
   > }
 
   $ hg init alpha
   $ cd alpha
   $ mkcommit a-A
   $ mkcommit a-B
   $ mkcommit a-C
   $ mkcommit a-D
   $ hgph
   @  3 draft a-D - b555f63b6063
   |
   o  2 draft a-C - 54acac6f23ab
   |
   o  1 draft a-B - 548a3d25dbf0
   |
   o  0 draft a-A - 054250a37db4
   
 
   $ hg init ../beta
   $ hg push -r 1 ../beta
   pushing to ../beta
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   $ hgph
   @  3 draft a-D - b555f63b6063
   |
   o  2 draft a-C - 54acac6f23ab
   |
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
   $ cd ../beta
   $ hgph
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg up -q
   $ mkcommit b-A
   $ hgph
   @  2 draft b-A - f54f1bb90ff3
   |
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg pull ../alpha
   pulling from ../alpha
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hgph
   o  4 public a-D - b555f63b6063
   |
   o  3 public a-C - 54acac6f23ab
   |
   | @  2 draft b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 pull did not updated ../alpha state.
 push from alpha to beta should update phase even if nothing is transfered
 
   $ cd ../alpha
   $ hgph # not updated by remote pull
   @  3 draft a-D - b555f63b6063
   |
   o  2 draft a-C - 54acac6f23ab
   |
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg push ../beta
   pushing to ../beta
   searching for changes
   no changes found
   $ hgph
   @  3 public a-D - b555f63b6063
   |
   o  2 public a-C - 54acac6f23ab
   |
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 update must update phase of common changeset too
 
   $ hg pull ../beta # getting b-A
   pulling from ../beta
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ cd ../beta
   $ hgph # not updated by remote pull
   o  4 public a-D - b555f63b6063
   |
   o  3 public a-C - 54acac6f23ab
   |
   | @  2 draft b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg pull ../alpha
   pulling from ../alpha
   searching for changes
   no changes found
   $ hgph
   o  4 public a-D - b555f63b6063
   |
   o  3 public a-C - 54acac6f23ab
   |
   | @  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Publish configuration option
 ----------------------------
 
 Pull
 ````
 
 changegroup are added without phase movement
 
   $ hg bundle -a ../base.bundle
   5 changesets found
   $ cd ..
   $ hg init mu
   $ cd mu
   $ cat > .hg/hgrc << EOF
   > [phases]
   > publish=0
   > EOF
   $ hg unbundle ../base.bundle
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hgph
   o  4 draft a-D - b555f63b6063
   |
   o  3 draft a-C - 54acac6f23ab
   |
   | o  2 draft b-A - f54f1bb90ff3
   |/
   o  1 draft a-B - 548a3d25dbf0
   |
   o  0 draft a-A - 054250a37db4
   
   $ cd ..
 
 Pulling from publish=False to publish=False does not move boundary.
 
   $ hg init nu
   $ cd nu
   $ cat > .hg/hgrc << EOF
   > [phases]
   > publish=0
   > EOF
   $ hg pull ../mu -r 54acac6f23ab
   pulling from ../mu
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files
   (run 'hg update' to get a working copy)
   $ hgph
   o  2 draft a-C - 54acac6f23ab
   |
   o  1 draft a-B - 548a3d25dbf0
   |
   o  0 draft a-A - 054250a37db4
   
 
 Even for common
 
   $ hg pull ../mu -r f54f1bb90ff3
   pulling from ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hgph
   o  3 draft b-A - f54f1bb90ff3
   |
   | o  2 draft a-C - 54acac6f23ab
   |/
   o  1 draft a-B - 548a3d25dbf0
   |
   o  0 draft a-A - 054250a37db4
   
 
 
 Pulling from Publish=True to Publish=False move boundary in common set.
 we are in nu
 
   $ hg pull ../alpha -r b555f63b6063
   pulling from ../alpha
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hgph # f54f1bb90ff3 stay draft, not ancestor of -r
   o  4 public a-D - b555f63b6063
   |
   | o  3 draft b-A - f54f1bb90ff3
   | |
   o |  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 pulling from Publish=False to publish=False with some public
 
   $ hg up -q f54f1bb90ff3
   $ mkcommit n-A
   $ mkcommit n-B
   $ hgph
   @  6 draft n-B - 145e75495359
   |
   o  5 draft n-A - d6bcb4f74035
   |
   | o  4 public a-D - b555f63b6063
   | |
   o |  3 draft b-A - f54f1bb90ff3
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ cd ../mu
   $ hg pull ../nu
   pulling from ../nu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
   $ hgph
   o  6 draft n-B - 145e75495359
   |
   o  5 draft n-A - d6bcb4f74035
   |
   | o  4 public a-D - b555f63b6063
   | |
   | o  3 public a-C - 54acac6f23ab
   | |
   o |  2 draft b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ cd ..
 
 pulling into publish=True
 
   $ cd alpha
   $ hgph
   o  4 public b-A - f54f1bb90ff3
   |
   | @  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg pull ../mu
   pulling from ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
   $ hgph
   o  6 draft n-B - 145e75495359
   |
   o  5 draft n-A - d6bcb4f74035
   |
   o  4 public b-A - f54f1bb90ff3
   |
   | @  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ cd ..
 
 pulling back into original repo
 
   $ cd nu
   $ hg pull ../alpha
   pulling from ../alpha
   searching for changes
   no changes found
   $ hgph
   @  6 public n-B - 145e75495359
   |
   o  5 public n-A - d6bcb4f74035
   |
   | o  4 public a-D - b555f63b6063
   | |
   o |  3 public b-A - f54f1bb90ff3
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Push
 ````
 
 (inserted)
 
 Test that phase are pushed even when they are nothing to pus
 (this might be tested later bu are very convenient to not alter too much test)
 
 Push back to alpha
 
   $ hg push ../alpha # from nu
   pushing to ../alpha
   searching for changes
   no changes found
   $ cd ..
   $ cd alpha
   $ hgph
   o  6 public n-B - 145e75495359
   |
   o  5 public n-A - d6bcb4f74035
   |
   o  4 public b-A - f54f1bb90ff3
   |
   | @  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 (end insertion)
 
 
 initial setup
 
   $ hg glog # of alpha
   o  changeset:   6:145e75495359
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     n-B
   |
   o  changeset:   5:d6bcb4f74035
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     n-A
   |
   o  changeset:   4:f54f1bb90ff3
   |  parent:      1:548a3d25dbf0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b-A
   |
   | @  changeset:   3:b555f63b6063
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     a-D
   | |
   | o  changeset:   2:54acac6f23ab
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     a-C
   |
   o  changeset:   1:548a3d25dbf0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     a-B
   |
   o  changeset:   0:054250a37db4
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a-A
   
   $ mkcommit a-E
   $ mkcommit a-F
   $ mkcommit a-G
   $ hg up d6bcb4f74035 -q
   $ mkcommit a-H
   created new head
   $ hgph
   @  10 draft a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 draft a-F - b740e3e5c05d
   | |
   | o  7 draft a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=False (unknown changeset)
 
   $ hg push ../mu -r b740e3e5c05d # a-F
   pushing to ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   $ hgph
   @  10 draft a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 draft a-F - b740e3e5c05d
   | |
   | o  7 draft a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
   $ cd ../mu
   $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
   >      # not ancestor of -r
   o  8 draft a-F - b740e3e5c05d
   |
   o  7 draft a-E - e9f537e46dea
   |
   | o  6 draft n-B - 145e75495359
   | |
   | o  5 draft n-A - d6bcb4f74035
   | |
   o |  4 public a-D - b555f63b6063
   | |
   o |  3 public a-C - 54acac6f23ab
   | |
   | o  2 draft b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=True (unknown changeset)
 
   $ hg push ../beta -r b740e3e5c05d
   pushing to ../beta
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
   >      # not ancestor of -r
   o  8 public a-F - b740e3e5c05d
   |
   o  7 public a-E - e9f537e46dea
   |
   | o  6 draft n-B - 145e75495359
   | |
   | o  5 draft n-A - d6bcb4f74035
   | |
   o |  4 public a-D - b555f63b6063
   | |
   o |  3 public a-C - 54acac6f23ab
   | |
   | o  2 draft b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=True (common changeset)
 
   $ cd ../beta
   $ hg push ../alpha
   pushing to ../alpha
   searching for changes
   no changes found
   $ hgph
   o  6 public a-F - b740e3e5c05d
   |
   o  5 public a-E - e9f537e46dea
   |
   o  4 public a-D - b555f63b6063
   |
   o  3 public a-C - 54acac6f23ab
   |
   | @  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ cd ../alpha
   $ hgph
   @  10 draft a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=False (common changeset that change phase + unknown one)
 
   $ hg push ../mu -r 967b449fbc94 -f
   pushing to ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   $ hgph
   @  10 draft a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ cd ../mu
   $ hgph # d6bcb4f74035 should have changed phase
   >      # 145e75495359 is still draft. not ancestor of -r
   o  9 draft a-H - 967b449fbc94
   |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 draft n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   | o  4 public a-D - b555f63b6063
   | |
   | o  3 public a-C - 54acac6f23ab
   | |
   o |  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 
 Pushing to Publish=True (common changeset from publish=False)
 
 (in mu)
   $ hg push ../alpha
   pushing to ../alpha
   searching for changes
   no changes found
   $ hgph
   o  9 public a-H - 967b449fbc94
   |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   | o  4 public a-D - b555f63b6063
   | |
   | o  3 public a-C - 54acac6f23ab
   | |
   o |  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hgph -R ../alpha # a-H should have been synced to 0
   @  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 
 Discovery locally secret changeset on a remote repository:
 
 - should make it non-secret
 
   $ cd ../alpha
   $ mkcommit A-secret --config phases.new-commit=2
   $ hgph
   @  11 secret A-secret - 435b5d83910c
   |
   o  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
   1 changesets found
   $ hg -R ../mu unbundle ../secret-bundle.hg
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hgph -R ../mu
   o  10 draft A-secret - 435b5d83910c
   |
   o  9 public a-H - 967b449fbc94
   |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   | o  4 public a-D - b555f63b6063
   | |
   | o  3 public a-C - 54acac6f23ab
   | |
   o |  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
   $ hg pull ../mu
   pulling from ../mu
   searching for changes
   no changes found
   $ hgph
   @  11 draft A-secret - 435b5d83910c
   |
   o  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 pushing a locally public and draft changesets remotly secret should make them appear on the remote side
 
   $ hg -R ../mu phase --secret --force 967b449fbc94
   $ hg push -r 435b5d83910c ../mu
   pushing to ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 2 files
   $ hgph -R ../mu
   o  10 draft A-secret - 435b5d83910c
   |
   o  9 public a-H - 967b449fbc94
   |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   | o  4 public a-D - b555f63b6063
   | |
   | o  3 public a-C - 54acac6f23ab
   | |
   o |  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 pull new changeset with common draft locally
 
   $ hg up -q 967b449fbc94 # create a new root for draft
   $ mkcommit 'alpha-more'
   created new head
   $ hg push -fr . ../mu
   pushing to ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   $ cd ../mu
   $ hg phase --secret --force 1c5cfd894796
   $ hg up -q 435b5d83910c
   $ mkcommit 'mu-more'
   $ cd ../alpha
   $ hg pull ../mu
   pulling from ../mu
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hgph
   o  13 draft mu-more - 5237fb433fc8
   |
   | @  12 draft alpha-more - 1c5cfd894796
   | |
   o |  11 draft A-secret - 435b5d83910c
   |/
   o  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 Test that test are properly ignored on remote event when existing locally
 
   $ cd ..
   $ hg clone -qU -r b555f63b6063 -r f54f1bb90ff3 beta gamma
 
 # pathological case are
 #
 # * secret remotely
 # * known locally
 # * repo have uncommon changeset
 
   $ hg -R beta phase --secret --force f54f1bb90ff3
   $ hg -R gamma phase --draft --force f54f1bb90ff3
 
   $ cd gamma
   $ hg pull ../beta
   pulling from ../beta
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
   $ hg phase f54f1bb90ff3
   2: draft
 
 same over the wire
 
   $ cd ../beta
   $ hg serve -p $HGPORT -d --pid-file=../beta.pid -E ../beta-error.log
   $ cat ../beta.pid >> $DAEMON_PIDS
   $ cd ../gamma
 
   $ hg pull http://localhost:$HGPORT/
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
   $ hg phase f54f1bb90ff3
   2: draft
 
 check that secret local on both side are not synced to public
 
   $ hg push -r b555f63b6063 http://localhost:$HGPORT/
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
   $ hg phase f54f1bb90ff3
   2: draft
 
 put the changeset in the draft state again
 (first test after this one expect to be able to copy)
 
   $ cd ..
 
 
 Test Clone behavior
 
 A. Clone without secret changeset
 
 1.  cloning non-publishing repository
 (Phase should be preserved)
 
 # make sure there is no secret so we can use a copy clone
 
   $ hg -R mu phase --draft 'secret()'
 
   $ hg clone -U mu Tau
   $ hgph -R Tau
   o  12 draft mu-more - 5237fb433fc8
   |
   | o  11 draft alpha-more - 1c5cfd894796
   | |
   o |  10 draft A-secret - 435b5d83910c
   |/
   o  9 public a-H - 967b449fbc94
   |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   | o  4 public a-D - b555f63b6063
   | |
   | o  3 public a-C - 54acac6f23ab
   | |
   o |  2 public b-A - f54f1bb90ff3
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 
 2. cloning publishing repository
 
 (everything should be public)
 
   $ hg clone -U alpha Upsilon
   $ hgph -R Upsilon
   o  13 public mu-more - 5237fb433fc8
   |
   | o  12 public alpha-more - 1c5cfd894796
   | |
   o |  11 public A-secret - 435b5d83910c
   |/
   o  10 public a-H - 967b449fbc94
   |
   | o  9 public a-G - 3e27b6f1eee1
   | |
   | o  8 public a-F - b740e3e5c05d
   | |
   | o  7 public a-E - e9f537e46dea
   | |
   +---o  6 public n-B - 145e75495359
   | |
   o |  5 public n-A - d6bcb4f74035
   | |
   o |  4 public b-A - f54f1bb90ff3
   | |
   | o  3 public a-D - b555f63b6063
   | |
   | o  2 public a-C - 54acac6f23ab
   |/
   o  1 public a-B - 548a3d25dbf0
   |
   o  0 public a-A - 054250a37db4
   
 

tests/test-phases.t

@@ -1,404 +1,404 b''
-  $ alias hglog='hg log --template "{rev} {phaseidx} {desc}\n"'
+  $ hglog() { hg log --template "{rev} {phaseidx} {desc}\n" $*; }
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    message="$1"
   >    shift
   >    hg ci -m "$message" $*
   > }
 
   $ hg init initialrepo
   $ cd initialrepo
   $ mkcommit A
 
 New commit are draft by default
 
   $ hglog
   0 1 A
 
 Following commit are draft too
 
   $ mkcommit B
 
   $ hglog
   1 1 B
   0 1 A
 
 Draft commit are properly created over public one:
 
   $ hg phase --public .
   $ hglog
   1 0 B
   0 0 A
 
   $ mkcommit C
   $ mkcommit D
 
   $ hglog
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test creating changeset as secret
 
   $ mkcommit E --config phases.new-commit=2
   $ hglog
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test the secret property is inherited
 
   $ mkcommit H
   $ hglog
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Even on merge
 
   $ hg up -q 1
   $ mkcommit "B'"
   created new head
   $ hglog
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ hg merge 4 # E
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "merge B' and E"
   $ hglog
   7 2 merge B' and E
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test secret changeset are not pushed
 
   $ hg init ../push-dest
   $ cat > ../push-dest/.hg/hgrc << EOF
   > [phases]
   > publish=False
   > EOF
   $ hg outgoing ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
   $ hg outgoing -r default ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
 
   $ hg push ../push-dest -f # force because we push multiple heads
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   $ hglog
   7 2 merge B' and E
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ cd ../push-dest
   $ hglog
   4 1 B'
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ cd ..
 
 Test secret changeset are not pull
 
   $ hg init pull-dest
   $ cd pull-dest
   $ hg pull ../initialrepo
   pulling from ../initialrepo
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hglog
   4 0 B'
   3 0 D
   2 0 C
   1 0 B
   0 0 A
   $ cd ..
 
 But secret can still be bundled explicitly
 
   $ cd initialrepo
   $ hg bundle --base '4^' -r 'children(4)' ../secret-bundle.hg
   4 changesets found
   $ cd ..
 
 Test secret changeset are not cloned
 (during local clone)
 
   $ hg clone -qU initialrepo clone-dest
   $ hglog -R clone-dest
   4 0 B'
   3 0 D
   2 0 C
   1 0 B
   0 0 A
 
 Test revset
 
   $ cd initialrepo
   $ hglog -r 'public()'
   0 0 A
   1 0 B
   $ hglog -r 'draft()'
   2 1 C
   3 1 D
   6 1 B'
   $ hglog -r 'secret()'
   4 2 E
   5 2 H
   7 2 merge B' and E
 
 test that phase are displayed in log at debug level
 
   $ hg log --debug
   changeset:   7:17a481b3bccb796c0521ae97903d81c52bfee4af
   tag:         tip
   phase:       secret
   parent:      6:cf9fe039dfd67e829edf6522a45de057b5c86519
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   manifest:    7:5e724ffacba267b2ab726c91fc8b650710deaaa8
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C D E
   extra:       branch=default
   description:
   merge B' and E
   
   
   changeset:   6:cf9fe039dfd67e829edf6522a45de057b5c86519
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B'
   extra:       branch=default
   description:
   B'
   
   
   changeset:   5:a030c6be5127abc010fcbff1851536552e6951a8
   phase:       secret
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      H
   extra:       branch=default
   description:
   H
   
   
   changeset:   4:a603bfb5a83e312131cebcd05353c217d4d21dde
   phase:       secret
   parent:      3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    4:7173fd1c27119750b959e3a0f47ed78abe75d6dc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      E
   extra:       branch=default
   description:
   E
   
   
   changeset:   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   phase:       draft
   parent:      2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      D
   extra:       branch=default
   description:
   D
   
   
   changeset:   2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    2:66a5a01817fdf5239c273802b5b7618d051c89e4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C
   extra:       branch=default
   description:
   C
   
   
   changeset:   1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B
   extra:       branch=default
   description:
   B
   
   
   changeset:   0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   parent:      -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      A
   extra:       branch=default
   description:
   A
   
   
 
 Test phase command
 ===================
 
 initial picture
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > hgext.graphlog=
   > EOF
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 display changesets phase
 
 (mixing -r and plain rev specification)
 
   $ hg phase 1::4 -r 7
   1: public
   2: draft
   3: draft
   4: secret
   7: secret
 
 
 move changeset forward
 
 (with -r option)
 
   $ hg phase --public -r 2
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset backward
 
 (without -r option)
 
   $ hg phase --draft --force 2
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset forward and backward
 
   $ hg phase --draft --force 1::4
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 draft E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 draft B
   |
   o  0 public A