Mercurial > evolve
changeset 3739:0bfc4fe3baf8
evolve: use hg.updaterepo() instead of hg.update() to hide stats
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2018 19:11:29 +0530 |
| parents | ed3f69fb67bf |
| children | 07e246deb612 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-divergent.t tests/test-stabilize-result.t |
| diffstat | 3 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Sun Apr 29 19:04:18 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Sun Apr 29 19:11:29 2018 +0530 @@ -403,7 +403,7 @@ return (False, '') if divergent not in repo[None].parents(): repo.ui.status(_('updating to "local" conflict\n')) - hg.update(repo, divergent.rev()) + hg.updaterepo(repo, divergent.node(), False) repo.ui.note(_('merging %s changeset\n') % TROUBLES['CONTENTDIVERGENT']) if progresscb: progresscb()
--- a/tests/test-divergent.t Sun Apr 29 19:04:18 2018 +0530 +++ b/tests/test-divergent.t Sun Apr 29 19:11:29 2018 +0530 @@ -58,7 +58,6 @@ with: [3] add bdivergent2 base: [1] add _b updating to "local" conflict - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at c26f1d3baed2 $ hg log -G @@ -104,7 +103,6 @@ base: [5] add _c updating to "local" conflict 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved nothing changed working directory is now at 26c7705fee96
--- a/tests/test-stabilize-result.t Sun Apr 29 19:04:18 2018 +0530 +++ b/tests/test-stabilize-result.t Sun Apr 29 19:11:29 2018 +0530 @@ -417,7 +417,6 @@ base: [16] More addition updating to "local" conflict 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at e015aa78acee $ glog @ 18:e015aa78acee@default(draft) bk:[] More addition (2)