tests: fix various test-check-module-imports.t violations

Somehow these are only caught when running the test under Python 3.

Differential Revision: https://phab.mercurial-scm.org/D2580

tests/test-i18n.t

@@ -1,74 +1,74 b''
 (Translations are optional)
 
 #if gettext no-outer-repo
 
 Test that translations are compiled and installed correctly.
 
 Default encoding in tests is "ascii" and the translation is encoded
 using the "replace" error handler:
 
   $ LANGUAGE=pt_BR hg tip
   abortado: n?o foi encontrado um reposit?rio em '$TESTTMP' (.hg n?o encontrado)!
   [255]
 
 Using a more accommodating encoding:
 
   $ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip
   abortado: n\xc3\xa3o foi encontrado um reposit\xc3\xb3rio em '$TESTTMP' (.hg n\xc3\xa3o encontrado)! (esc)
   [255]
 
 Different encoding:
 
   $ HGENCODING=Latin-1 LANGUAGE=pt_BR hg tip
   abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado)! (esc)
   [255]
 
 #endif
 
 #if gettext
 
 Test keyword search in translated help text:
 
   $ HGENCODING=UTF-8 LANGUAGE=de hg help -k Aktualisiert
   Themen:
   
    subrepos Unterarchive
   
   Befehle:
   
    pull   Ruft \xc3\x84nderungen von der angegebenen Quelle ab (esc)
    update Aktualisiert das Arbeitsverzeichnis (oder wechselt die Version)
 
 #endif
 
 Check Mercurial specific translation problems in each *.po files, and
 tool itself by doctest
 
   $ cd "$TESTDIR"/../i18n
   $ $PYTHON check-translation.py *.po
   $ $PYTHON check-translation.py --doctest
   $ cd $TESTTMP
 
 #if gettext
 
 Check i18n cache isn't reused after encoding change:
 
   $ cat > $TESTTMP/encodingchange.py << EOF
+  > from mercurial.i18n import _
   > from mercurial import encoding, registrar
-  > from mercurial.i18n import _
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'encodingchange', norepo=True)
   > def encodingchange(ui):
   >     for encode in (b'ascii', b'UTF-8', b'ascii', b'UTF-8'):
   >         encoding.encoding = encode
   >         ui.write(b'%s\n' % _(b'(EXPERIMENTAL)'))
   > EOF
 
   $ LANGUAGE=ja hg --config extensions.encodingchange=$TESTTMP/encodingchange.py encodingchange
   (?????)
   (\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc)
   (?????)
   (\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc)
 
 #endif

tests/test-lfs.t

@@ -1,1102 +1,1102 b''
 # Initial setup
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > lfs=
   > [lfs]
   > # Test deprecated config
   > threshold=1000B
   > EOF
 
   $ LONG=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 
 # Prepare server and enable extension
   $ hg init server
   $ hg clone -q server client
   $ cd client
 
 # Commit small file
   $ echo s > smallfile
   $ echo '**.py = LF' > .hgeol
   $ hg --config lfs.track='"size(\">1000B\")"' commit -Aqm "add small file"
   hg: parse error: unsupported file pattern: size(">1000B")
   (paths must be prefixed with "path:")
   [255]
   $ hg --config lfs.track='size(">1000B")' commit -Aqm "add small file"
 
 # Commit large file
   $ echo $LONG > largefile
   $ grep lfs .hg/requires
   [1]
   $ hg commit --traceback -Aqm "add large file"
   $ grep lfs .hg/requires
   lfs
 
 # Ensure metadata is stored
   $ hg debugdata largefile 0
   version https://git-lfs.github.com/spec/v1
   oid sha256:f11e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
   size 1501
   x-is-binary 0
 
 # Check the blobstore is populated
   $ find .hg/store/lfs/objects | sort
   .hg/store/lfs/objects
   .hg/store/lfs/objects/f1
   .hg/store/lfs/objects/f1/1e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
 
 # Check the blob stored contains the actual contents of the file
   $ cat .hg/store/lfs/objects/f1/1e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 
 # Push changes to the server
 
   $ hg push
   pushing to $TESTTMP/server
   searching for changes
   abort: lfs.url needs to be configured
   [255]
 
   $ cat >> $HGRCPATH << EOF
   > [lfs]
   > url=file:$TESTTMP/dummy-remote/
   > EOF
 
 Push to a local non-lfs repo with the extension enabled will add the
 lfs requirement
 
   $ grep lfs $TESTTMP/server/.hg/requires
   [1]
   $ hg push -v | egrep -v '^(uncompressed| )'
   pushing to $TESTTMP/server
   searching for changes
   lfs: found f11e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b in the local lfs store
   2 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs
   $ grep lfs $TESTTMP/server/.hg/requires
   lfs
 
 # Unknown URL scheme
 
   $ hg push --config lfs.url=ftp://foobar
   abort: lfs: unknown url scheme: ftp
   [255]
 
   $ cd ../
 
 # Initialize new client (not cloning) and setup extension
   $ hg init client2
   $ cd client2
   $ cat >> .hg/hgrc <<EOF
   > [paths]
   > default = $TESTTMP/server
   > EOF
 
 # Pull from server
 
 Pulling a local lfs repo into a local non-lfs repo with the extension
 enabled adds the lfs requirement
 
   $ grep lfs .hg/requires $TESTTMP/server/.hg/requires
   $TESTTMP/server/.hg/requires:lfs
   $ hg pull default
   pulling from $TESTTMP/server
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 3 changes to 3 files
   new changesets 0ead593177f7:b88141481348
   (run 'hg update' to get a working copy)
   $ grep lfs .hg/requires $TESTTMP/server/.hg/requires
   .hg/requires:lfs
   $TESTTMP/server/.hg/requires:lfs
 
 # Check the blobstore is not yet populated
   $ [ -d .hg/store/lfs/objects ]
   [1]
 
 # Update to the last revision containing the large file
   $ hg update
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 # Check the blobstore has been populated on update
   $ find .hg/store/lfs/objects | sort
   .hg/store/lfs/objects
   .hg/store/lfs/objects/f1
   .hg/store/lfs/objects/f1/1e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
 
 # Check the contents of the file are fetched from blobstore when requested
   $ hg cat -r . largefile
   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 
 # Check the file has been copied in the working copy
   $ cat largefile
   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
 
   $ cd ..
 
 # Check rename, and switch between large and small files
 
   $ hg init repo3
   $ cd repo3
   $ cat >> .hg/hgrc << EOF
   > [lfs]
   > track=size(">10B")
   > EOF
 
   $ echo LONGER-THAN-TEN-BYTES-WILL-TRIGGER-LFS > large
   $ echo SHORTER > small
   $ hg add . -q
   $ hg commit -m 'commit with lfs content'
 
   $ hg files -r . 'set:added()'
   large
   small
   $ hg files -r . 'set:added() & lfs()'
   large
 
   $ hg mv large l
   $ hg mv small s
   $ hg status 'set:removed()'
   R large
   R small
   $ hg status 'set:removed() & lfs()'
   R large
   $ hg commit -m 'renames'
 
   $ hg files -r . 'set:copied()'
   l
   s
   $ hg files -r . 'set:copied() & lfs()'
   l
   $ hg status --change . 'set:removed()'
   R large
   R small
   $ hg status --change . 'set:removed() & lfs()'
   R large
 
   $ echo SHORT > l
   $ echo BECOME-LARGER-FROM-SHORTER > s
   $ hg commit -m 'large to small, small to large'
 
   $ echo 1 >> l
   $ echo 2 >> s
   $ hg commit -m 'random modifications'
 
   $ echo RESTORE-TO-BE-LARGE > l
   $ echo SHORTER > s
   $ hg commit -m 'switch large and small again'
 
 # Test lfs_files template
 
   $ hg log -r 'all()' -T '{rev} {join(lfs_files, ", ")}\n'
   0 large
   1 l, large
   2 s
   3 s
   4 l
 
 # Push and pull the above repo
 
   $ hg --cwd .. init repo4
   $ hg push ../repo4
   pushing to ../repo4
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 10 changes to 4 files
 
   $ hg --cwd .. init repo5
   $ hg --cwd ../repo5 pull ../repo3
   pulling from ../repo3
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 10 changes to 4 files
   new changesets fd47a419c4f7:5adf850972b9
   (run 'hg update' to get a working copy)
 
   $ cd ..
 
 # Test clone
 
   $ hg init repo6
   $ cd repo6
   $ cat >> .hg/hgrc << EOF
   > [lfs]
   > track=size(">30B")
   > EOF
 
   $ echo LARGE-BECAUSE-IT-IS-MORE-THAN-30-BYTES > large
   $ echo SMALL > small
   $ hg commit -Aqm 'create a lfs file' large small
   $ hg debuglfsupload -r 'all()' -v
   lfs: found 8e92251415339ae9b148c8da89ed5ec665905166a1ab11b09dca8fad83344738 in the local lfs store
 
   $ cd ..
 
   $ hg clone repo6 repo7
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo7
   $ hg config extensions --debug | grep lfs
   $TESTTMP/repo7/.hg/hgrc:*: extensions.lfs= (glob)
   $ cat large
   LARGE-BECAUSE-IT-IS-MORE-THAN-30-BYTES
   $ cat small
   SMALL
 
   $ cd ..
 
   $ hg --config extensions.share= share repo7 sharedrepo
   updating working directory
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R sharedrepo config extensions --debug | grep lfs
   $TESTTMP/sharedrepo/.hg/hgrc:*: extensions.lfs= (glob)
 
 # Test rename and status
 
   $ hg init repo8
   $ cd repo8
   $ cat >> .hg/hgrc << EOF
   > [lfs]
   > track=size(">10B")
   > EOF
 
   $ echo THIS-IS-LFS-BECAUSE-10-BYTES > a1
   $ echo SMALL > a2
   $ hg commit -m a -A a1 a2
   $ hg status
   $ hg mv a1 b1
   $ hg mv a2 a1
   $ hg mv b1 a2
   $ hg commit -m b
   $ hg status
   >>> with open('a2', 'wb') as f:
   ...     f.write(b'\1\nSTART-WITH-HG-FILELOG-METADATA')
   >>> with open('a1', 'wb') as f:
   ...     f.write(b'\1\nMETA\n')
   $ hg commit -m meta
   $ hg status
   $ hg log -T '{rev}: {file_copies} | {file_dels} | {file_adds}\n'
   2:  |  | 
   1: a1 (a2)a2 (a1) |  | 
   0:  |  | a1 a2
 
   $ for n in a1 a2; do
   >   for r in 0 1 2; do
   >     printf '\n%s @ %s\n' $n $r
   >     hg debugdata $n $r
   >   done
   > done
   
   a1 @ 0
   version https://git-lfs.github.com/spec/v1
   oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size 29
   x-is-binary 0
   
   a1 @ 1
   \x01 (esc)
   copy: a2
   copyrev: 50470ad23cf937b1f4b9f80bfe54df38e65b50d9
   \x01 (esc)
   SMALL
   
   a1 @ 2
   \x01 (esc)
   \x01 (esc)
   \x01 (esc)
   META
   
   a2 @ 0
   SMALL
   
   a2 @ 1
   version https://git-lfs.github.com/spec/v1
   oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size 29
   x-hg-copy a1
   x-hg-copyrev be23af27908a582af43e5cda209a5a9b319de8d4
   x-is-binary 0
   
   a2 @ 2
   version https://git-lfs.github.com/spec/v1
   oid sha256:876dadc86a8542f9798048f2c47f51dbf8e4359aed883e8ec80c5db825f0d943
   size 32
   x-is-binary 0
 
 # Verify commit hashes include rename metadata
 
   $ hg log -T '{rev}:{node|short} {desc}\n'
   2:0fae949de7fa meta
   1:9cd6bdffdac0 b
   0:7f96794915f7 a
 
   $ cd ..
 
 # Test bundle
 
   $ hg init repo9
   $ cd repo9
   $ cat >> .hg/hgrc << EOF
   > [lfs]
   > track=size(">10B")
   > [diff]
   > git=1
   > EOF
 
   $ for i in 0 single two three 4; do
   >   echo 'THIS-IS-LFS-'$i > a
   >   hg commit -m a-$i -A a
   > done
 
   $ hg update 2 -q
   $ echo 'THIS-IS-LFS-2-CHILD' > a
   $ hg commit -m branching -q
 
   $ hg bundle --base 1 bundle.hg -v
   lfs: found 5ab7a3739a5feec94a562d070a14f36dba7cad17e5484a4a89eea8e5f3166888 in the local lfs store
   lfs: found a9c7d1cd6ce2b9bbdf46ed9a862845228717b921c089d0d42e3bcaed29eb612e in the local lfs store
   lfs: found f693890c49c409ec33673b71e53f297681f76c1166daf33b2ad7ebf8b1d3237e in the local lfs store
   lfs: found fda198fea753eb66a252e9856915e1f5cddbe41723bd4b695ece2604ad3c9f75 in the local lfs store
   4 changesets found
   uncompressed size of bundle content:
        * (changelog) (glob)
        * (manifests) (glob)
        *  a (glob)
   $ hg --config extensions.strip= strip -r 2 --no-backup --force -q
   $ hg -R bundle.hg log -p -T '{rev} {desc}\n' a
   5 branching
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-two
   +THIS-IS-LFS-2-CHILD
   
   4 a-4
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-three
   +THIS-IS-LFS-4
   
   3 a-three
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-two
   +THIS-IS-LFS-three
   
   2 a-two
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-single
   +THIS-IS-LFS-two
   
   1 a-single
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-0
   +THIS-IS-LFS-single
   
   0 a-0
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,1 @@
   +THIS-IS-LFS-0
   
   $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q
   $ hg -R bundle-again.hg log -p -T '{rev} {desc}\n' a
   5 branching
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-two
   +THIS-IS-LFS-2-CHILD
   
   4 a-4
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-three
   +THIS-IS-LFS-4
   
   3 a-three
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-two
   +THIS-IS-LFS-three
   
   2 a-two
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-single
   +THIS-IS-LFS-two
   
   1 a-single
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -THIS-IS-LFS-0
   +THIS-IS-LFS-single
   
   0 a-0
   diff --git a/a b/a
   new file mode 100644
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,1 @@
   +THIS-IS-LFS-0
   
   $ cd ..
 
 # Test isbinary
 
   $ hg init repo10
   $ cd repo10
   $ cat >> .hg/hgrc << EOF
   > [extensions]
   > lfs=
   > [lfs]
   > track=all()
   > EOF
   $ $PYTHON <<'EOF'
   > def write(path, content):
   >     with open(path, 'wb') as f:
   >         f.write(content)
   > write('a', b'\0\0')
   > write('b', b'\1\n')
   > write('c', b'\1\n\0')
   > write('d', b'xx')
   > EOF
   $ hg add a b c d
   $ hg diff --stat
    a |  Bin 
    b |    1 +
    c |  Bin 
    d |    1 +
    4 files changed, 2 insertions(+), 0 deletions(-)
   $ hg commit -m binarytest
   $ cat > $TESTTMP/dumpbinary.py << EOF
   > def reposetup(ui, repo):
   >     for n in 'abcd':
   >         ui.write(('%s: binary=%s\n') % (n, repo['.'][n].isbinary()))
   > EOF
   $ hg --config extensions.dumpbinary=$TESTTMP/dumpbinary.py id --trace
   a: binary=True
   b: binary=False
   c: binary=True
   d: binary=False
   b55353847f02 tip
 
   $ cd ..
 
 # Test fctx.cmp fastpath - diff without LFS blobs
 
   $ hg init repo12
   $ cd repo12
   $ cat >> .hg/hgrc <<EOF
   > [lfs]
   > threshold=1
   > EOF
   $ cat > ../patch.diff <<EOF
   > # HG changeset patch
   > 2
   > 
   > diff --git a/a b/a
   > old mode 100644
   > new mode 100755
   > EOF
 
   $ for i in 1 2 3; do
   >     cp ../repo10/a a
   >     if [ $i = 3 ]; then
   >         # make a content-only change
   >         hg import -q --bypass ../patch.diff
   >         hg update -q
   >         rm ../patch.diff
   >     else
   >         echo $i >> a
   >         hg commit -m $i -A a
   >     fi
   > done
   $ [ -d .hg/store/lfs/objects ]
 
   $ cd ..
 
   $ hg clone repo12 repo13 --noupdate
   $ cd repo13
   $ hg log --removed -p a -T '{desc}\n' --config diff.nobinary=1 --git
   2
   diff --git a/a b/a
   old mode 100644
   new mode 100755
   
   2
   diff --git a/a b/a
   Binary file a has changed
   
   1
   diff --git a/a b/a
   new file mode 100644
   Binary file a has changed
   
   $ [ -d .hg/store/lfs/objects ]
   [1]
 
   $ cd ..
 
 # Test filter
 
   $ hg init repo11
   $ cd repo11
   $ cat >> .hg/hgrc << EOF
   > [lfs]
   > track=(**.a & size(">5B")) | (**.b & !size(">5B"))
   >      | (**.c & "path:d" & !"path:d/c.c") | size(">10B")
   > EOF
 
   $ mkdir a
   $ echo aaaaaa > a/1.a
   $ echo a > a/2.a
   $ echo aaaaaa > 1.b
   $ echo a > 2.b
   $ echo a > 1.c
   $ mkdir d
   $ echo a > d/c.c
   $ echo a > d/d.c
   $ echo aaaaaaaaaaaa > x
   $ hg add . -q
   $ hg commit -m files
 
   $ for p in a/1.a a/2.a 1.b 2.b 1.c d/c.c d/d.c x; do
   >   if hg debugdata $p 0 2>&1 | grep git-lfs >/dev/null; then
   >     echo "${p}: is lfs"
   >   else
   >     echo "${p}: not lfs"
   >   fi
   > done
   a/1.a: is lfs
   a/2.a: not lfs
   1.b: not lfs
   2.b: is lfs
   1.c: not lfs
   d/c.c: not lfs
   d/d.c: is lfs
   x: is lfs
 
   $ cd ..
 
 # Verify the repos
 
   $ cat > $TESTTMP/dumpflog.py << EOF
   > # print raw revision sizes, flags, and hashes for certain files
   > import hashlib
+  > from mercurial.node import short
   > from mercurial import revlog
-  > from mercurial.node import short
   > def hash(rawtext):
   >     h = hashlib.sha512()
   >     h.update(rawtext)
   >     return h.hexdigest()[:4]
   > def reposetup(ui, repo):
   >     # these 2 files are interesting
   >     for name in ['l', 's']:
   >         fl = repo.file(name)
   >         if len(fl) == 0:
   >             continue
   >         sizes = [revlog.revlog.rawsize(fl, i) for i in fl]
   >         texts = [fl.revision(i, raw=True) for i in fl]
   >         flags = [int(fl.flags(i)) for i in fl]
   >         hashes = [hash(t) for t in texts]
   >         print('  %s: rawsizes=%r flags=%r hashes=%r'
   >               % (name, sizes, flags, hashes))
   > EOF
 
   $ for i in client client2 server repo3 repo4 repo5 repo6 repo7 repo8 repo9 \
   >          repo10; do
   >   echo 'repo:' $i
   >   hg --cwd $i verify --config extensions.dumpflog=$TESTTMP/dumpflog.py -q
   > done
   repo: client
   repo: client2
   repo: server
   repo: repo3
     l: rawsizes=[211, 6, 8, 141] flags=[8192, 0, 0, 8192] hashes=['d2b8', '948c', 'cc88', '724d']
     s: rawsizes=[74, 141, 141, 8] flags=[0, 8192, 8192, 0] hashes=['3c80', 'fce0', '874a', '826b']
   repo: repo4
     l: rawsizes=[211, 6, 8, 141] flags=[8192, 0, 0, 8192] hashes=['d2b8', '948c', 'cc88', '724d']
     s: rawsizes=[74, 141, 141, 8] flags=[0, 8192, 8192, 0] hashes=['3c80', 'fce0', '874a', '826b']
   repo: repo5
     l: rawsizes=[211, 6, 8, 141] flags=[8192, 0, 0, 8192] hashes=['d2b8', '948c', 'cc88', '724d']
     s: rawsizes=[74, 141, 141, 8] flags=[0, 8192, 8192, 0] hashes=['3c80', 'fce0', '874a', '826b']
   repo: repo6
   repo: repo7
   repo: repo8
   repo: repo9
   repo: repo10
 
 repo13 doesn't have any cached lfs files and its source never pushed its
 files.  Therefore, the files don't exist in the remote store.  Use the files in
 the user cache.
 
   $ test -d $TESTTMP/repo13/.hg/store/lfs/objects
   [1]
 
   $ hg --config extensions.share= share repo13 repo14
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R repo14 -q verify
 
   $ hg clone repo13 repo15
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R repo15 -q verify
 
 If the source repo doesn't have the blob (maybe it was pulled or cloned with
 --noupdate), the blob is still accessible via the global cache to send to the
 remote store.
 
   $ rm -rf $TESTTMP/repo15/.hg/store/lfs
   $ hg init repo16
   $ hg -R repo15 push repo16
   pushing to repo16
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files
   $ hg -R repo15 -q verify
 
 Test damaged file scenarios.  (This also damages the usercache because of the
 hardlinks.)
 
   $ echo 'damage' >> repo5/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
 
 Repo with damaged lfs objects in any revision will fail verification.
 
   $ hg -R repo5 verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
    large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
   4 files, 5 changesets, 10 total revisions
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
 
 Updates work after cloning a damaged repo, if the damaged lfs objects aren't in
 the update destination.  Those objects won't be added to the new repo's store
 because they aren't accessed.
 
   $ hg clone -v repo5 fromcorrupt
   updating to branch default
   resolving manifests
   getting l
   lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the usercache
   getting s
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ test -f fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
   [1]
 
 Verify will copy/link all lfs objects into the local store that aren't already
 present.  Bypass the corrupted usercache to show that verify works when fed by
 the (uncorrupted) remote store.
 
   $ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v
   repository uses revlog format 1
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   lfs: adding 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e to the usercache
   lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store
   lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
   lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store
   lfs: adding 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 to the usercache
   lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
   lfs: adding b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c to the usercache
   lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
   4 files, 5 changesets, 10 total revisions
 
 Verify will not copy/link a corrupted file from the usercache into the local
 store, and poison it.  (The verify with a good remote now works.)
 
   $ rm -r fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
   $ hg -R fromcorrupt verify -v
   repository uses revlog format 1
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
   lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
    large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
   lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
   lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
   4 files, 5 changesets, 10 total revisions
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
   $ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v
   repository uses revlog format 1
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the usercache
   lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
   lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store
   lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
   lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
   4 files, 5 changesets, 10 total revisions
 
 Damaging a file required by the update destination fails the update.
 
   $ echo 'damage' >> $TESTTMP/dummy-remote/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
   $ hg --config lfs.usercache=emptycache clone -v repo5 fromcorrupt2
   updating to branch default
   resolving manifests
   abort: corrupt remote lfs object: 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
   [255]
 
 A corrupted lfs blob is not transferred from a file://remotestore to the
 usercache or local store.
 
   $ test -f emptycache/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
   [1]
   $ test -f fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
   [1]
 
   $ hg -R fromcorrupt2 verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
    large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
   4 files, 5 changesets, 10 total revisions
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
 
 Corrupt local files are not sent upstream.  (The alternate dummy remote
 avoids the corrupt lfs object in the original remote.)
 
   $ mkdir $TESTTMP/dummy-remote2
   $ hg init dest
   $ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 push -v dest
   pushing to dest
   searching for changes
   lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
   lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
   lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
   abort: detected corrupt lfs object: 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
   (run hg verify)
   [255]
 
   $ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 verify -v
   repository uses revlog format 1
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
    l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
   lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
    large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
   lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
   lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
   4 files, 5 changesets, 10 total revisions
   2 integrity errors encountered!
   (first damaged changeset appears to be 0)
   [1]
 
   $ cat $TESTTMP/dummy-remote2/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256
   sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
   $ cat fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256
   sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
   $ test -f $TESTTMP/dummy-remote2/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
   [1]
 
 Accessing a corrupt file will complain
 
   $ hg --cwd fromcorrupt2 cat -r 0 large
   abort: integrity check failed on data/large.i:0!
   [255]
 
 lfs -> normal -> lfs round trip conversions are possible.  The 'none()'
 predicate on the command line will override whatever is configured globally and
 locally, and ensures everything converts to a regular file.  For lfs -> normal,
 there's no 'lfs' destination repo requirement.  For normal -> lfs, there is.
 
   $ hg --config extensions.convert= --config 'lfs.track=none()' \
   >    convert repo8 convert_normal
   initializing destination convert_normal repository
   scanning source...
   sorting...
   converting...
   2 a
   1 b
   0 meta
   $ grep 'lfs' convert_normal/.hg/requires
   [1]
   $ hg --cwd convert_normal cat a1 -r 0 -T '{rawdata}'
   THIS-IS-LFS-BECAUSE-10-BYTES
 
   $ hg --config extensions.convert= --config lfs.threshold=10B \
   >    convert convert_normal convert_lfs
   initializing destination convert_lfs repository
   scanning source...
   sorting...
   converting...
   2 a
   1 b
   0 meta
 
   $ hg --cwd convert_lfs cat -r 0 a1 -T '{rawdata}'
   version https://git-lfs.github.com/spec/v1
   oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size 29
   x-is-binary 0
   $ hg --cwd convert_lfs debugdata a1 0
   version https://git-lfs.github.com/spec/v1
   oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size 29
   x-is-binary 0
   $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{lfspointer % '{key}={value}\n'}'}"
   version=https://git-lfs.github.com/spec/v1
   oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size=29
   x-is-binary=0
   $ hg --cwd convert_lfs log -r 0 \
   >    -T '{lfs_files % "{get(lfspointer, "oid")}\n"}{lfs_files % "{lfspointer.oid}\n"}'
   sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{lfspointer}\n"}'
   version=https://git-lfs.github.com/spec/v1 oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 size=29 x-is-binary=0
   $ hg --cwd convert_lfs \
   >     log -r 'all()' -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}'
   0: a1: 5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   1: a2: 5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   2: a2: 876dadc86a8542f9798048f2c47f51dbf8e4359aed883e8ec80c5db825f0d943
 
   $ grep 'lfs' convert_lfs/.hg/requires
   lfs
 
 The hashes in all stages of the conversion are unchanged.
 
   $ hg -R repo8 log -T '{node|short}\n'
   0fae949de7fa
   9cd6bdffdac0
   7f96794915f7
   $ hg -R convert_normal log -T '{node|short}\n'
   0fae949de7fa
   9cd6bdffdac0
   7f96794915f7
   $ hg -R convert_lfs log -T '{node|short}\n'
   0fae949de7fa
   9cd6bdffdac0
   7f96794915f7
 
 This convert is trickier, because it contains deleted files (via `hg mv`)
 
   $ hg --config extensions.convert= --config lfs.threshold=1000M \
   >    convert repo3 convert_normal2
   initializing destination convert_normal2 repository
   scanning source...
   sorting...
   converting...
   4 commit with lfs content
   3 renames
   2 large to small, small to large
   1 random modifications
   0 switch large and small again
   $ grep 'lfs' convert_normal2/.hg/requires
   [1]
   $ hg --cwd convert_normal2 debugdata large 0
   LONGER-THAN-TEN-BYTES-WILL-TRIGGER-LFS
 
   $ hg --config extensions.convert= --config lfs.threshold=10B \
   >    convert convert_normal2 convert_lfs2
   initializing destination convert_lfs2 repository
   scanning source...
   sorting...
   converting...
   4 commit with lfs content
   3 renames
   2 large to small, small to large
   1 random modifications
   0 switch large and small again
   $ grep 'lfs' convert_lfs2/.hg/requires
   lfs
   $ hg --cwd convert_lfs2 debugdata large 0
   version https://git-lfs.github.com/spec/v1
   oid sha256:66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
   size 39
   x-is-binary 0
 
   $ hg -R convert_lfs2 config --debug extensions | grep lfs
   $TESTTMP/convert_lfs2/.hg/hgrc:*: extensions.lfs= (glob)
 
 Committing deleted files works:
 
   $ hg init $TESTTMP/repo-del
   $ cd $TESTTMP/repo-del
   $ echo 1 > A
   $ hg commit -m 'add A' -A A
   $ hg rm A
   $ hg commit -m 'rm A'
 
 Bad .hglfs files will block the commit with a useful message
 
   $ cat > .hglfs << EOF
   > [track]
   > **.test = size(">5B")
   > bad file ... no commit
   > EOF
 
   $ echo x > file.txt
   $ hg ci -Aqm 'should fail'
   hg: parse error at .hglfs:3: bad file ... no commit
   [255]
 
   $ cat > .hglfs << EOF
   > [track]
   > **.test = size(">5B")
   > ** = nonexistent()
   > EOF
 
   $ hg ci -Aqm 'should fail'
   abort: parse error in .hglfs: unknown identifier: nonexistent
   [255]
 
 '**' works out to mean all files.
 
   $ cat > .hglfs << EOF
   > [track]
   > path:.hglfs = none()
   > **.test = size(">5B")
   > **.exclude = none()
   > ** = size(">10B")
   > EOF
 
 The LFS policy takes effect without tracking the .hglfs file
 
   $ echo 'largefile' > lfs.test
   $ echo '012345678901234567890' > nolfs.exclude
   $ echo '01234567890123456' > lfs.catchall
   $ hg add *
   $ hg ci -qm 'before add .hglfs'
   $ hg log -r . -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}\n'
   2: lfs.catchall: d4ec46c2869ba22eceb42a729377432052d9dd75d82fc40390ebaadecee87ee9
   lfs.test: 5489e6ced8c36a7b267292bde9fd5242a5f80a7482e8f23fa0477393dfaa4d6c
   
 The .hglfs file works when tracked
 
   $ echo 'largefile2' > lfs.test
   $ echo '012345678901234567890a' > nolfs.exclude
   $ echo '01234567890123456a' > lfs.catchall
   $ hg ci -Aqm 'after adding .hglfs'
   $ hg log -r . -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}\n'
   3: lfs.catchall: 31f43b9c62b540126b0ad5884dc013d21a61c9329b77de1fceeae2fc58511573
   lfs.test: 8acd23467967bc7b8cc5a280056589b0ba0b17ff21dbd88a7b6474d6290378a6
   
 The LFS policy stops when the .hglfs is gone
 
   $ mv .hglfs .hglfs_
   $ echo 'largefile3' > lfs.test
   $ echo '012345678901234567890abc' > nolfs.exclude
   $ echo '01234567890123456abc' > lfs.catchall
   $ hg ci -qm 'file test' -X .hglfs
   $ hg log -r . -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}\n'
   4: 
 
   $ mv .hglfs_ .hglfs
   $ echo '012345678901234567890abc' > lfs.test
   $ hg ci -m 'back to lfs'
   $ hg rm lfs.test
   $ hg ci -qm 'remove lfs'
 
 {lfs_files} will list deleted files too
 
   $ hg log -T "{lfs_files % '{rev} {file}: {lfspointer.oid}\n'}"
   6 lfs.test: 
   5 lfs.test: sha256:43f8f41171b6f62a6b61ba4ce98a8a6c1649240a47ebafd43120aa215ac9e7f6
   3 lfs.catchall: sha256:31f43b9c62b540126b0ad5884dc013d21a61c9329b77de1fceeae2fc58511573
   3 lfs.test: sha256:8acd23467967bc7b8cc5a280056589b0ba0b17ff21dbd88a7b6474d6290378a6
   2 lfs.catchall: sha256:d4ec46c2869ba22eceb42a729377432052d9dd75d82fc40390ebaadecee87ee9
   2 lfs.test: sha256:5489e6ced8c36a7b267292bde9fd5242a5f80a7482e8f23fa0477393dfaa4d6c
 
   $ hg log -r 'file("set:lfs()")' -T '{rev} {join(lfs_files, ", ")}\n'
   2 lfs.catchall, lfs.test
   3 lfs.catchall, lfs.test
   5 lfs.test
   6 lfs.test
 
   $ cd ..
 
 Unbundling adds a requirement to a non-lfs repo, if necessary.
 
   $ hg bundle -R $TESTTMP/repo-del -qr 0 --base null nolfs.hg
   $ hg bundle -R convert_lfs2 -qr tip --base null lfs.hg
   $ hg init unbundle
   $ hg pull -R unbundle -q nolfs.hg
   $ grep lfs unbundle/.hg/requires
   [1]
   $ hg pull -R unbundle -q lfs.hg
   $ grep lfs unbundle/.hg/requires
   lfs
 
   $ hg init no_lfs
   $ cat >> no_lfs/.hg/hgrc <<EOF
   > [experimental]
   > changegroup3 = True
   > [extensions]
   > lfs=!
   > EOF
   $ cp -R no_lfs no_lfs2
 
 Pushing from a local lfs repo to a local repo without an lfs requirement and
 with lfs disabled, fails.
 
   $ hg push -R convert_lfs2 no_lfs
   pushing to no_lfs
   abort: required features are not supported in the destination: lfs
   [255]
   $ grep lfs no_lfs/.hg/requires
   [1]
 
 Pulling from a local lfs repo to a local repo without an lfs requirement and
 with lfs disabled, fails.
 
   $ hg pull -R no_lfs2 convert_lfs2
   pulling from convert_lfs2
   abort: required features are not supported in the destination: lfs
   [255]
   $ grep lfs no_lfs2/.hg/requires
   [1]

tests/test-resolve.t

@@ -1,367 +1,372 b''
 test that a commit clears the merge state.
 
   $ hg init repo
   $ cd repo
 
   $ echo foo > file1
   $ echo foo > file2
   $ hg commit -Am 'add files'
   adding file1
   adding file2
 
   $ echo bar >> file1
   $ echo bar >> file2
   $ hg commit -Am 'append bar to files'
 
 create a second head with conflicting edits
 
   $ hg up -C 0
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo baz >> file1
   $ echo baz >> file2
   $ hg commit -Am 'append baz to files'
   created new head
 
 create a third head with no conflicting edits
   $ hg up -qC 0
   $ echo foo > file3
   $ hg commit -Am 'add non-conflicting file'
   adding file3
   created new head
 
 failing merge
 
   $ hg up -qC 2
   $ hg merge --tool=internal:fail 1
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
 resolve -l should contain unresolved entries
 
   $ hg resolve -l
   U file1
   U file2
 
   $ hg resolve -l --no-status
   file1
   file2
 
 resolving an unknown path should emit a warning, but not for -l
 
   $ hg resolve -m does-not-exist
   arguments do not match paths that need resolving
   $ hg resolve -l does-not-exist
 
 tell users how they could have used resolve
 
   $ mkdir nested
   $ cd nested
   $ hg resolve -m file1
   arguments do not match paths that need resolving
   (try: hg resolve -m path:file1)
   $ hg resolve -m file1 filez
   arguments do not match paths that need resolving
   (try: hg resolve -m path:file1 path:filez)
   $ hg resolve -m path:file1 path:filez
   $ hg resolve -l
   R file1
   U file2
   $ hg resolve -m filez file2
   arguments do not match paths that need resolving
   (try: hg resolve -m path:filez path:file2)
   $ hg resolve -m path:filez path:file2
   (no more unresolved files)
   $ hg resolve -l
   R file1
   R file2
 
 cleanup
   $ hg resolve -u
   $ cd ..
   $ rmdir nested
 
 don't allow marking or unmarking driver-resolved files
 
   $ cat > $TESTTMP/markdriver.py << EOF
   > '''mark and unmark files as driver-resolved'''
