[PATCH] convert: make hg sink update after conversion by default

Martin Geisler mg at lazybytes.net
Thu Sep 9 19:31:58 CDT 2010


# HG changeset patch
# User Martin Geisler <mg at lazybytes.net>
# Date 1284078713 -7200
# Node ID 2335775a82d068c6de82339a8f4f1c5a287c050d
# Parent  b5d9a08a402aa7d42861ca36705b8f52dc94a309
convert: make hg sink update after conversion by default

As for clone, a -U/--noupdate flag can be used to prevent this. Most
users want to see the files after the conversion, but the flag is
still useful for automated, repeated conversions where the working
copy is not needed.

The update is made to the default branch if it exists, otherwise tip
is used. This matches the behavior of clone.

diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -283,6 +283,8 @@
            _('destination repository type'), _('TYPE')),
           ('r', 'rev', '',
            _('import up to target revision REV'), _('REV')),
+          ('U', 'noupdate', False,
+           _('do not update working copy after conversion')),
           ('', 'authormap', '',
            _('remap usernames using this file'), _('FILE')),
           ('', 'filemap', '',
diff --git a/hgext/convert/common.py b/hgext/convert/common.py
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
@@ -225,7 +225,7 @@
     def before(self):
         pass
 
-    def after(self):
+    def after(self, update=False):
         pass
 
 
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -382,7 +382,7 @@
 
     def cleanup(self):
         try:
-            self.dest.after()
+            self.dest.after(not self.opts.get('noupdate'))
         finally:
             self.source.after()
         self.map.close()
diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -62,8 +62,10 @@
         self.wlock = self.repo.wlock()
         self.lock = self.repo.lock()
 
-    def after(self):
+    def after(self, update=False):
         self.ui.debug('run hg sink post-conversion action\n')
+        if update:
+            hg.clean(self.repo, 'tip')
         if self.lock:
             self.lock.release()
         if self.wlock:
diff --git a/tests/test-convert-authormap.out b/tests/test-convert-authormap.out
--- a/tests/test-convert-authormap.out
+++ b/tests/test-convert-authormap.out
@@ -5,6 +5,7 @@
 converting...
 0 foo
 Writing author map file new/.hg/authormap
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0
 user name=Long User Name
 changeset:   0:d89716e88087
@@ -18,6 +19,7 @@
 sorting...
 converting...
 0 foo
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0
 changeset:   0:d89716e88087
 tag:         tip
diff --git a/tests/test-convert-bzr b/tests/test-convert-bzr
--- a/tests/test-convert-bzr
+++ b/tests/test-convert-bzr
@@ -20,23 +20,23 @@
 bzr add -q a e
 bzr commit -q -m 'rename a into b, create a, rename c into d'
 cd ..
-hg convert source source-hg
+hg convert --noupdate source source-hg
 glog -R source-hg
 echo "% manifest"
 hg manifest -R source-hg -r tip
 echo "% test --rev option"
-hg convert -r 1 source source-1-hg
+hg convert --noupdate -r 1 source source-1-hg
 glog -R source-1-hg
 echo "% test with filemap"
 cat > filemap <<EOF
 exclude a
 EOF
-hg convert --filemap filemap source source-filemap-hg
+hg convert --noupdate --filemap filemap source source-filemap-hg
 hg -R source-filemap-hg manifest -r tip
 
 echo '% convert from lightweight checkout'
 bzr checkout --lightweight source source-light
-hg convert source-light source-light-hg
+hg convert --noupdate source-light source-light-hg
 echo "% lightweight manifest"
 hg manifest -R source-light-hg -r tip
 
@@ -92,7 +92,7 @@
 bzr merge -q ../source-improve
 bzr commit -q -m 'Merged improve branch'
 cd ..
-hg convert --datesort source source-hg
+hg convert --noupdate --datesort source source-hg
 glog -R source-hg
 cd ..
 
@@ -117,7 +117,7 @@
 bzr add -q newprog
 bzr commit -q -m 'Symlink changed, x bits changed'
 cd ..
-hg convert source source-hg
+hg convert --noupdate source source-hg
 manifest source-hg 0
 manifest source-hg tip
 cd source-hg
diff --git a/tests/test-convert-bzr-114 b/tests/test-convert-bzr-114
--- a/tests/test-convert-bzr-114
+++ b/tests/test-convert-bzr-114
@@ -25,6 +25,3 @@
 cd ..
 hg convert source source-hg
 manifest source-hg tip
-cd source-hg
-hg update
-cd ../..
diff --git a/tests/test-convert-bzr-114.out b/tests/test-convert-bzr-114.out
--- a/tests/test-convert-bzr-114.out
+++ b/tests/test-convert-bzr-114.out
@@ -6,6 +6,6 @@
 2 add d file
 1 replace with d dir
 0 add d/a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of tip
 644   d/a
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-convert-bzr-directories.out b/tests/test-convert-bzr-directories.out
--- a/tests/test-convert-bzr-directories.out
+++ b/tests/test-convert-bzr-directories.out
@@ -6,6 +6,7 @@
 2 Initial add
 1 Empty directory added
 0 Added file into directory
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of 1
 644   a
 % manifest of tip
@@ -19,6 +20,7 @@
 converting...
 1 Added directory
 0 Oops, typo
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of 0
 644   tpyo/something
 % manifest of tip
@@ -31,6 +33,7 @@
 converting...
 1 Added nested directories
 0 Moved secondlevel one level up
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of tip
 644   secondlevel/file
 644   secondlevel/thirdlevel/stuff
@@ -41,6 +44,7 @@
 converting...
 1 Added directory
 0 Removed directory
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of 0
 644   src/sourcecode
 % manifest of tip
@@ -53,6 +57,7 @@
 converting...
 1 Initial layout
 0 Some conflicting moves
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of tip
 644   second/file
 644   second/something
diff --git a/tests/test-convert-bzr-ghosts.out b/tests/test-convert-bzr-ghosts.out
--- a/tests/test-convert-bzr-ghosts.out
+++ b/tests/test-convert-bzr-ghosts.out
@@ -5,7 +5,8 @@
 converting...
 1 Initial layout setup
 0 Commit with ghost revision
-o  1 "Commit with ghost revision" files: somefile
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  1 "Commit with ghost revision" files: somefile
 |
 o  0 "Initial layout setup" files: somefile
 
diff --git a/tests/test-convert-bzr-merges.out b/tests/test-convert-bzr-merges.out
--- a/tests/test-convert-bzr-merges.out
+++ b/tests/test-convert-bzr-merges.out
@@ -8,7 +8,8 @@
 2 Added parent file
 1 Added brach2 file
 0 Merged branches
-o    5 "(octopus merge fixup)" files:
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@    5 "(octopus merge fixup)" files:
 |\
 | o    4 "Merged branches" files: file-branch2
 | |\
diff --git a/tests/test-convert-bzr-treeroot.out b/tests/test-convert-bzr-treeroot.out
--- a/tests/test-convert-bzr-treeroot.out
+++ b/tests/test-convert-bzr-treeroot.out
@@ -5,5 +5,6 @@
 converting...
 1 Initial add
 0 Changed root
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest of tip
 644   file
diff --git a/tests/test-convert-clonebranches b/tests/test-convert-clonebranches
--- a/tests/test-convert-clonebranches
+++ b/tests/test-convert-clonebranches
@@ -31,7 +31,7 @@
 EOF
 
 echo % convert
-hg convert -v --config convert.hg.clonebranches=1 source dest |
+hg convert -U -v --config convert.hg.clonebranches=1 source dest |
     python filter.py
 
 # Add a merge with both parents and child in different branches
@@ -49,6 +49,6 @@
 cd ..
 
 echo % incremental conversion
-hg convert -v --config convert.hg.clonebranches=1 source dest |
+hg convert -U -v --config convert.hg.clonebranches=1 source dest |
     python filter.py
 
diff --git a/tests/test-convert-cvs-branch.out b/tests/test-convert-cvs-branch.out
--- a/tests/test-convert-cvs-branch.out
+++ b/tests/test-convert-cvs-branch.out
@@ -37,8 +37,9 @@
 1 mod b
 0 mod a again
 updating tags
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % Check the result
-o  5 () update tags files: .hgtags
+@  5 () update tags files: .hgtags
 |
 | o  4 (BRANCH) mod a again files: a
 | |
diff --git a/tests/test-convert-cvs-detectmerge.out b/tests/test-convert-cvs-detectmerge.out
--- a/tests/test-convert-cvs-detectmerge.out
+++ b/tests/test-convert-cvs-detectmerge.out
@@ -93,6 +93,7 @@
 2 add other text [MERGE from HEAD]
 1 fix file1
 0 fix file1 [MERGE from v1-1]
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % complete log
 9: '' fix file1 [MERGE from v1-1]
 8: 'v1_1' fix file1
@@ -105,7 +106,7 @@
 1: 'v1_0' add text
 0: '' add file1 on trunk
 % graphical log
-o  9: '' fix file1 [MERGE from v1-1]
+@  9: '' fix file1 [MERGE from v1-1]
 |
 | o  8: 'v1_1' fix file1
 | |
diff --git a/tests/test-convert-cvs-synthetic.out b/tests/test-convert-cvs-synthetic.out
--- a/tests/test-convert-cvs-synthetic.out
+++ b/tests/test-convert-cvs-synthetic.out
@@ -80,8 +80,9 @@
 2 add file6 on trunk post-v1_2
 1 MERGE from v1_2: add file5
 0 MERGE from HEAD: add file6
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % hg glog output (#1)
-o  7 MERGE from HEAD: add file6
+@  7 MERGE from HEAD: add file6
 |
 | o  6 MERGE from v1_2: add file5
 | |
@@ -115,8 +116,9 @@
 2 add file6 on trunk post-v1_2
 1 MERGE from v1_2: add file5
 0 MERGE from HEAD: add file6
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % hg glog output (#2)
-o    7 MERGE from HEAD: add file6
+@    7 MERGE from HEAD: add file6
 |\
 | o  6 MERGE from v1_2: add file5
 | |
diff --git a/tests/test-convert-cvs.out b/tests/test-convert-cvs.out
--- a/tests/test-convert-cvs.out
+++ b/tests/test-convert-cvs.out
@@ -27,6 +27,7 @@
 1 import
 0 ci0
 updating tags
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 c
 c
@@ -48,6 +49,7 @@
 rolling back to revision 0 (undo commit)
 0 ci0
 updating tags
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 c
 c
 2 update tags files: .hgtags
@@ -68,6 +70,7 @@
 sorting...
 converting...
 updating tags
+18 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 c
 c
@@ -86,6 +89,7 @@
 sorting...
 converting...
 0 ci1
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 a
 c
@@ -103,6 +107,7 @@
 sorting...
 converting...
 0 ci1
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 c
 c
 c
@@ -127,6 +132,7 @@
 sorting...
 converting...
 0 ci2
+1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 c
 d
 % convert again with --filemap
@@ -141,6 +147,7 @@
 sorting...
 converting...
 0 ci2
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 c
 d
 4 ci2 files: b/c
@@ -167,7 +174,8 @@
 2 funny
 1 fuzzy
 0 fuzzy
-o  8 (branch) fuzzy files: b/c
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  8 (branch) fuzzy files: b/c
 |
 o  7 (branch) fuzzy files: a
 |
diff --git a/tests/test-convert-darcs.out b/tests/test-convert-darcs.out
--- a/tests/test-convert-darcs.out
+++ b/tests/test-convert-darcs.out
@@ -21,7 +21,8 @@
 2 p1.1
 1 p2
 0 p3
-o  4 "p3" files: dir/d dir/d2 dir2/d f ff
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  4 "p3" files: dir/d dir/d2 dir2/d f ff
 |
 o  3 "p2" files: a dir/d dir/d2 f
 |
diff --git a/tests/test-convert-datesort.out b/tests/test-convert-datesort.out
--- a/tests/test-convert-datesort.out
+++ b/tests/test-convert-datesort.out
@@ -19,8 +19,9 @@
 2 a5
 1 a6
 0 b1
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % graph converted repo
-o  8 "b1"
+@  8 "b1"
 |
 | o  7 "a6"
 | |
@@ -52,8 +53,9 @@
 2 a5
 1 a6
 0 b1
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % graph converted repo
-o  8 "b1"
+@  8 "b1"
 |
 | o  7 "a6"
 | |
diff --git a/tests/test-convert-git b/tests/test-convert-git
--- a/tests/test-convert-git
+++ b/tests/test-convert-git
@@ -52,7 +52,7 @@
 commit -m 'Merge branch other'
 cd ..
 
-hg convert --datesort git-repo
+hg convert --noupdate --datesort git-repo
 hg up -q -R git-repo-hg
 hg -R git-repo-hg tip -v
 
@@ -146,7 +146,6 @@
 hg convert git-repo3 git-repo3-hg
 
 cd git-repo3-hg
-hg up -C
 python -c 'print len(file("b", "rb").read())'
 cd ..
 
diff --git a/tests/test-convert-git.out b/tests/test-convert-git.out
--- a/tests/test-convert-git.out
+++ b/tests/test-convert-git.out
@@ -105,6 +105,7 @@
 converting...
 1 addfoo
 0 addfoo2
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 changeset:   1:d63e967f93da
 tag:         tip
 user:        nottest <test at example.org>
diff --git a/tests/test-convert-hg-sink b/tests/test-convert-hg-sink
--- a/tests/test-convert-hg-sink
+++ b/tests/test-convert-hg-sink
@@ -25,7 +25,7 @@
 hg log
 cd ..
 
-hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
+hg convert -U orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
 cd new
 hg out ../orig
 
@@ -45,7 +45,7 @@
 hg ci -qAm 'add baz'
 
 cd ..
-hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
+hg convert -U orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
 cd new
 hg out ../orig
 echo '% dirstate should be the same (no output below):'
diff --git a/tests/test-convert-hg-sink.out b/tests/test-convert-hg-sink.out
--- a/tests/test-convert-hg-sink.out
+++ b/tests/test-convert-hg-sink.out
@@ -58,5 +58,6 @@
 2 add foo/file
 1 Added tag some-tag for changeset ad681a868e44
 0 add baz
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 tip                                2:6f4fd1df87fb
 some-tag                           0:ba8636729451
diff --git a/tests/test-convert-hg-source.out b/tests/test-convert-hg-source.out
--- a/tests/test-convert-hg-source.out
+++ b/tests/test-convert-hg-source.out
@@ -20,6 +20,7 @@
 2 mark baz executable
 1 branch foo
 0 close
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 comparing with ../orig
 searching for changes
 no changes found
@@ -29,6 +30,7 @@
 converting...
 1 change foo again again
 0 change foo again
+2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % init broken repository
 created new head
 % break it
@@ -42,6 +44,7 @@
 2 changebagain
 1 merge
 0 moveb
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
diff --git a/tests/test-convert-hg-startrev.t b/tests/test-convert-hg-startrev.t
--- a/tests/test-convert-hg-startrev.t
+++ b/tests/test-convert-hg-startrev.t
@@ -42,6 +42,7 @@
   scanning source...
   sorting...
   converting...
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ glog empty
 
@@ -58,9 +59,10 @@
   2 3: change a
   1 4: merge 2 and 3, copy d from b
   0 5: change a
+  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ glog full
-  o  5 "5: change a" files: a
+  @  5 "5: change a" files: a
   |
   o    4 "4: merge 2 and 3, copy d from b" files: d e
   |\
@@ -83,9 +85,10 @@
   2 2: copy e from a, change b
   1 4: merge 2 and 3, copy d from b
   0 5: change a
+  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ glog conv1
-  o  3 "5: change a" files: a
+  @  3 "5: change a" files: a
   |
   o  2 "4: merge 2 and 3, copy d from b" files: a d e
   |
@@ -134,14 +137,13 @@
   converting...
   1 4: merge 2 and 3, copy d from b
   0 5: change a
+  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog conv4
-  o  1 "5: change a" files: a
+  @  1 "5: change a" files: a
   |
   o  0 "4: merge 2 and 3, copy d from b" files: a b c d e
   
   $ cd conv4
-  $ hg up -C
-  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg cat -r tip a b
   a
   a
diff --git a/tests/test-convert-hg-svn.out b/tests/test-convert-hg-svn.out
--- a/tests/test-convert-hg-svn.out
+++ b/tests/test-convert-hg-svn.out
@@ -8,6 +8,7 @@
 sorting...
 converting...
 0 added a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 scanning source...
 sorting...
 converting...
@@ -15,6 +16,7 @@
 scanning source...
 sorting...
 converting...
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 scanning source...
 sorting...
 converting...
@@ -32,6 +34,7 @@
 scanning source...
 sorting...
 converting...
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % hg back to svn should do nothing
 scanning source...
 sorting...
diff --git a/tests/test-convert-p4 b/tests/test-convert-p4
--- a/tests/test-convert-p4
+++ b/tests/test-convert-p4
@@ -48,7 +48,7 @@
 p4 submit -d "change b/c"
 
 echo % convert
-hg convert -s p4 $DEPOTPATH dst
+hg convert -U -s p4 $DEPOTPATH dst
 hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
 
 echo % change some files
diff --git a/tests/test-convert-p4-filetypes b/tests/test-convert-p4-filetypes
--- a/tests/test-convert-p4-filetypes
+++ b/tests/test-convert-p4-filetypes
@@ -86,7 +86,7 @@
 grep -H Header file_*
 
 echo % convert
-hg convert -s p4 $DEPOTPATH dst
+hg convert -U -s p4 $DEPOTPATH dst
 hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'g
 
 echo % revision 0
diff --git a/tests/test-convert-splicemap b/tests/test-convert-splicemap
--- a/tests/test-convert-splicemap
+++ b/tests/test-convert-splicemap
@@ -39,7 +39,7 @@
 cat > splicemap <<EOF
 $CHILDID2
 EOF
-hg convert --splicemap splicemap repo2 repo1
+hg convert -U --splicemap splicemap repo2 repo1
 
 echo '% splice repo2 on repo1'
 cat > splicemap <<EOF
@@ -47,5 +47,5 @@
 $CHILDID2 $PARENTID2,$CHILDID1
 EOF
 hg clone repo1 target1
-hg convert --splicemap splicemap repo2 target1
+hg convert -U --splicemap splicemap repo2 target1
 glog -R target1
diff --git a/tests/test-convert-svn-branches.out b/tests/test-convert-svn-branches.out
--- a/tests/test-convert-svn-branches.out
+++ b/tests/test-convert-svn-branches.out
@@ -14,12 +14,14 @@
 2 move to old2
 1 move back to old
 0 last change to a
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % convert again
 scanning source...
 sorting...
 converting...
 0 branch trunk at 1 into old3
-o  branch=newbranch 11 branch trunk at 1 into old3 files:
+0 files updated, 0 files merged, 3 files removed, 0 files unresolved
+@  branch=newbranch 11 branch trunk at 1 into old3 files:
 |
 | o  branch= 10 last change to a files: a
 | |
diff --git a/tests/test-convert-svn-encoding b/tests/test-convert-svn-encoding
--- a/tests/test-convert-svn-encoding
+++ b/tests/test-convert-svn-encoding
@@ -11,7 +11,6 @@
 echo '% convert while testing all possible outputs'
 hg --debug convert svn-repo A-hg > /dev/null
 cd A-hg
-hg up
 echo '% check tags are in UTF-8'
 python -c "print '\n'.join([('%r' % l) for l in file('.hgtags', 'rb').readlines()])"
 cd ..
diff --git a/tests/test-convert-svn-encoding.out b/tests/test-convert-svn-encoding.out
--- a/tests/test-convert-svn-encoding.out
+++ b/tests/test-convert-svn-encoding.out
@@ -1,5 +1,4 @@
 % convert while testing all possible outputs
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % check tags are in UTF-8
 '221c3fdaf24df5f14c0a64c597581e2eacfb47bb branch\xc3\xa9e\n'
 '7a40952c2db29cf00d9e31df3749e98d8a4bdcbf branch\xc3\xa9\n'
diff --git a/tests/test-convert-svn-move.out b/tests/test-convert-svn-move.out
--- a/tests/test-convert-svn-move.out
+++ b/tests/test-convert-svn-move.out
@@ -17,7 +17,8 @@
 2 copy dir and remove subdir
 1 add d4old
 0 rename d4old into d4new
-o  13 rename d4old into d4new files: d4new/g d4old/g
+6 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  13 rename d4old into d4new files: d4new/g d4old/g
 |
 o  12 add d4old files: d4old/g
 |
@@ -61,6 +62,7 @@
 2 clobber symlink
 1 clobber1
 0 clobber2
+5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % manifest before
 644   a
 644   d/b
@@ -113,6 +115,17 @@
                                                                                 
 getting files [==========================================================>] 1/1
                                                                                 
+updating [===========>                                                    ] 1/5
+updating [===========>                                                    ] 1/5
+updating [========================>                                       ] 2/5
+updating [========================>                                       ] 2/5
+updating [=====================================>                          ] 3/5
+updating [=====================================>                          ] 3/5
+updating [==================================================>             ] 4/5
+updating [==================================================>             ] 4/5
+updating [===============================================================>] 5/5
+updating [===============================================================>] 5/5
+                                                                                
 initializing destination hg-progress repository
 scanning source...
 sorting...
@@ -121,3 +134,4 @@
 2 clobber symlink
 1 clobber1
 0 clobber2
+5 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-convert-svn-source.out b/tests/test-convert-svn-source.out
--- a/tests/test-convert-svn-source.out
+++ b/tests/test-convert-svn-source.out
@@ -29,6 +29,7 @@
 1 world
 0 nice day
 updating tags
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % update svn repository again
 A         letter2.txt
 Sending        letter .txt
@@ -47,7 +48,8 @@
 1 second letter
 0 work in progress
 updating tags
-o  7 update tags files: .hgtags
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  7 update tags files: .hgtags
 |
 o  6 work in progress files: letter2.txt
 |
@@ -77,7 +79,8 @@
 2 nice day
 1 second letter
 0 work in progress
-o  1 work in progress files: letter2.txt
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  1 work in progress files: letter2.txt
 |
 o  0 second letter files: letter2.txt
 
@@ -87,5 +90,6 @@
 sorting...
 converting...
 0 init projB
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 extra:       branch=
 extra:       convert_revision=
diff --git a/tests/test-convert-svn-startrev.out b/tests/test-convert-svn-startrev.out
--- a/tests/test-convert-svn-startrev.out
+++ b/tests/test-convert-svn-startrev.out
@@ -7,7 +7,8 @@
 2 changeaa
 1 branch, changeaaa
 0 addc,changeaaaa
-o  3 addc,changeaaaa files: a c
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  3 addc,changeaaaa files: a c
 |
 o  2 branch, changeaaa files: a
 |
@@ -24,7 +25,8 @@
 2 changeaa
 1 branch, changeaaa
 0 addc,changeaaaa
-o  2 addc,changeaaaa files: a c
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  2 addc,changeaaaa files: a c
 |
 o  1 branch, changeaaa files: a
 |
@@ -38,7 +40,8 @@
 converting...
 1 branch, changeaaa
 0 addc,changeaaaa
-o  1 addc,changeaaaa files: a c
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  1 addc,changeaaaa files: a c
 |
 o  0 branch, changeaaa files: a
 
@@ -49,6 +52,7 @@
 sorting...
 converting...
 0 addc,changeaaaa
-o  0 addc,changeaaaa files: a c
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  0 addc,changeaaaa files: a c
 
 
diff --git a/tests/test-convert-svn-tags.out b/tests/test-convert-svn-tags.out
--- a/tests/test-convert-svn-tags.out
+++ b/tests/test-convert-svn-tags.out
@@ -10,7 +10,8 @@
 1 changea3
 0 changea
 updating tags
-o  6 update tags tags: tip
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  6 update tags tags: tip
 |
 o  5 changea tags: trunk.goodtag
 |
@@ -38,4 +39,5 @@
 2 changea2
 1 changea3
 0 changea
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 tip
diff --git a/tests/test-convert-tagsbranch-topology.out b/tests/test-convert-tagsbranch-topology.out
--- a/tests/test-convert-tagsbranch-topology.out
+++ b/tests/test-convert-tagsbranch-topology.out
@@ -4,12 +4,14 @@
 converting...
 0 rev1
 updating tags
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 scanning source...
 sorting...
 converting...
 0 rev2
 updating tags
-o  3 "update tags" files: .hgtags
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+@  3 "update tags" files: .hgtags
 |
 | o  2 "rev2" files: a
 | |
diff --git a/tests/test-convert.out b/tests/test-convert.out
--- a/tests/test-convert.out
+++ b/tests/test-convert.out
@@ -239,6 +239,7 @@
  -s --source-type TYPE  source repository type
  -d --dest-type TYPE    destination repository type
  -r --rev REV           import up to target revision REV
+ -U --noupdate          do not update working copy after conversion
     --authormap FILE    remap usernames using this file
     --filemap FILE      remap file names using contents of file
     --splicemap FILE    splice synthesized history into place
@@ -259,6 +260,7 @@
 2 c
 1 d
 0 e
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../a
 searching for changes
 no changes found
@@ -277,6 +279,7 @@
 2 c
 1 d
 0 e
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % test pre and post conversion actions
 run hg source pre-conversion action
 run hg sink pre-conversion action
@@ -311,6 +314,7 @@
 2 c
 1 d
 0 e
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % contents of fncache file:
 data/a.i
 data/b.i


More information about the Mercurial-devel mailing list