Patchwork [8,of,8] histedit: omit useless message from update (edit)

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 14, 2015, 11:37 p.m.
Message ID <401f8963723046dfbf85.1450136249@waste.org>
Download mbox | patch
Permalink /patch/12045/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 14, 2015, 11:37 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450134257 0
#      Mon Dec 14 23:04:17 2015 +0000
# Node ID 401f8963723046dfbf854e056054dc8bb1df57b4
# Parent  fcd7732bbbd24be89b6f300609d590794bcf836d
histedit: omit useless message from update (edit)

specifically:
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mateusz Kwapich - Dec. 15, 2015, 7:32 p.m.
As we discussed in the irc: those patches are good and should go in unless we want to totally get
rid of those update messages which  are not really helpful (it’s always clean-to-clean update)
which I’m personally voting for.





On 12/14/15, 3:37 PM, "Mercurial-devel on behalf of timeless" <mercurial-devel-bounces@selenic.com on behalf of timeless@mozdev.org> wrote:

># HG changeset patch

># User timeless <timeless@mozdev.org>

># Date 1450134257 0

>#      Mon Dec 14 23:04:17 2015 +0000

># Node ID 401f8963723046dfbf854e056054dc8bb1df57b4

># Parent  fcd7732bbbd24be89b6f300609d590794bcf836d

>histedit: omit useless message from update (edit)

>

>specifically:

>0 files updated, 0 files merged, 0 files removed, 0 files unresolved

>

>diff --git a/hgext/histedit.py b/hgext/histedit.py

>--- a/hgext/histedit.py

>+++ b/hgext/histedit.py

>@@ -602,7 +602,7 @@

>     def run(self):

>         repo = self.repo

>         rulectx = repo[self.node]

>-        hg.update(repo, self.state.parentctxnode)

>+        hg.update(repo, self.state.parentctxnode, quietempty=True)

>         applychanges(repo.ui, repo, rulectx, {})

>         raise error.InterventionRequired(

>             _('Make changes as needed, you may commit or record as needed '

>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

>@@ -146,7 +146,6 @@

>   When you are finished, run hg histedit --continue to resume.

>   $ continueediting true "(leaving commit message unaltered)"

>   % finalize changeset editing (leaving commit message unaltered)

>-  0 files updated, 0 files merged, 0 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.

>   $ graphlog "log after first edit"

>@@ -212,7 +211,6 @@

>   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets

>   % start editing the history (not changing anything)

>   | edit 292aec348d9e 6 closebranch

>-  0 files updated, 0 files merged, 0 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 histedit --abort

>_______________________________________________

>Mercurial-devel mailing list

>Mercurial-devel@selenic.com

>https://selenic.com/mailman/listinfo/mercurial-devel
Matt Mackall - Dec. 17, 2015, 11:22 p.m.
On Mon, 2015-12-14 at 17:37 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450134257 0
> #      Mon Dec 14 23:04:17 2015 +0000
> # Node ID 401f8963723046dfbf854e056054dc8bb1df57b4
> # Parent  fcd7732bbbd24be89b6f300609d590794bcf836d
> histedit: omit useless message from update (edit)

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.
timeless - Dec. 18, 2015, 5:44 a.m.
Can you unqueue this? I finally spent the time hooking up progress,
and it's better to just suppress the messages in general instead of
only for 0s...

On Thu, Dec 17, 2015 at 6:22 PM, Matt Mackall <mpm@selenic.com> wrote:
> On Mon, 2015-12-14 at 17:37 -0600, timeless wrote:
>> # HG changeset patch
>> # User timeless <timeless@mozdev.org>
>> # Date 1450134257 0
>> #      Mon Dec 14 23:04:17 2015 +0000
>> # Node ID 401f8963723046dfbf854e056054dc8bb1df57b4
>> # Parent  fcd7732bbbd24be89b6f300609d590794bcf836d
>> histedit: omit useless message from update (edit)
>
> These are queued for default, thanks.
>
> --
> Mathematics is the supreme nostalgia of our time.
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
Augie Fackler - Dec. 18, 2015, 3:28 p.m.
On Fri, Dec 18, 2015 at 12:44:37AM -0500, timeless wrote:
> Can you unqueue this? I finally spent the time hooking up progress,
> and it's better to just suppress the messages in general instead of
> only for 0s...

These are already a permanent part of history. Can you roll a new
version of your progress series that applies over mpm's new tip?

>
> On Thu, Dec 17, 2015 at 6:22 PM, Matt Mackall <mpm@selenic.com> wrote:
> > On Mon, 2015-12-14 at 17:37 -0600, timeless wrote:
> >> # HG changeset patch
> >> # User timeless <timeless@mozdev.org>
> >> # Date 1450134257 0
> >> #      Mon Dec 14 23:04:17 2015 +0000
> >> # Node ID 401f8963723046dfbf854e056054dc8bb1df57b4
> >> # Parent  fcd7732bbbd24be89b6f300609d590794bcf836d
> >> histedit: omit useless message from update (edit)
> >
> > These are queued for default, thanks.
> >
> > --
> > Mathematics is the supreme nostalgia of our time.
> >
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel@selenic.com
> > https://selenic.com/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -602,7 +602,7 @@ 
     def run(self):
         repo = self.repo
         rulectx = repo[self.node]
-        hg.update(repo, self.state.parentctxnode)
+        hg.update(repo, self.state.parentctxnode, quietempty=True)
         applychanges(repo.ui, repo, rulectx, {})
         raise error.InterventionRequired(
             _('Make changes as needed, you may commit or record as needed '
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
@@ -146,7 +146,6 @@ 
   When you are finished, run hg histedit --continue to resume.
   $ continueediting true "(leaving commit message unaltered)"
   % finalize changeset editing (leaving commit message unaltered)
-  0 files updated, 0 files merged, 0 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.
   $ graphlog "log after first edit"
@@ -212,7 +211,6 @@ 
   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
   % start editing the history (not changing anything)
   | edit 292aec348d9e 6 closebranch
-  0 files updated, 0 files merged, 0 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 histedit --abort