-  > from mercurial import merge, registrar, scmutil, pycompat
+  > from mercurial import (
+  >    merge,
+  >    pycompat,
+  >    registrar,
+  >    scmutil,
+  > )
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'markdriver',
   >   [(b'u', b'unmark', None, b'')],
   >   b'FILE...')
   > def markdriver(ui, repo, *pats, **opts):
   >     wlock = repo.wlock()
   >     opts = pycompat.byteskwargs(opts)
   >     try:
   >         ms = merge.mergestate.read(repo)
   >         m = scmutil.match(repo[None], pats, opts)
   >         for f in ms:
   >             if not m(f):
   >                 continue
   >             if not opts[b'unmark']:
   >                 ms.mark(f, b'd')
   >             else:
   >                 ms.mark(f, b'u')
   >         ms.commit()
   >     finally:
   >         wlock.release()
   > EOF
   $ hg --config extensions.markdriver=$TESTTMP/markdriver.py markdriver file1
   $ hg resolve --list
   D file1
   U file2
   $ hg resolve --mark file1
   not marking file1 as it is driver-resolved
 this should not print out file1
   $ hg resolve --mark --all
   (no more unresolved files -- run "hg resolve --all" to conclude)
   $ hg resolve --mark 'glob:file*'
   (no more unresolved files -- run "hg resolve --all" to conclude)
   $ hg resolve --list
   D file1
   R file2
   $ hg resolve --unmark file1
   not unmarking file1 as it is driver-resolved
   (no more unresolved files -- run "hg resolve --all" to conclude)
   $ hg resolve --unmark --all
   $ hg resolve --list
   D file1
   U file2
   $ hg --config extensions.markdriver=$TESTTMP/markdriver.py markdriver --unmark file1
   $ hg resolve --list
   U file1
   U file2
 
 resolve the failure
 
   $ echo resolved > file1
   $ hg resolve -m file1
 
 resolve -l should show resolved file as resolved
 
   $ hg resolve -l
   R file1
   U file2
 
   $ hg resolve -l -Tjson
   [
    {
     "path": "file1",
     "status": "R"
    },
    {
     "path": "file2",
     "status": "U"
    }
   ]
 
 resolve -m without paths should mark all resolved
 
   $ hg resolve -m
   (no more unresolved files)
   $ hg commit -m 'resolved'
 
 resolve -l should be empty after commit
 
   $ hg resolve -l
 
   $ hg resolve -l -Tjson
   [
   ]
 
 resolve --all should abort when no merge in progress
 
   $ hg resolve --all
   abort: resolve command not applicable when not merging
   [255]
 
 resolve -m should abort when no merge in progress
 
   $ hg resolve -m
   abort: resolve command not applicable when not merging
   [255]
 
 can not update or merge when there are unresolved conflicts
 
   $ hg up -qC 0
   $ echo quux >> file1
   $ hg up 1
   merging file1
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1]
   $ hg up 0
   abort: outstanding merge conflicts
   [255]
   $ hg merge 2
   abort: outstanding merge conflicts
   [255]
   $ hg merge --force 2
   abort: outstanding merge conflicts
   [255]
 
 set up conflict-free merge
 
   $ hg up -qC 3
   $ hg merge 1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 resolve --all should do nothing in merge without conflicts
   $ hg resolve --all
   (no more unresolved files)
 
 resolve -m should do nothing in merge without conflicts
 
   $ hg resolve -m
   (no more unresolved files)
 
 get back to conflicting state
 
   $ hg up -qC 2
   $ hg merge --tool=internal:fail 1
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
 
 resolve without arguments should suggest --all
   $ hg resolve
   abort: no files or directories specified
   (use --all to re-merge all unresolved files)
   [255]
 
 resolve --all should re-merge all unresolved files
   $ hg resolve --all
   merging file1
   merging file2
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ cat file1.orig
   foo
   baz
   $ cat file2.orig
   foo
   baz
 
 .orig files should exists where specified
   $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
   merging file1
   creating directory: $TESTTMP/repo/.hg/origbackups
   merging file2
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ ls .hg/origbackups
   file1
   file2
   $ grep '<<<' file1 > /dev/null
   $ grep '<<<' file2 > /dev/null
 
 resolve <file> should re-merge file
   $ echo resolved > file1
   $ hg resolve -q file1
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   [1]
   $ grep '<<<' file1 > /dev/null
 
 test .orig behavior with resolve
 
   $ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'"
   $TESTTMP/repo/file1.orig:
   >>>
   foo
   baz
   <<<
 
 resolve <file> should do nothing if 'file' was marked resolved
   $ echo resolved > file1
   $ hg resolve -m file1
   $ hg resolve -q file1
   $ cat file1
   resolved
 
 insert unsupported advisory merge record
 
   $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
   $ hg debugmergestate
   * version 2 records
   local: 57653b9f834a4493f7240b0681efcb9ae7cab745
   other: dc77451844e37f03f5c559e3b8529b2b48d381d1
   labels:
     local: working copy
     other: merge rev
   unrecognized entry: x	advisory record
   file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
   file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
     local path: file1 (flags "")
     ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
     other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
   file extras: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
   file: file2 (record type "F", state "u", hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523)
     local path: file2 (flags "")
     ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
     other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
   $ hg resolve -l
   R file1
   U file2
 
 insert unsupported mandatory merge record
 
   $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
   $ hg debugmergestate
   * version 2 records
   local: 57653b9f834a4493f7240b0681efcb9ae7cab745
   other: dc77451844e37f03f5c559e3b8529b2b48d381d1
   labels:
     local: working copy
     other: merge rev
   file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
   file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
     local path: file1 (flags "")
     ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
     other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
   file extras: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
   file: file2 (record type "F", state "u", hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523)
     local path: file2 (flags "")
     ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
     other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
   unrecognized entry: X	mandatory record
   $ hg resolve -l
   abort: unsupported merge state records: X
   (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
   [255]
   $ hg resolve -ma
   abort: unsupported merge state records: X
   (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
   [255]
   $ hg summary
   warning: merge state has unsupported record types: X
   parent: 2:57653b9f834a 
    append baz to files
   parent: 1:dc77451844e3 
    append bar to files
   branch: default
   commit: 2 modified, 2 unknown (merge)
   update: 2 new changesets (update)
   phases: 5 draft
 
 update --clean shouldn't abort on unsupported records
 
   $ hg up -qC 1
   $ hg debugmergestate
   no merge state found
 
 test crashed merge with empty mergestate
 
   $ mkdir .hg/merge
   $ touch .hg/merge/state
 
 resolve -l should be empty
 
   $ hg resolve -l
 
   $ cd ..

tests/test-rollback.t

@@ -1,466 +1,466 b''
 setup repo
   $ hg init t
   $ cd t
   $ echo a > a
   $ hg commit -Am'add a'
   adding a
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
   $ hg parents
   changeset:   0:1f0dee641bb7
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
 
 rollback to null revision
   $ hg status
   $ hg rollback
   repository tip rolled back to revision -1 (undo commit)
   working directory now based on revision -1
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   0 files, 0 changesets, 0 total revisions
   $ hg parents
   $ hg status
   A a
 
 Two changesets this time so we rollback to a real changeset
   $ hg commit -m'add a again'
   $ echo a >> a
   $ hg commit -m'modify a'
 
 Test issue 902 (current branch is preserved)
   $ hg branch test
   marked working directory as branch test
   (branches are permanent and global, did you want a bookmark?)
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   working directory now based on revision 0
   $ hg branch
   default
 
 Test issue 1635 (commit message saved)
   $ cat .hg/last-message.txt ; echo
   modify a
 
 Test rollback of hg before issue 902 was fixed
 
   $ hg commit -m "test3"
   $ hg branch test
   marked working directory as branch test
   (branches are permanent and global, did you want a bookmark?)
   $ rm .hg/undo.branch
   $ hg rollback
   repository tip rolled back to revision 0 (undo commit)
   named branch could not be reset: current branch is still 'test'
   working directory now based on revision 0
   $ hg branch
   test
 
 working dir unaffected by rollback: do not restore dirstate et. al.
   $ hg log --template '{rev}  {branch}  {desc|firstline}\n'
   0  default  add a again
   $ hg status
   M a
   $ hg bookmark foo
   $ hg commit -m'modify a again'
   $ echo b > b
   $ hg bookmark bar -r default #making bar active, before the transaction
   $ hg commit -Am'add b'
   adding b
   $ hg log --template '{rev}  {branch}  {desc|firstline}\n'
   2  test  add b
   1  test  modify a again
   0  default  add a again
   $ hg update bar
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (activating bookmark bar)
   $ cat .hg/undo.branch ; echo
   test
   $ hg rollback -f
   repository tip rolled back to revision 1 (undo commit)
   $ hg id -n
   0
   $ hg branch
   default
   $ cat .hg/bookmarks.current ; echo
   bar
   $ hg bookmark --delete foo bar
 
 rollback by pretxncommit saves commit message (issue1635)
 
   $ echo a >> a
   $ hg --config hooks.pretxncommit=false commit -m"precious commit message"
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status * (glob)
   [255]
   $ cat .hg/last-message.txt ; echo
   precious commit message
 
 same thing, but run $EDITOR
 
   $ cat > editor.sh << '__EOF__'
   > echo "another precious commit message" > "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
   note: commit message saved in .hg/last-message.txt
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status * (glob)
   [255]
   $ cat .hg/last-message.txt
   another precious commit message
 
 test rollback on served repository
 
 #if serve
   $ hg commit -m "precious commit message"
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
   $ hg clone http://localhost:$HGPORT u
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 1 files (+1 heads)
   new changesets 23b0221f3370:068774709090
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd u
   $ hg id default
   068774709090
 
 now rollback and observe that 'hg serve' reloads the repository and
 presents the correct tip changeset:
 
   $ hg -R ../t rollback
   repository tip rolled back to revision 1 (undo commit)
   working directory now based on revision 0
   $ hg id default
   791dd2169706
 
   $ killdaemons.py
 #endif
 
 update to older changeset and then refuse rollback, because
 that would lose data (issue2998)
   $ cd ../t
   $ hg -q update
   $ rm `hg status -un`
   $ template='{rev}:{node|short}  [{branch}]  {desc|firstline}\n'
   $ echo 'valuable new file' > b
   $ echo 'valuable modification' >> a
   $ hg commit -A -m'a valuable change'
   adding b
   $ hg update 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rollback
   abort: rollback of last commit while not checked out may lose data
   (use -f to force)
   [255]
   $ hg tip -q
   2:4d9cd3795eea
   $ hg rollback -f
   repository tip rolled back to revision 1 (undo commit)
   $ hg status
   $ hg log --removed b   # yep, it's gone
 
 same again, but emulate an old client that doesn't write undo.desc
   $ hg -q update
   $ echo 'valuable modification redux' >> a
   $ hg commit -m'a valuable change redux'
   $ rm .hg/undo.desc
   $ hg update 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg rollback
   rolling back unknown transaction
   $ cat a
   a
 
 corrupt journal test
   $ echo "foo" > .hg/store/journal
   $ hg recover
   rolling back interrupted transaction
   couldn't read journal entry 'foo\n'!
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
 
 rollback disabled by config
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > rollback = false
   > EOF
   $ echo narf >> pinky-sayings.txt
   $ hg add pinky-sayings.txt
   $ hg ci -m 'First one.'
   $ hg rollback
   abort: rollback is disabled because it is unsafe
   (see `hg help -v rollback` for information)
   [255]
 
   $ cd ..
 
 I/O errors on stdio are handled properly (issue5658)
 
   $ cat > badui.py << EOF
   > import errno
   > from mercurial.i18n import _
   > from mercurial import (
+  >     error,
   >     registrar,
-  >     error,
   >     ui as uimod,
   > )
   > 
   > configtable = {}
   > configitem = registrar.configitem(configtable)
   > 
   > configitem(b'ui', b'ioerrors',
   >     default=list,
   > )
   > 
   > def pretxncommit(ui, repo, **kwargs):
   >     ui.warn(b'warn during pretxncommit\n')
   > 
   > def pretxnclose(ui, repo, **kwargs):
   >     ui.warn(b'warn during pretxnclose\n')
   > 
   > def txnclose(ui, repo, **kwargs):
   >     ui.warn(b'warn during txnclose\n')
   > 
   > def txnabort(ui, repo, **kwargs):
   >     ui.warn(b'warn during abort\n')
   > 
   > class fdproxy(object):
   >     def __init__(self, ui, o):
   >         self._ui = ui
   >         self._o = o
   > 
   >     def __getattr__(self, attr):
   >         return getattr(self._o, attr)
   > 
   >     def write(self, msg):
   >         errors = set(self._ui.configlist(b'ui', b'ioerrors'))
   >         pretxncommit = msg == b'warn during pretxncommit\n'
   >         pretxnclose = msg == b'warn during pretxnclose\n'
   >         txnclose = msg == b'warn during txnclose\n'
   >         txnabort = msg == b'warn during abort\n'
   >         msgabort = msg == _(b'transaction abort!\n')
   >         msgrollback = msg == _(b'rollback completed\n')
   > 
   >         if pretxncommit and b'pretxncommit' in errors:
   >             raise IOError(errno.EPIPE, 'simulated epipe')
   >         if pretxnclose and b'pretxnclose' in errors:
   >             raise IOError(errno.EIO, 'simulated eio')
   >         if txnclose and b'txnclose' in errors:
   >             raise IOError(errno.EBADF, 'simulated badf')
   >         if txnabort and b'txnabort' in errors:
   >             raise IOError(errno.EPIPE, 'simulated epipe')
   >         if msgabort and b'msgabort' in errors:
   >             raise IOError(errno.EBADF, 'simulated ebadf')
   >         if msgrollback and b'msgrollback' in errors:
   >             raise IOError(errno.EIO, 'simulated eio')
   > 
   >         return self._o.write(msg)
   > 
   > def uisetup(ui):
   >     class badui(ui.__class__):
   >         def write_err(self, *args, **kwargs):
   >             olderr = self.ferr
   >             try:
   >                 self.ferr = fdproxy(self, olderr)
   >                 return super(badui, self).write_err(*args, **kwargs)
   >             finally:
   >                 self.ferr = olderr
   > 
   >     ui.__class__ = badui
   > 
   > def reposetup(ui, repo):
   >     ui.setconfig(b'hooks', b'pretxnclose.badui', pretxnclose, b'badui')
   >     ui.setconfig(b'hooks', b'txnclose.badui', txnclose, b'badui')
   >     ui.setconfig(b'hooks', b'pretxncommit.badui', pretxncommit, b'badui')
   >     ui.setconfig(b'hooks', b'txnabort.badui', txnabort, b'badui')
   > EOF
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > badui = $TESTTMP/badui.py
   > EOF
 
 An I/O error during pretxncommit is handled
 
   $ hg init ioerror-pretxncommit
   $ cd ioerror-pretxncommit
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
   $ echo 1 > foo
   $ hg --config ui.ioerrors=pretxncommit commit -m 'error during pretxncommit'
   warn during pretxnclose
   warn during txnclose
 
   $ hg commit -m 'commit 1'
   nothing changed
   [1]
 
   $ cd ..
 
 An I/O error during pretxnclose is handled
 
   $ hg init ioerror-pretxnclose
   $ cd ioerror-pretxnclose
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=pretxnclose commit -m 'error during pretxnclose'
   warn during pretxncommit
   warn during txnclose
 
   $ hg commit -m 'commit 1'
   nothing changed
   [1]
 
   $ cd ..
 
 An I/O error during txnclose is handled
 
   $ hg init ioerror-txnclose
   $ cd ioerror-txnclose
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=txnclose commit -m 'error during txnclose'
   warn during pretxncommit
   warn during pretxnclose
 
   $ hg commit -m 'commit 1'
   nothing changed
   [1]
 
   $ cd ..
 
 An I/O error writing "transaction abort" is handled
 
   $ hg init ioerror-msgabort
   $ cd ioerror-msgabort
 
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=msgabort --config hooks.pretxncommit=false commit -m 'error during abort message'
   warn during abort
   rollback completed
   abort: pretxncommit hook exited with status 1
   [255]
 
   $ hg commit -m 'commit 1'
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ cd ..
 
 An I/O error during txnabort should still result in rollback
 
   $ hg init ioerror-txnabort
   $ cd ioerror-txnabort
 
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
   $ hg --config ui.ioerrors=txnabort --config hooks.pretxncommit=false commit -m 'error during abort'
   transaction abort!
   rollback completed
   abort: pretxncommit hook exited with status 1
   [255]
 
   $ hg commit -m 'commit 1'
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ cd ..
 
 An I/O error writing "rollback completed" is handled
 
   $ hg init ioerror-msgrollback
   $ cd ioerror-msgrollback
 
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
 
   $ hg --config ui.ioerrors=msgrollback --config hooks.pretxncommit=false commit -m 'error during rollback message'
   transaction abort!
   warn during abort
   abort: pretxncommit hook exited with status 1
   [255]
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
 
   $ cd ..
 
 Multiple I/O errors after transaction open are handled.
 This is effectively what happens if a peer disconnects in the middle
 of a transaction.
 
   $ hg init ioerror-multiple
   $ cd ioerror-multiple
   $ echo 0 > foo
   $ hg -q commit -A -m initial
   warn during pretxncommit
   warn during pretxnclose
   warn during txnclose
 
   $ echo 1 > foo
 
   $ hg --config ui.ioerrors=pretxncommit,pretxnclose,txnclose,txnabort,msgabort,msgrollback commit -m 'multiple errors'
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
 
   $ cd ..

tests/test-split.t

@@ -1,530 +1,531 b''
 #testcases obsstore-on obsstore-off
 
   $ cat > $TESTTMP/editor.py <<EOF
   > #!$PYTHON
-  > import os, sys
+  > import os
+  > import sys
   > path = os.path.join(os.environ['TESTTMP'], 'messages')
   > messages = open(path).read().split('--\n')
   > prompt = open(sys.argv[1]).read()
   > sys.stdout.write(''.join('EDITOR: %s' % l for l in prompt.splitlines(True)))
   > sys.stdout.flush()
   > with open(sys.argv[1], 'w') as f:
   >    f.write(messages[0])
   > with open(path, 'w') as f:
   >    f.write('--\n'.join(messages[1:]))
   > EOF
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > drawdag=$TESTDIR/drawdag.py
   > split=
   > [ui]
   > interactive=1
   > color=no
   > paginate=never
   > [diff]
   > git=1
   > unified=0
   > [alias]
   > glog=log -G -T '{rev}:{node|short} {desc} {bookmarks}\n'
   > EOF
 
 #if obsstore-on
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > evolution=all
   > EOF
 #endif
 
   $ hg init a
   $ cd a
 
 Nothing to split
 
   $ hg split
   nothing to split
   [1]
 
   $ hg commit -m empty --config ui.allowemptycommit=1
   $ hg split
   abort: cannot split an empty revision
   [255]
 
   $ rm -rf .hg
   $ hg init
 
 Cannot split working directory
 
   $ hg split -r 'wdir()'
   abort: cannot split working directory
   [255]
 
 Generate some content.  The sed filter drop CR on Windows, which is dropped in
 the a > b line.
 
   $ $TESTDIR/seq.py 1 5 | sed 's/\r$//' >> a
   $ hg ci -m a1 -A a -q
   $ hg bookmark -i r1
   $ sed 's/1/11/;s/3/33/;s/5/55/' a > b
   $ mv b a
   $ hg ci -m a2 -q
   $ hg bookmark -i r2
 
 Cannot split a public changeset
 
   $ hg phase --public -r 'all()'
   $ hg split .
   abort: cannot split public changeset
   (see 'hg help phases' for details)
   [255]
 
   $ hg phase --draft -f -r 'all()'
 
 Cannot split while working directory is dirty
 
   $ touch dirty
   $ hg add dirty
   $ hg split .
   abort: uncommitted changes
   [255]
   $ hg forget dirty
   $ rm dirty
 
 Split a head
 
   $ cp -R . ../b
   $ cp -R . ../c
 
   $ hg bookmark r3
 
   $ hg split 'all()'
   abort: cannot split multiple revisions
   [255]
 
   $ runsplit() {
   > cat > $TESTTMP/messages <<EOF
   > split 1
   > --
   > split 2
   > --
   > split 3
   > EOF
   > cat <<EOF | hg split "$@"
   > y
   > y
   > y
   > y
   > y
   > y
   > EOF
   > }
 
   $ HGEDITOR=false runsplit
   diff --git a/a b/a
   1 hunks, 1 lines changed
   examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -5,1 +5,1 @@ 4
   -5
   +55
   record this change to 'a'? [Ynesfdaq?] y
   
   transaction abort!
   rollback completed
   abort: edit failed: false exited with status 1
   [255]
   $ hg status
 
   $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py"
   $ runsplit
   diff --git a/a b/a
   1 hunks, 1 lines changed
   examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -5,1 +5,1 @@ 4
   -5
   +55
   record this change to 'a'? [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset.
   EDITOR: a2
   EDITOR: 
   EDITOR: 
   EDITOR: HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   EDITOR: HG: Leave message empty to abort commit.
   EDITOR: HG: --
   EDITOR: HG: user: test
   EDITOR: HG: branch 'default'
   EDITOR: HG: changed a
   created new head
   diff --git a/a b/a
   1 hunks, 1 lines changed
   examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -3,1 +3,1 @@ 2
   -3
   +33
   record this change to 'a'? [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
   EDITOR: HG: - e704349bd21b: split 1
   EDITOR: HG: Write commit message for the next split changeset.
   EDITOR: a2
   EDITOR: 
   EDITOR: 
   EDITOR: HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   EDITOR: HG: Leave message empty to abort commit.
   EDITOR: HG: --
   EDITOR: HG: user: test
   EDITOR: HG: branch 'default'
   EDITOR: HG: changed a
   diff --git a/a b/a
   1 hunks, 1 lines changed
   examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,1 +1,1 @@
   -1
   +11
   record this change to 'a'? [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
   EDITOR: HG: - e704349bd21b: split 1
   EDITOR: HG: - a09ad58faae3: split 2
   EDITOR: HG: Write commit message for the next split changeset.
   EDITOR: a2
   EDITOR: 
   EDITOR: 
   EDITOR: HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   EDITOR: HG: Leave message empty to abort commit.
   EDITOR: HG: --
   EDITOR: HG: user: test
   EDITOR: HG: branch 'default'
   EDITOR: HG: changed a
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/1df0d5c5a3ab-8341b760-split.hg (obsstore-off !)
 
 #if obsstore-off
   $ hg bookmark
      r1                        0:a61bcde8c529
      r2                        3:00eebaf8d2e2
    * r3                        3:00eebaf8d2e2
   $ hg glog -p
   @  3:00eebaf8d2e2 split 3 r2 r3
   |  diff --git a/a b/a
   |  --- a/a
   |  +++ b/a
   |  @@ -1,1 +1,1 @@
   |  -1
   |  +11
   |
   o  2:a09ad58faae3 split 2
   |  diff --git a/a b/a
   |  --- a/a
   |  +++ b/a
   |  @@ -3,1 +3,1 @@
   |  -3
   |  +33
   |
   o  1:e704349bd21b split 1
   |  diff --git a/a b/a
   |  --- a/a
   |  +++ b/a
   |  @@ -5,1 +5,1 @@
   |  -5
   |  +55
   |
   o  0:a61bcde8c529 a1 r1
      diff --git a/a b/a
      new file mode 100644
      --- /dev/null
      +++ b/a
      @@ -0,0 +1,5 @@
      +1
      +2
      +3
      +4
      +5
   
 #else
   $ hg bookmark
      r1                        0:a61bcde8c529
      r2                        4:00eebaf8d2e2
    * r3                        4:00eebaf8d2e2
   $ hg glog
   @  4:00eebaf8d2e2 split 3 r2 r3
   |
   o  3:a09ad58faae3 split 2
   |
   o  2:e704349bd21b split 1
   |
   o  0:a61bcde8c529 a1 r1
   
 #endif
 
 Split a head while working parent is not that head
 
   $ cd $TESTTMP/b
 
   $ hg up 0 -q
   $ hg bookmark r3
 
   $ runsplit tip >/dev/null
 
 #if obsstore-off
   $ hg bookmark
      r1                        0:a61bcde8c529
      r2                        3:00eebaf8d2e2
    * r3                        0:a61bcde8c529
   $ hg glog
   o  3:00eebaf8d2e2 split 3 r2
   |
   o  2:a09ad58faae3 split 2
   |
   o  1:e704349bd21b split 1
   |
   @  0:a61bcde8c529 a1 r1 r3
   
 #else
   $ hg bookmark
      r1                        0:a61bcde8c529
      r2                        4:00eebaf8d2e2
    * r3                        0:a61bcde8c529
   $ hg glog
   o  4:00eebaf8d2e2 split 3 r2
   |
   o  3:a09ad58faae3 split 2
   |
   o  2:e704349bd21b split 1
   |
   @  0:a61bcde8c529 a1 r1 r3
   
 #endif
 
 Split a non-head
 
   $ cd $TESTTMP/c
   $ echo d > d
   $ hg ci -m d1 -A d
   $ hg bookmark -i d1
   $ echo 2 >> d
   $ hg ci -m d2
   $ echo 3 >> d
   $ hg ci -m d3
   $ hg bookmark -i d3
   $ hg up '.^' -q
   $ hg bookmark d2
   $ cp -R . ../d
 
   $ runsplit -r 1 | grep rebasing
   rebasing 2:b5c5ea414030 "d1" (d1)
   rebasing 3:f4a0a8d004cc "d2" (d2)
   rebasing 4:777940761eba "d3" (d3)
 #if obsstore-off
   $ hg bookmark
      d1                        4:c4b449ef030e
    * d2                        5:c9dd00ab36a3
      d3                        6:19f476bc865c
      r1                        0:a61bcde8c529
      r2                        3:00eebaf8d2e2
   $ hg glog -p
   o  6:19f476bc865c d3 d3
   |  diff --git a/d b/d
   |  --- a/d
   |  +++ b/d
   |  @@ -2,0 +3,1 @@
   |  +3
   |
   @  5:c9dd00ab36a3 d2 d2
   |  diff --git a/d b/d
   |  --- a/d
   |  +++ b/d
   |  @@ -1,0 +2,1 @@
   |  +2
   |
   o  4:c4b449ef030e d1 d1
   |  diff --git a/d b/d
   |  new file mode 100644
   |  --- /dev/null
   |  +++ b/d
   |  @@ -0,0 +1,1 @@
   |  +d
   |
   o  3:00eebaf8d2e2 split 3 r2
   |  diff --git a/a b/a
   |  --- a/a
   |  +++ b/a
   |  @@ -1,1 +1,1 @@
   |  -1
   |  +11
   |
   o  2:a09ad58faae3 split 2
   |  diff --git a/a b/a
   |  --- a/a
   |  +++ b/a
   |  @@ -3,1 +3,1 @@
   |  -3
   |  +33
   |
   o  1:e704349bd21b split 1
   |  diff --git a/a b/a
   |  --- a/a
   |  +++ b/a
   |  @@ -5,1 +5,1 @@
   |  -5
   |  +55
   |
   o  0:a61bcde8c529 a1 r1
      diff --git a/a b/a
      new file mode 100644
      --- /dev/null
      +++ b/a
      @@ -0,0 +1,5 @@
      +1
      +2
      +3
      +4
      +5
   
 #else
   $ hg bookmark
      d1                        8:c4b449ef030e
    * d2                        9:c9dd00ab36a3
      d3                        10:19f476bc865c
      r1                        0:a61bcde8c529
      r2                        7:00eebaf8d2e2
   $ hg glog
   o  10:19f476bc865c d3 d3
   |
   @  9:c9dd00ab36a3 d2 d2
   |
   o  8:c4b449ef030e d1 d1
   |
   o  7:00eebaf8d2e2 split 3 r2
   |
   o  6:a09ad58faae3 split 2
   |
   o  5:e704349bd21b split 1
   |
   o  0:a61bcde8c529 a1 r1
   
 #endif
 
 Split a non-head without rebase
 
   $ cd $TESTTMP/d
 #if obsstore-off
   $ runsplit -r 1 --no-rebase
   abort: cannot split changeset with children without rebase
   [255]
 #else
   $ runsplit -r 1 --no-rebase >/dev/null
   3 new orphan changesets
   $ hg bookmark
      d1                        2:b5c5ea414030
    * d2                        3:f4a0a8d004cc
      d3                        4:777940761eba
      r1                        0:a61bcde8c529
      r2                        7:00eebaf8d2e2
 
   $ hg glog
   o  7:00eebaf8d2e2 split 3 r2
   |
   o  6:a09ad58faae3 split 2
   |
   o  5:e704349bd21b split 1
   |
   | *  4:777940761eba d3 d3
   | |
   | @  3:f4a0a8d004cc d2 d2
   | |
   | *  2:b5c5ea414030 d1 d1
   | |
   | x  1:1df0d5c5a3ab a2
   |/
   o  0:a61bcde8c529 a1 r1
   
 #endif
 
 Split a non-head with obsoleted descendants
 
 #if obsstore-on
   $ hg init $TESTTMP/e
   $ cd $TESTTMP/e
   $ hg debugdrawdag <<'EOS'
   >   H I   J
   >   | |   |
   >   F G1 G2  # amend: G1 -> G2
   >   | |  /   # prune: F
   >   C D E
   >    \|/
   >     B
   >     |
   >     A
   > EOS
   2 new orphan changesets
   $ eval `hg tags -T '{tag}={node}\n'`
   $ rm .hg/localtags
   $ hg split $B --config experimental.evolution=createmarkers
   abort: split would leave orphaned changesets behind
   [255]
   $ cat > $TESTTMP/messages <<EOF
   > Split B
   > EOF
   $ cat <<EOF | hg split $B
   > y
   > y
   > EOF
   diff --git a/B b/B
   new file mode 100644
   examine changes to 'B'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +B
   \ No newline at end of file
   record this change to 'B'? [Ynesfdaq?] y
   
   EDITOR: HG: Splitting 112478962961. Write commit message for the first split changeset.
   EDITOR: B
   EDITOR: 
   EDITOR: 
   EDITOR: HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   EDITOR: HG: Leave message empty to abort commit.
   EDITOR: HG: --
   EDITOR: HG: user: test
   EDITOR: HG: branch 'default'
   EDITOR: HG: added B
   created new head
   rebasing 2:26805aba1e60 "C"
   rebasing 3:be0ef73c17ad "D"
   rebasing 4:49cb92066bfd "E"
   rebasing 7:97a6268cc7ef "G2"
   rebasing 10:e2f1e425c0db "J"
   $ hg glog -r 'sort(all(), topo)'
   o  16:556c085f8b52 J
   |
   o  15:8761f6c9123f G2
   |
   o  14:a7aeffe59b65 E
   |
   | o  13:e1e914ede9ab D
   |/
   | o  12:01947e9b98aa C
   |/
   o  11:0947baa74d47 Split B
   |
   | *  9:88ede1d5ee13 I
   | |
   | x  6:af8cbf225b7b G1
   | |
   | x  3:be0ef73c17ad D
   | |
   | | *  8:74863e5b5074 H
   | | |
   | | x  5:ee481a2a1e69 F
   | | |
   | | x  2:26805aba1e60 C
   | |/
   | x  1:112478962961 B
   |/
   o  0:426bada5c675 A
   
 #endif