# HG changeset patch # User Dan Villiom Podlaski Christiansen <danchr@gmail.com> # Date 1634916947 -7200 # Fri Oct 22 17:35:47 2021 +0200 # Node ID d1340d62721fdd78ce6ac916734b459571db3e58 # Parent c2c2a8bdcce35a960a09f6af88ca6a4f33971890 pull: add a summary callback diff --git a/hggit/git_handler.py b/hggit/git_handler.py --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -834,6 +834,7 @@ tr = self.repo.transaction(desc) tr.addfinalize(b'hg-git-save', lambda tr: self.save_map(self.map_file)) + scmutil.registersummarycallback(self.repo, tr, b'pull') return tr diff --git a/tests/test-ambiguousprefix.t b/tests/test-ambiguousprefix.t --- a/tests/test-ambiguousprefix.t +++ b/tests/test-ambiguousprefix.t @@ -22,6 +22,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-branch-bookmark-suffix.t b/tests/test-branch-bookmark-suffix.t --- a/tests/test-branch-bookmark-suffix.t +++ b/tests/test-branch-bookmark-suffix.t @@ -100,6 +100,7 @@ $ hg pull ../gitrepo1 pulling from ../gitrepo1 importing git objects into hg + new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) (run 'hg heads' to see heads) $ hg log --graph o changeset: 4:faf44fc3a4e8 @@ -145,6 +146,7 @@ $ rm -r hgrepo $ hg clone -r branch3 gitrepo1 hgrepo importing git objects into hg + new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) updating to bookmark branch3_bookmark (hg57 !) updating to branch default (no-hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -190,6 +192,7 @@ $ rm -r hgrepo $ hg clone -r branch1 gitrepo1 hgrepo importing git objects into hg + new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) updating to branch branch1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo diff --git a/tests/test-clone.t b/tests/test-clone.t --- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -27,6 +27,7 @@ clone a tag $ hg clone -r alpha gitrepo hgrepo-a importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R hgrepo-a bookmarks @@ -48,6 +49,7 @@ clone a branch $ hg clone -r beta gitrepo hgrepo-b importing git objects into hg + new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R hgrepo-b bookmarks @@ -83,6 +85,7 @@ $ hg clone -r beta gitrepo hgrepo-c importing git objects into hg + new changesets ff7a2f2d8d70:47d12948785d (4 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R hgrepo-c bookmarks @@ -94,6 +97,7 @@ $ hg clone gitrepo hgrepo-base importing git objects into hg + new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to branch default (no-hg57 !) updating to bookmark beta (hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -125,6 +129,7 @@ $ cd .. $ hg clone gitrepo hgrepo-2 importing git objects into hg + new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to bookmark master (hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (hg57 !) updating to branch default (no-hg57 !) @@ -148,11 +153,13 @@ #if hg57 $ hg clone gitrepo hgrepo-2 importing git objects into hg + new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to bookmark master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved #else $ hg clone gitrepo hgrepo-2 importing git objects into hg + new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved #endif @@ -174,6 +181,7 @@ $ cd .. $ hg clone gitrepo hgrepo-2 importing git objects into hg + new changesets ff7a2f2d8d70:47d12948785d (5 drafts) warning: the git source repository has a detached head (you may want to update to a bookmark) updating to branch default diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t --- a/tests/test-conflict-1.t +++ b/tests/test-conflict-1.t @@ -56,6 +56,7 @@ $ hg clone gitrepo hgrepo2 importing git objects into hg + new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t --- a/tests/test-conflict-2.t +++ b/tests/test-conflict-2.t @@ -56,6 +56,7 @@ $ hg clone gitrepo hgrepo2 importing git objects into hg + new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t --- a/tests/test-convergedmerge.t +++ b/tests/test-convergedmerge.t @@ -58,6 +58,7 @@ $ hg clone gitrepo hgrepo2 importing git objects into hg + new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t --- a/tests/test-empty-working-tree.t +++ b/tests/test-empty-working-tree.t @@ -12,6 +12,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets 01708ca54a8f (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-encoding.t b/tests/test-encoding.t --- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -44,6 +44,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets 87cd29b67a91:b8a0ac52f339 (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-extra.t b/tests/test-extra.t --- a/tests/test-extra.t +++ b/tests/test-extra.t @@ -13,6 +13,7 @@ $ cd .. $ hg clone gitrepo hgrepo importing git objects into hg + new changesets aa9eb6424386 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark not-master (hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t --- a/tests/test-file-removal.t +++ b/tests/test-file-removal.t @@ -100,6 +100,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -233,6 +234,7 @@ test with rename detection enabled $ hg --config git.similarity=100 clone gitrepo hgreporenames importing git objects into hg + new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-git-clone.t b/tests/test-git-clone.t --- a/tests/test-git-clone.t +++ b/tests/test-git-clone.t @@ -15,6 +15,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-git-gpg.t b/tests/test-git-gpg.t --- a/tests/test-git-gpg.t +++ b/tests/test-git-gpg.t @@ -56,6 +56,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) updating to branch default (no-hg57 !) updating to bookmark signed (hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-git-submodules.t b/tests/test-git-submodules.t --- a/tests/test-git-submodules.t +++ b/tests/test-git-submodules.t @@ -189,6 +189,7 @@ $ hg clone gitrepo2 hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:9c3929c04f22 (10 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -356,6 +357,7 @@ $ cd ../../.. $ hg --config git.similarity=100 clone gitrepo2 hgreporenames importing git objects into hg + new changesets ff7a2f2d8d70:9c3929c04f22 (10 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -17,6 +17,7 @@ $ cd .. $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-git-workflow.t b/tests/test-git-workflow.t --- a/tests/test-git-workflow.t +++ b/tests/test-git-workflow.t @@ -51,6 +51,7 @@ get things back to hg $ hg gimport importing git objects into hg + new changesets 9f124f3c1fc2 (1 drafts) $ hg log --graph --debug | grep -v phase: o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 | bookmark: master @@ -116,6 +117,7 @@ > git commit -m newcommit > /dev/null || echo "git commit error" $ hg gimport importing git objects into hg + new changesets befdecd14df5:3d10b7289d79 (2 drafts) $ hg log --graph o changeset: 3:3d10b7289d79 | bookmark: master diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t --- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -20,6 +20,7 @@ $ cd .. $ hg clone repo.git hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -158,6 +159,7 @@ $ cd .. $ hg clone repo.git hgrepo2 importing git objects into hg + new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 8 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t --- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -13,6 +13,7 @@ $ cd .. $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark not-master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -66,6 +67,7 @@ $ cd .. $ hg clone -U gitrepo hgrepo2 importing git objects into hg + new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) $ hg -R hgrepo2 log --graph o changeset: 2:400db38f4f64 | branch: gamma diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t --- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -20,6 +20,7 @@ $ cd .. $ hg clone -U repo.git hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) $ cd hgrepo $ hg co master @@ -61,6 +62,7 @@ $ hg clone repo.git hgrepo2 importing git objects into hg + new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-illegal-contents.t b/tests/test-illegal-contents.t --- a/tests/test-illegal-contents.t +++ b/tests/test-illegal-contents.t @@ -142,6 +142,7 @@ importing git objects into hg warning: path 'nested/.hg/00changelog.i' contains an invalid path component warning: path 'nested/.hg/requires' contains an invalid path component + new changesets [0-9a-f]{12,12} \(1 drafts\) (re) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' @@ -151,6 +152,7 @@ importing git objects into hg warning: skipping invalid path 'nested/.hg/00changelog.i' warning: skipping invalid path 'nested/.hg/requires' + new changesets 3ea18a67c0e6 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -176,6 +178,7 @@ importing git objects into hg warning: skipping invalid path 'Icon\r' warning: skipping invalid path 'the\nfile' + new changesets 8354c06a5842 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -184,6 +187,7 @@ importing git objects into hg warning: skipping invalid path 'Icon\r' warning: skipping invalid path 'the\nfile' + new changesets 8354c06a5842 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-incoming.t b/tests/test-incoming.t --- a/tests/test-incoming.t +++ b/tests/test-incoming.t @@ -21,6 +21,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -139,6 +140,7 @@ $ hg pull | grep -v "adding remote bookmark" pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 7fe02317c63d:248d83ebf472 (3 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg incoming | grep -v 'no changes found' comparing with $TESTTMP/gitrepo diff --git a/tests/test-invalid-refs.t b/tests/test-invalid-refs.t --- a/tests/test-invalid-refs.t +++ b/tests/test-invalid-refs.t @@ -13,6 +13,7 @@ $ cd .. $ hg clone -U gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) $ cd hgrepo $ hg up master @@ -83,6 +84,7 @@ $ cd .. $ hg clone -U gitrepo hgrepo2 importing git objects into hg + new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) $ hg -R hgrepo2 log --graph o changeset: 3:0950ab44ea23 | bookmark: delt#a diff --git a/tests/test-keywords.t b/tests/test-keywords.t --- a/tests/test-keywords.t +++ b/tests/test-keywords.t @@ -22,6 +22,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-merge.t b/tests/test-merge.t --- a/tests/test-merge.t +++ b/tests/test-merge.t @@ -33,6 +33,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-multiple-remotes.t b/tests/test-multiple-remotes.t --- a/tests/test-multiple-remotes.t +++ b/tests/test-multiple-remotes.t @@ -30,6 +30,7 @@ $ hg pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) (run 'hg update' to get a working copy) pulling from $TESTTMP/repo.git no changes found diff --git a/tests/test-octopus.t b/tests/test-octopus.t --- a/tests/test-octopus.t +++ b/tests/test-octopus.t @@ -64,6 +64,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 6 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-orphan-tags.t b/tests/test-orphan-tags.t --- a/tests/test-orphan-tags.t +++ b/tests/test-orphan-tags.t @@ -65,6 +65,7 @@ $ hg clone -U git.bare hg importing git objects into hg + new changesets b8e77484829b:387d03400596 (4 drafts) $ hg outgoing -R hg comparing with $TESTTMP/git.bare searching for changes diff --git a/tests/test-outgoing.t b/tests/test-outgoing.t --- a/tests/test-outgoing.t +++ b/tests/test-outgoing.t @@ -15,6 +15,7 @@ $ cd .. $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -104,6 +105,7 @@ $ hg pull pulling from */gitrepo (glob) importing git objects into hg + new changesets 25eed24f5e8f (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log --graph o changeset: 3:25eed24f5e8f diff --git a/tests/test-phases-draft.t b/tests/test-phases-draft.t --- a/tests/test-phases-draft.t +++ b/tests/test-phases-draft.t @@ -13,6 +13,7 @@ $ cd .. $ hg clone gitrepo hgrepo | grep -v '^updating' importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo @@ -32,6 +33,7 @@ $ hg pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 7fe02317c63d (1 drafts) (run 'hg update' to get a working copy) $ hg phase -r master 1: draft diff --git a/tests/test-phases-public.t b/tests/test-phases-public.t --- a/tests/test-phases-public.t +++ b/tests/test-phases-public.t @@ -25,6 +25,7 @@ cloning with hggit.usephases publishes cloned HEAD $ hg --config hggit.usephases=True clone -U gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 $ cd hgrepo $ hg phase -r master @@ -74,20 +75,39 @@ $ hg phase -r master 0: draft +#if publish-defaults $ hg pull -r master other pulling from $TESTTMP/gitrepo/.git importing git objects into hg + new changesets 7fe02317c63d + 1 local changesets published (run 'hg update' to get a working copy) +#else + $ hg pull -r master other + pulling from $TESTTMP/gitrepo/.git + importing git objects into hg + new changesets 7fe02317c63d (1 drafts) + (run 'hg update' to get a working copy) +#endif $ hg phase -r master 1: draft (publish-specific !) 1: public (publish-defaults !) #if publish-defaults $ hg phase -fd master -#endif $ hg pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets ca33a262eb46:03769a650ded (1 drafts) + 1 local changesets published (run 'hg update' to get a working copy) +#else + $ hg pull + pulling from $TESTTMP/gitrepo + importing git objects into hg + new changesets ca33a262eb46:03769a650ded (1 drafts) + 2 local changesets published + (run 'hg update' to get a working copy) +#endif $ hg phase -r master -r not-master -r thetag 1: public 3: draft diff --git a/tests/test-pull-after-rebase.t b/tests/test-pull-after-rebase.t --- a/tests/test-pull-after-rebase.t +++ b/tests/test-pull-after-rebase.t @@ -35,6 +35,7 @@ $ hg clone -U repo.git hgrepo importing git objects into hg + new changesets ff7a2f2d8d70:205a004356ef (3 drafts) $ cd hgrepo $ hg log --graph -T '{bookmarks} {rev}:{node}\n' o branch 2:205a004356ef32b8da782afb89d9179d12ca31e9 @@ -83,6 +84,7 @@ pulling from $TESTTMP/repo.git importing git objects into hg 1 new orphan changesets + new changesets f4bd265a9d39 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log --graph -T '{bookmarks} {rev}:{node}\n' * otherbranch 4:f4bd265a9d39e5c4da2c0a752de5ea70335199c5 diff --git a/tests/test-pull-after-strip.t b/tests/test-pull-after-strip.t --- a/tests/test-pull-after-strip.t +++ b/tests/test-pull-after-strip.t @@ -21,6 +21,7 @@ clone a tag $ hg clone -r alpha gitrepo hgrepo-a importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R hgrepo-a log --graph @@ -36,6 +37,7 @@ clone a branch $ hg clone -r beta gitrepo hgrepo-b importing git objects into hg + new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R hgrepo-b log --graph @@ -76,6 +78,7 @@ $ hg pull -r beta | grep -v "adding remote bookmark" pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 7fe02317c63d:cc1e605d90db (2 drafts) (run 'hg update' to get a working copy) $ hg log --graph o changeset: 2:cc1e605d90db diff --git a/tests/test-pull.t b/tests/test-pull.t --- a/tests/test-pull.t +++ b/tests/test-pull.t @@ -25,6 +25,7 @@ $ hg -R hgrepo pull -r t_alpha pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) (run 'hg update' to get a working copy) $ hg -R hgrepo update t_alpha 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -69,6 +70,7 @@ $ hg -R hgrepo pull -r beta pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 7fe02317c63d (1 drafts) (run 'hg update' to get a working copy) $ hg -R hgrepo log --graph o changeset: 1:7fe02317c63d @@ -103,6 +105,7 @@ $ hg -R hgrepo pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R hgrepo log --graph o changeset: 3:6f898ad1f3e1 @@ -155,6 +158,7 @@ $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets a02330f767a4 (1 drafts) (run 'hg update' to get a working copy) $ hg -R hgrepo tags | grep default/beta default/beta 1:7fe02317c63d @@ -223,6 +227,7 @@ $ hg -R hgrepo pull -r 'releases/*' pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R hgrepo log --graph o changeset: 6:a3f95e150b0a @@ -331,6 +336,7 @@ $ hg -R hgrepo pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 49713da8f665:e103a73f33be (3 drafts) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R hgrepo heads changeset: 9:e103a73f33be diff --git a/tests/test-push-detached.t b/tests/test-push-detached.t --- a/tests/test-push-detached.t +++ b/tests/test-push-detached.t @@ -41,6 +41,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-push-to-head.t b/tests/test-push-to-head.t --- a/tests/test-push-to-head.t +++ b/tests/test-push-to-head.t @@ -15,6 +15,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-push.t b/tests/test-push.t --- a/tests/test-push.t +++ b/tests/test-push.t @@ -13,6 +13,7 @@ $ cd .. $ hg clone -u tip gitrepo hgrepo importing git objects into hg + new changesets ff7a2f2d8d70 (1 drafts) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -73,6 +74,7 @@ $ hg pull 2>&1 | grep -v 'divergent bookmark' pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 25eed24f5e8f (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) TODO shouldn't need to do this since we're (in theory) pushing master explicitly, which should not implicitly also push the not-master ref. @@ -166,6 +168,7 @@ $ hg clone -u tip gitrepo hgrepo-test importing git objects into hg + new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) updating to branch default 5 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R hgrepo-test log -r master diff --git a/tests/test-renames.t b/tests/test-renames.t --- a/tests/test-renames.t +++ b/tests/test-renames.t @@ -490,6 +490,7 @@ $ hg clone gitcopyharder hgnocopyharder importing git objects into hg + new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -536,6 +537,7 @@ $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 importing git objects into hg + new changesets b45d023c6842:9b3099834272 (3 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -572,6 +574,7 @@ $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 importing git objects into hg + new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-serve-ci.t b/tests/test-serve-ci.t --- a/tests/test-serve-ci.t +++ b/tests/test-serve-ci.t @@ -103,6 +103,7 @@ $ hg -R repo-git pull -u pulling from git://git-server/repo.git importing git objects into hg + new changesets fa22339f4ab8 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Straight HTTP doesn't work: @@ -121,6 +122,7 @@ > pull -u pulling from http://git-server/repo.git importing git objects into hg + new changesets fa22339f4ab8 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved #if dulwich0200 diff --git a/tests/test-serve-dulwich.t b/tests/test-serve-dulwich.t --- a/tests/test-serve-dulwich.t +++ b/tests/test-serve-dulwich.t @@ -38,6 +38,7 @@ importing commits 2/2 [==================================>]\r (no-eol) (esc) \r (no-eol) (esc) importing git objects into hg + new changesets c4d188f6e13d:221dd250e933 (2 drafts) $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy HG:221dd250e933 GIT:3af9773036a9 HG:c4d188f6e13d GIT:b23744d34f97 diff --git a/tests/test-serve-git.t b/tests/test-serve-git.t --- a/tests/test-serve-git.t +++ b/tests/test-serve-git.t @@ -53,6 +53,7 @@ importing commits 2/2 [==================================>]\r (no-eol) (esc) \r (no-eol) (esc) importing git objects into hg + new changesets c4d188f6e13d:221dd250e933 (2 drafts) $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy HG:221dd250e933 GIT:3af9773036a9 HG:c4d188f6e13d GIT:b23744d34f97 diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -30,6 +30,7 @@ Ensure gitlinks are transformed to .hgsubstate on hg pull from git $ hg clone -u tip gitrepo1 hgrepo 2>&1 | egrep -v '^(Cloning into|done)' importing git objects into hg + new changesets e532b2bfda10:88c5e06a2a29 (3 drafts) updating to branch default cloning subrepo subrepo1 from $TESTTMP/gitsubrepo cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo @@ -101,6 +102,7 @@ $ hg pull pulling from $TESTTMP/gitrepo1 importing git objects into hg + new changesets [0-9a-f]{12,12} \(1 drafts\) (re) (run 'hg update' to get a working copy) $ hg checkout -C updating to active bookmark master diff --git a/tests/test-transactions.t b/tests/test-transactions.t --- a/tests/test-transactions.t +++ b/tests/test-transactions.t @@ -121,6 +121,10 @@ $ hg --config hggit.mapsavefrequency=25 pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 1c8407413fa3:abc468b9e51b (25 drafts) + new changesets 217c308baf47:d5d14eeedd08 (25 drafts) + new changesets d9807ef6abcb:4678067bd500 (25 drafts) + new changesets c31a154888bb:eda59117ba04 (25 drafts) (run 'hg update' to get a working copy) Reset the repository @@ -135,6 +139,11 @@ $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 1c8407413fa3:abc468b9e51b (25 drafts) + new changesets 217c308baf47:d5d14eeedd08 (25 drafts) + new changesets d9807ef6abcb:4678067bd500 (25 drafts) + new changesets c31a154888bb:eda59117ba04 + 75 local changesets published (run 'hg update' to get a working copy) Reset the repository @@ -187,6 +196,7 @@ $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull pulling from $TESTTMP/gitrepo importing git objects into hg + new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) transaction abort! rollback completed interrupted! diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t --- a/tests/test-tree-decomposition.t +++ b/tests/test-tree-decomposition.t @@ -26,6 +26,7 @@ $ hg clone gitrepo hgrepo importing git objects into hg + new changesets d4d3d2417141:541f27994b81 (3 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved