| Submitter | timeless@mozdev.org |
|---|---|
| Date | Dec. 18, 2015, 6:23 a.m. |
| Message ID | <56d2e69bf248235298c2.1450419805@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/12141/ |
| State | Rejected |
| Delegated to: | Augie Fackler |
| Headers | show |
Comments
On Fri, Dec 18, 2015 at 12:23:25AM -0600, timeless wrote: > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1450415128 0 > # Fri Dec 18 05:05:28 2015 +0000 > # Node ID 56d2e69bf248235298c2071af6faadf615045890 > # Parent 2916ebaef3129451bfd4f9f62487e70f74124d46 > hg: replace quietempty with show_stats for clean, merge, and update > > diff --git a/hgext/histedit.py b/hgext/histedit.py > --- a/hgext/histedit.py > +++ b/hgext/histedit.py > @@ -409,7 +409,7 @@ > parentctx, but does not commit them.""" > repo = self.repo > rulectx = repo[self.node] > - hg.update(repo, self.state.parentctxnode, quietempty=True) > + hg.update(repo, self.state.parentctxnode, show_stats=False) This strikes me as a slight bummer for users that have progress disabled. Should we still print the stats for users with progress off? > stats = applychanges(repo.ui, repo, rulectx, {}) > if stats and stats[3] > 0: > raise error.InterventionRequired(_('Fix up the change and run ' > @@ -602,7 +602,7 @@ > def run(self): > repo = self.repo > rulectx = repo[self.node] > - hg.update(repo, self.state.parentctxnode, quietempty=True) > + hg.update(repo, self.state.parentctxnode, show_stats=False) > applychanges(repo.ui, repo, rulectx, {}) > raise error.InterventionRequired( > _('Make changes as needed, you may commit or record as needed ' > @@ -997,7 +997,7 @@ > # check whether we should update away > if repo.unfiltered().revs('parents() and (%n or %ln::)', > state.parentctxnode, leafs | tmpnodes): > - hg.clean(repo, state.topmost, show_stats=True, quietempty=True) > + hg.clean(repo, state.topmost, show_stats=False) > cleanupnode(ui, repo, 'created', tmpnodes) > cleanupnode(ui, repo, 'temp', leafs) > except Exception: > @@ -1081,7 +1081,7 @@ > state.replacements.extend(replacement_) > state.write() > > - hg.update(repo, state.parentctxnode, quietempty=True) > + hg.update(repo, state.parentctxnode, show_stats=False) > > mapping, tmpnodes, created, ntm = processreplacement(state) > if mapping: > diff --git a/mercurial/hg.py b/mercurial/hg.py > --- a/mercurial/hg.py > +++ b/mercurial/hg.py > @@ -637,9 +637,7 @@ > srcpeer.close() > return srcpeer, destpeer > > -def _showstats(repo, stats, quietempty=False): > - if quietempty and not any(stats): > - return > +def _showstats(repo, stats): > repo.ui.status(_("%d files updated, %d files merged, " > "%d files removed, %d files unresolved\n") % stats) > > @@ -652,10 +650,11 @@ > return mergemod.update(repo, node, False, overwrite, > labels=['working copy', 'destination']) > > -def update(repo, node, quietempty=False): > +def update(repo, node, show_stats=True): > """update the working directory to node, merging linear changes""" > stats = updaterepo(repo, node, False) > - _showstats(repo, stats, quietempty) > + if show_stats: > + _showstats(repo, stats) > if stats[3]: > repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) > return stats[3] > 0 > @@ -663,19 +662,20 @@ > # naming conflict in clone() > _update = update > > -def clean(repo, node, show_stats=True, quietempty=False): > +def clean(repo, node, show_stats=True): > """forcibly switch the working directory to node, clobbering changes""" > stats = updaterepo(repo, node, True) > util.unlinkpath(repo.join('graftstate'), ignoremissing=True) > if show_stats: > - _showstats(repo, stats, quietempty) > + _showstats(repo, stats) > return stats[3] > 0 > > -def merge(repo, node, force=None, remind=True): > +def merge(repo, node, force=None, remind=True, show_stats=True): > """Branch merge with node, resolving changes. Return true if any > unresolved conflicts.""" > stats = mergemod.update(repo, node, True, force) > - _showstats(repo, stats) > + if show_stats: > + _showstats(repo, stats) > if stats[3]: > repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " > "or 'hg update -C .' to abandon\n")) > diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t > --- a/tests/test-histedit-arguments.t > +++ b/tests/test-histedit-arguments.t > @@ -126,7 +126,6 @@ > $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF > > edit 08d98a8350f3 4 five > > EOF > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > reverting alpha > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > @@ -230,7 +229,6 @@ > > p c8e68270e35a 3 four > > f 08d98a8350f3 4 five > > EOF > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > reverting alpha > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > four > diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t > --- a/tests/test-histedit-base.t > +++ b/tests/test-histedit-base.t > @@ -148,7 +148,6 @@ > warning: conflicts while merging B! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > $ hg histedit --abort | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg tglog > @ 7:591369deedfdcbf57471e894999a70d7f676186d:draft 'X' > | > diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t > --- a/tests/test-histedit-commute.t > +++ b/tests/test-histedit-commute.t > @@ -83,7 +83,6 @@ > > pick 055a42cdd887 d > > EOF > $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > > rules should end up in .hg/histedit-last-edit.txt: > $ cat .hg/histedit-last-edit.txt > @@ -134,7 +133,6 @@ > > pick d8249471110a e > > pick 8ade9693061e f > > EOF > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > > $ hg log --graph > @ changeset: 5:7eca9b5b1148 > @@ -177,7 +175,6 @@ > > pick 915da888f2de e > > pick 177f92b77385 c > > EOF > - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved > $ hg log --graph > @ changeset: 5:38b92f448761 > | tag: tip > @@ -218,7 +215,6 @@ > > pick 38b92f448761 c > > pick de71b079d9ce e > > EOF > - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > $ hg log --graph > @ changeset: 7:803ef1c6fcfd > | tag: tip > @@ -401,7 +397,6 @@ > > EOF > > $ HGEDITOR="sh ./editor.sh" hg histedit 0 > - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved > adding another-dir/initial-file (glob) > removing initial-dir/initial-file (glob) > 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > diff --git a/tests/test-histedit-drop.t b/tests/test-histedit-drop.t > --- a/tests/test-histedit-drop.t > +++ b/tests/test-histedit-drop.t > @@ -59,7 +59,6 @@ > > pick 652413bf663e f > > pick 055a42cdd887 d > > EOF > - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved > > log after edit > $ hg log --graph > @@ -124,7 +123,6 @@ > > pick a4f7421b80f7 f > > drop f518305ce889 d > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > $ hg log --graph > @ changeset: 3:a4f7421b80f7 > | tag: tip > diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t > --- a/tests/test-histedit-edit.t > +++ b/tests/test-histedit-edit.t > @@ -66,7 +66,6 @@ > > pick 652413bf663e f > > pick 3c6a8ed2ebe8 g > > EOF > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > > @@ -190,7 +189,6 @@ > > pick a5e1ba2f7afb foobaz > > pick b5f70786f9b0 g > > EOF > - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > > @@ -202,7 +200,6 @@ > adding manifests > adding file changes > added 1 changesets with 1 changes to 3 files > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg log -r . > changeset: 6:b5f70786f9b0 > tag: tip > @@ -232,7 +229,6 @@ > $ hg histedit tip --commands - 2>&1 <<EOF| fixbundle > > edit b5f70786f9b0 f > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > $ hg status > @@ -279,7 +275,6 @@ > > mv tmp "\$1" > > EOF > $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > $ hg status > $ hg log --limit 1 > changeset: 6:1fd3b2fe7754 > @@ -320,7 +315,6 @@ > $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle > > mess 1fd3b2fe7754 f > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > abort: emulating unexpected abort > $ test -f .hg/last-message.txt > [1] > @@ -347,7 +341,6 @@ > $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF > > mess 1fd3b2fe7754 f > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > adding f > ==== before editing > f > @@ -401,7 +394,6 @@ > $ hg histedit tip --commands - 2>&1 << EOF | fixbundle > > mess 1fd3b2fe7754 f > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > $ hg status > $ hg log --limit 1 > changeset: 6:62feedb1200e > @@ -423,7 +415,6 @@ > $ hg histedit --commands - 0 2>&1 << EOF > > edit cb9a9f314b8b a > $EDITED > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > adding a > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > @@ -451,7 +442,6 @@ > > mv tmp "\$1" > > EOF > $ HGEDITOR="sh ../edit.sh" hg histedit 2 > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > reverting a > 1 files updated, 0 files merged, 1 files removed, 0 files unresolved > warning: histedit rules saved to: .hg/histedit-last-edit.txt > diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t > --- a/tests/test-histedit-fold-non-commute.t > +++ b/tests/test-histedit-fold-non-commute.t > @@ -86,7 +86,6 @@ > > edit the history > $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging e > warning: conflicts while merging e! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > @@ -246,7 +245,6 @@ > > edit the history > $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging e > warning: conflicts while merging e! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t > --- a/tests/test-histedit-fold.t > +++ b/tests/test-histedit-fold.t > @@ -54,7 +54,6 @@ > > fold 177f92b77385 c > > pick 055a42cdd887 d > > EOF > - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved > 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > > @@ -111,7 +110,6 @@ > > pick 6de59d13424a f > > pick 9c277da72c9b d > > EOF > - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved > 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > > @@ -177,7 +175,6 @@ > > pick 8e03a72b6f83 f > > fold c4a9eb7989fc d > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > adding d > allow non-folding commit > 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > @@ -238,7 +235,6 @@ > > pick e860deea161a e > > fold a00ad806cb55 f > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > > @@ -286,7 +282,6 @@ > > drop 888f9082bf99 2 +5 > > fold 251d831eeec5 3 +6 > > EOF > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging file > warning: conflicts while merging file! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > @@ -346,7 +341,6 @@ > > drop 888f9082bf99 2 +5 > > fold 251d831eeec5 3 +6 > > EOF > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging file > warning: conflicts while merging file! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > @@ -435,7 +429,6 @@ > > pick 1c4f440a8085 rename > > fold e0371e0426bc b > > EOF > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > reverting b.txt > 1 files updated, 0 files merged, 1 files removed, 0 files unresolved > 1 files updated, 0 files merged, 1 files removed, 0 files unresolved > @@ -481,7 +474,6 @@ > > fold a1a953ffb4b0 c > > pick 6c795aa153cb a > > EOF > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > commit 9599899f62c05f4377548c32bf1c9f1a39634b0c > @@ -522,7 +514,6 @@ > > fold b7389cc4d66e 3 foo2 > > fold 21679ff7675c 4 foo3 > > EOF > - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > reverting foo > 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t > --- a/tests/test-histedit-no-change.t > +++ b/tests/test-histedit-no-change.t > @@ -90,7 +90,6 @@ > | pick 055a42cdd887 3 d > | edit e860deea161a 4 e > | pick 652413bf663e 5 f > - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > $ continueediting true "(leaving commit message unaltered)" > @@ -141,7 +140,6 @@ > | edit 055a42cdd887 3 d > | edit e860deea161a 4 e > | pick 652413bf663e 5 f > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > $ continueediting true "(leaving commit message unaltered)" > diff --git a/tests/test-histedit-non-commute-abort.t b/tests/test-histedit-non-commute-abort.t > --- a/tests/test-histedit-non-commute-abort.t > +++ b/tests/test-histedit-non-commute-abort.t > @@ -69,7 +69,6 @@ > > pick e860deea161a e > > pick 652413bf663e f > > EOF > - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > merging e > warning: conflicts while merging e! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > @@ -110,7 +109,6 @@ > > abort the edit (should clear out merge state) > $ hg histedit --abort 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ hg debugmergestate > no merge state found > > diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t > --- a/tests/test-histedit-non-commute.t > +++ b/tests/test-histedit-non-commute.t > @@ -87,14 +87,12 @@ > > edit the history > $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging e > warning: conflicts while merging e! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > > abort the edit > $ hg histedit --abort 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > > > second edit set > @@ -144,7 +142,6 @@ > > edit the history > $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging e > warning: conflicts while merging e! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > @@ -228,7 +225,6 @@ > > edit the history, this time with a fold action > $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle > - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > merging e > warning: conflicts while merging e! (edit, then use 'hg resolve --mark') > Fix up the change and run hg histedit --continue > diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t > --- a/tests/test-histedit-obsolete.t > +++ b/tests/test-histedit-obsolete.t > @@ -107,7 +107,6 @@ > > drop 59d9f330561f 7 d > > pick cacdfd884a93 8 f > > EOF > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > $ hg log --graph > @ 11:c13eb81022ca f > | > @@ -134,7 +133,6 @@ > $ hg histedit -r '.' --commands - <<EOF > > edit b346ab9a313d 6 c > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > adding c > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > @@ -174,7 +172,6 @@ > > pick 40db8afa467b 10 c > > drop 947ece25170f 11 f > > EOF > - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved > $ hg log -G > @ 12:40db8afa467b c > | > @@ -194,7 +191,6 @@ > > pick 40db8afa467b 10 c > > drop 1b3b05f35ff0 13 h > > EOF > - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved > $ hg log -G > @ 17:ee6544123ab8 c > | > @@ -278,7 +274,6 @@ > > pick c62e7241a4f2 15 j > > pick 14bda137d5b3 16 k > > EOF > - 0 files updated, 0 files merged, 6 files removed, 0 files unresolved > adding f > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > @@ -321,7 +316,6 @@ > > pick c62e7241a4f2 15 j > > pick 14bda137d5b3 16 k > > EOF > - 0 files updated, 0 files merged, 6 files removed, 0 files unresolved > adding f > Make changes as needed, you may commit or record as needed now. > When you are finished, run hg histedit --continue to resume. > @@ -364,7 +358,6 @@ > > pick ee4a24fc4dfa 13 h > > pick 14bda137d5b3 16 k > > EOF > - 0 files updated, 0 files merged, 5 files removed, 0 files unresolved > $ hg log -G > @ 23:9e712162b2c1 (secret) k > | > @@ -406,7 +399,6 @@ > > pick 9cd3934e05af 14 i > > fold 14bda137d5b3 16 k > > EOF > - 0 files updated, 0 files merged, 6 files removed, 0 files unresolved > 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > 0 files updated, 0 files merged, 2 files removed, 0 files unresolved > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
On Fri, Dec 18, 2015 at 10:30 AM, Augie Fackler <raf@durin42.com> wrote: >> - hg.update(repo, self.state.parentctxnode, quietempty=True) >> + hg.update(repo, self.state.parentctxnode, show_stats=False) > > This strikes me as a slight bummer for users that have progress > disabled. Should we still print the stats for users with progress off? I suppose we could do that. I'm not sure how useful it is. Note that you do get some output, assuming you have meaningful changes. [timeless@gcc2-power8 OpenLiveWriter]$ hg histedit --cont merging src/managed/OpenLiveWriter.BlogClient/Detection/BlogEditingTemplateStrategy.cs editting [==========================> ] 49/193 32s The merging line still appears. So, unless you're doing a huge series where the vast majority of the space is empty, you will still see output, just not the progress.
Augie Fackler wrote: >> - hg.update(repo, self.state.parentctxnode, quietempty=True) >> + hg.update(repo, self.state.parentctxnode, show_stats=False) > > This strikes me as a slight bummer for users that have progress > disabled. Should we still print the stats for users with progress off? [PATCH 2 of 7] histedit: InterventionRequired list action should result in people knowing where they are when they're using histedit (with or without progress)
Patch
diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -409,7 +409,7 @@ parentctx, but does not commit them.""" repo = self.repo rulectx = repo[self.node] - hg.update(repo, self.state.parentctxnode, quietempty=True) + hg.update(repo, self.state.parentctxnode, show_stats=False) stats = applychanges(repo.ui, repo, rulectx, {}) if stats and stats[3] > 0: raise error.InterventionRequired(_('Fix up the change and run ' @@ -602,7 +602,7 @@ def run(self): repo = self.repo rulectx = repo[self.node] - hg.update(repo, self.state.parentctxnode, quietempty=True) + hg.update(repo, self.state.parentctxnode, show_stats=False) applychanges(repo.ui, repo, rulectx, {}) raise error.InterventionRequired( _('Make changes as needed, you may commit or record as needed ' @@ -997,7 +997,7 @@ # check whether we should update away if repo.unfiltered().revs('parents() and (%n or %ln::)', state.parentctxnode, leafs | tmpnodes): - hg.clean(repo, state.topmost, show_stats=True, quietempty=True) + hg.clean(repo, state.topmost, show_stats=False) cleanupnode(ui, repo, 'created', tmpnodes) cleanupnode(ui, repo, 'temp', leafs) except Exception: @@ -1081,7 +1081,7 @@ state.replacements.extend(replacement_) state.write() - hg.update(repo, state.parentctxnode, quietempty=True) + hg.update(repo, state.parentctxnode, show_stats=False) mapping, tmpnodes, created, ntm = processreplacement(state) if mapping: diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -637,9 +637,7 @@ srcpeer.close() return srcpeer, destpeer -def _showstats(repo, stats, quietempty=False): - if quietempty and not any(stats): - return +def _showstats(repo, stats): repo.ui.status(_("%d files updated, %d files merged, " "%d files removed, %d files unresolved\n") % stats) @@ -652,10 +650,11 @@ return mergemod.update(repo, node, False, overwrite, labels=['working copy', 'destination']) -def update(repo, node, quietempty=False): +def update(repo, node, show_stats=True): """update the working directory to node, merging linear changes""" stats = updaterepo(repo, node, False) - _showstats(repo, stats, quietempty) + if show_stats: + _showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) return stats[3] > 0 @@ -663,19 +662,20 @@ # naming conflict in clone() _update = update -def clean(repo, node, show_stats=True, quietempty=False): +def clean(repo, node, show_stats=True): """forcibly switch the working directory to node, clobbering changes""" stats = updaterepo(repo, node, True) util.unlinkpath(repo.join('graftstate'), ignoremissing=True) if show_stats: - _showstats(repo, stats, quietempty) + _showstats(repo, stats) return stats[3] > 0 -def merge(repo, node, force=None, remind=True): +def merge(repo, node, force=None, remind=True, show_stats=True): """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" stats = mergemod.update(repo, node, True, force) - _showstats(repo, stats) + if show_stats: + _showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " "or 'hg update -C .' to abandon\n")) diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t --- a/tests/test-histedit-arguments.t +++ b/tests/test-histedit-arguments.t @@ -126,7 +126,6 @@ $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF > edit 08d98a8350f3 4 five > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved reverting alpha Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -230,7 +229,6 @@ > p c8e68270e35a 3 four > f 08d98a8350f3 4 five > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved reverting alpha 1 files updated, 0 files merged, 0 files removed, 0 files unresolved four diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t --- a/tests/test-histedit-base.t +++ b/tests/test-histedit-base.t @@ -148,7 +148,6 @@ warning: conflicts while merging B! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue $ hg histedit --abort | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tglog @ 7:591369deedfdcbf57471e894999a70d7f676186d:draft 'X' | diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t --- a/tests/test-histedit-commute.t +++ b/tests/test-histedit-commute.t @@ -83,7 +83,6 @@ > pick 055a42cdd887 d > EOF $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved rules should end up in .hg/histedit-last-edit.txt: $ cat .hg/histedit-last-edit.txt @@ -134,7 +133,6 @@ > pick d8249471110a e > pick 8ade9693061e f > EOF - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg log --graph @ changeset: 5:7eca9b5b1148 @@ -177,7 +175,6 @@ > pick 915da888f2de e > pick 177f92b77385 c > EOF - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved $ hg log --graph @ changeset: 5:38b92f448761 | tag: tip @@ -218,7 +215,6 @@ > pick 38b92f448761 c > pick de71b079d9ce e > EOF - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg log --graph @ changeset: 7:803ef1c6fcfd | tag: tip @@ -401,7 +397,6 @@ > EOF $ HGEDITOR="sh ./editor.sh" hg histedit 0 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding another-dir/initial-file (glob) removing initial-dir/initial-file (glob) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff --git a/tests/test-histedit-drop.t b/tests/test-histedit-drop.t --- a/tests/test-histedit-drop.t +++ b/tests/test-histedit-drop.t @@ -59,7 +59,6 @@ > pick 652413bf663e f > pick 055a42cdd887 d > EOF - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved log after edit $ hg log --graph @@ -124,7 +123,6 @@ > pick a4f7421b80f7 f > drop f518305ce889 d > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg log --graph @ changeset: 3:a4f7421b80f7 | tag: tip diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t --- a/tests/test-histedit-edit.t +++ b/tests/test-histedit-edit.t @@ -66,7 +66,6 @@ > pick 652413bf663e f > pick 3c6a8ed2ebe8 g > EOF - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -190,7 +189,6 @@ > pick a5e1ba2f7afb foobaz > pick b5f70786f9b0 g > EOF - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -202,7 +200,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 3 files - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -r . changeset: 6:b5f70786f9b0 tag: tip @@ -232,7 +229,6 @@ $ hg histedit tip --commands - 2>&1 <<EOF| fixbundle > edit b5f70786f9b0 f > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. $ hg status @@ -279,7 +275,6 @@ > mv tmp "\$1" > EOF $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg status $ hg log --limit 1 changeset: 6:1fd3b2fe7754 @@ -320,7 +315,6 @@ $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle > mess 1fd3b2fe7754 f > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved abort: emulating unexpected abort $ test -f .hg/last-message.txt [1] @@ -347,7 +341,6 @@ $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF > mess 1fd3b2fe7754 f > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding f ==== before editing f @@ -401,7 +394,6 @@ $ hg histedit tip --commands - 2>&1 << EOF | fixbundle > mess 1fd3b2fe7754 f > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg status $ hg log --limit 1 changeset: 6:62feedb1200e @@ -423,7 +415,6 @@ $ hg histedit --commands - 0 2>&1 << EOF > edit cb9a9f314b8b a > $EDITED > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding a Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -451,7 +442,6 @@ > mv tmp "\$1" > EOF $ HGEDITOR="sh ../edit.sh" hg histedit 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved reverting a 1 files updated, 0 files merged, 1 files removed, 0 files unresolved warning: histedit rules saved to: .hg/histedit-last-edit.txt diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t --- a/tests/test-histedit-fold-non-commute.t +++ b/tests/test-histedit-fold-non-commute.t @@ -86,7 +86,6 @@ edit the history $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue @@ -246,7 +245,6 @@ edit the history $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t --- a/tests/test-histedit-fold.t +++ b/tests/test-histedit-fold.t @@ -54,7 +54,6 @@ > fold 177f92b77385 c > pick 055a42cdd887 d > EOF - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -111,7 +110,6 @@ > pick 6de59d13424a f > pick 9c277da72c9b d > EOF - 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -177,7 +175,6 @@ > pick 8e03a72b6f83 f > fold c4a9eb7989fc d > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding d allow non-folding commit 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -238,7 +235,6 @@ > pick e860deea161a e > fold a00ad806cb55 f > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -286,7 +282,6 @@ > drop 888f9082bf99 2 +5 > fold 251d831eeec5 3 +6 > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue @@ -346,7 +341,6 @@ > drop 888f9082bf99 2 +5 > fold 251d831eeec5 3 +6 > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue @@ -435,7 +429,6 @@ > pick 1c4f440a8085 rename > fold e0371e0426bc b > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved reverting b.txt 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -481,7 +474,6 @@ > fold a1a953ffb4b0 c > pick 6c795aa153cb a > EOF - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved commit 9599899f62c05f4377548c32bf1c9f1a39634b0c @@ -522,7 +514,6 @@ > fold b7389cc4d66e 3 foo2 > fold 21679ff7675c 4 foo3 > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved reverting foo 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t --- a/tests/test-histedit-no-change.t +++ b/tests/test-histedit-no-change.t @@ -90,7 +90,6 @@ | pick 055a42cdd887 3 d | edit e860deea161a 4 e | pick 652413bf663e 5 f - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. $ continueediting true "(leaving commit message unaltered)" @@ -141,7 +140,6 @@ | edit 055a42cdd887 3 d | edit e860deea161a 4 e | pick 652413bf663e 5 f - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. $ continueediting true "(leaving commit message unaltered)" diff --git a/tests/test-histedit-non-commute-abort.t b/tests/test-histedit-non-commute-abort.t --- a/tests/test-histedit-non-commute-abort.t +++ b/tests/test-histedit-non-commute-abort.t @@ -69,7 +69,6 @@ > pick e860deea161a e > pick 652413bf663e f > EOF - 0 files updated, 0 files merged, 2 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue @@ -110,7 +109,6 @@ abort the edit (should clear out merge state) $ hg histedit --abort 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg debugmergestate no merge state found diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t --- a/tests/test-histedit-non-commute.t +++ b/tests/test-histedit-non-commute.t @@ -87,14 +87,12 @@ edit the history $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue abort the edit $ hg histedit --abort 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved second edit set @@ -144,7 +142,6 @@ edit the history $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue @@ -228,7 +225,6 @@ edit the history, this time with a fold action $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t --- a/tests/test-histedit-obsolete.t +++ b/tests/test-histedit-obsolete.t @@ -107,7 +107,6 @@ > drop 59d9f330561f 7 d > pick cacdfd884a93 8 f > EOF - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg log --graph @ 11:c13eb81022ca f | @@ -134,7 +133,6 @@ $ hg histedit -r '.' --commands - <<EOF > edit b346ab9a313d 6 c > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding c Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -174,7 +172,6 @@ > pick 40db8afa467b 10 c > drop 947ece25170f 11 f > EOF - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg log -G @ 12:40db8afa467b c | @@ -194,7 +191,6 @@ > pick 40db8afa467b 10 c > drop 1b3b05f35ff0 13 h > EOF - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg log -G @ 17:ee6544123ab8 c | @@ -278,7 +274,6 @@ > pick c62e7241a4f2 15 j > pick 14bda137d5b3 16 k > EOF - 0 files updated, 0 files merged, 6 files removed, 0 files unresolved adding f Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -321,7 +316,6 @@ > pick c62e7241a4f2 15 j > pick 14bda137d5b3 16 k > EOF - 0 files updated, 0 files merged, 6 files removed, 0 files unresolved adding f Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. @@ -364,7 +358,6 @@ > pick ee4a24fc4dfa 13 h > pick 14bda137d5b3 16 k > EOF - 0 files updated, 0 files merged, 5 files removed, 0 files unresolved $ hg log -G @ 23:9e712162b2c1 (secret) k | @@ -406,7 +399,6 @@ > pick 9cd3934e05af 14 i > fold 14bda137d5b3 16 k > EOF - 0 files updated, 0 files merged, 6 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved