Re: [support]: changing author of a commit when rewriting history
On 04/12/2020 01.10, Antonio Muci via Mercurial-devel wrote: Hi, sorry for taking over the list, I have a lame support question. I am struggling to find a way to change the author of a commit. I do a lot of history rewriting, and "hg histedit --interactive" is invaluable in this regard. Since histedit --interactive does not support changing the author (or the timestamp) of a commit (am I right here?), for doing those sort of actions I usually go back to mq. In this case my history is "peculiar": linear DAG, but with different named branches interleaved, like this: o changeset: 3:z | branch: branch1 | user: authorY | o changeset: 2:y | branch: branch2 | user: authorX | o changeset: 1:x | branch: branch1 | user: authorToBeChanged Mq was probably not designed for this use case, and keeps messing with my named "branches". Moreover, I'd prefer not to use it. Is there a documented way of sanely doing this in modern mercurial? I’d use `hg metaedit` from the evolve extension. Many thanks Antonio ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [support]: changing author of a commit when rewriting history
Thanks for providing a way forward! I'll use that. As a avid user of histedit --interactive, it felt natural to look for author and timestamp editing there. Maybe I'll try to hack a proposal for its inclusion someday. Thanks again. On 04/12/20 01:38, Joerg Sonnenberger wrote: On Fri, Dec 04, 2020 at 01:31:52AM +0100, Antonio Muci wrote: That would be useful for the tip, thanks. I have to to rewrite a commit that is not the last one, like commit 1 in the example. At least with changeset evolution enabled, you can just update to commit 1, amend it and then evolve/rebase the rest on top. Joerg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@46030: 12 new changesets (11 on stable)
12 new changesets (11 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/fdd54a876213 changeset: 46019:fdd54a876213 branch: stable parent: 45851:81da6feb5000 user:Augie Fackler date:Tue Dec 01 01:18:21 2020 -0500 summary: procutil: use rapply(tonativestr, ...) to preserve lists when they come in https://www.mercurial-scm.org/repo/hg/rev/210f9b8d7bbd changeset: 46020:210f9b8d7bbd branch: stable user:Yuya Nishihara date:Sat Nov 28 11:15:54 2020 +0900 summary: diff: do not concatenate immutable bytes while building a/b bodies (issue6445) https://www.mercurial-scm.org/repo/hg/rev/e402a45261db changeset: 46021:e402a45261db branch: stable user:Matt Harbison date:Sat Nov 21 16:55:07 2020 -0500 summary: extensions: gracefully warn when doing min version check with no local version https://www.mercurial-scm.org/repo/hg/rev/cd7f36337741 changeset: 46022:cd7f36337741 branch: stable user:Matt Harbison date:Thu Nov 26 03:09:56 2020 -0500 summary: pyoxidizer: point to the py3 requirements instead of py2 on Windows https://www.mercurial-scm.org/repo/hg/rev/139b334c9392 changeset: 46023:139b334c9392 branch: stable user:Matt Harbison date:Thu Nov 26 02:28:42 2020 -0500 summary: packaging: regenerate the Windows requirements manifest on Windows https://www.mercurial-scm.org/repo/hg/rev/07b0a687c01a changeset: 46024:07b0a687c01a branch: stable user:Matt Harbison date:Mon Nov 23 11:47:06 2020 -0500 summary: ui: ensure `getpass()` returns bytes https://www.mercurial-scm.org/repo/hg/rev/27c23c8f14da changeset: 46025:27c23c8f14da branch: stable user:Matt Harbison date:Fri Nov 27 14:54:37 2020 -0500 summary: extensions: avoid a crash when the version isn't properly byteified on py3 https://www.mercurial-scm.org/repo/hg/rev/39e2cf7cb120 changeset: 46026:39e2cf7cb120 branch: stable user:Martin von Zweigbergk date:Wed Dec 02 15:15:16 2020 -0800 summary: tests: show that in-memory rebase leaves state when working copy is dirty https://www.mercurial-scm.org/repo/hg/rev/1d5189a57405 changeset: 46027:1d5189a57405 branch: stable tag: 5.6.1 user:Martin von Zweigbergk date:Wed Dec 02 15:39:01 2020 -0800 summary: rebase: clear merge state when aborting in-memory merge on dirty working copy https://www.mercurial-scm.org/repo/hg/rev/a3ef50355673 changeset: 46028:a3ef50355673 branch: stable user:Augie Fackler date:Thu Dec 03 13:36:23 2020 -0500 summary: Added tag 5.6.1 for changeset 1d5189a57405 https://www.mercurial-scm.org/repo/hg/rev/dadbd01f9393 changeset: 46029:dadbd01f9393 branch: stable user:Augie Fackler date:Thu Dec 03 13:36:24 2020 -0500 summary: Added signature for changeset 1d5189a57405 https://www.mercurial-scm.org/repo/hg/rev/2cf61e66c6d0 changeset: 46030:2cf61e66c6d0 bookmark:@ tag: tip parent: 46018:8b0a3ff5ed12 parent: 46029:dadbd01f9393 user:Augie Fackler date:Thu Dec 03 14:15:39 2020 -0500 summary: merge with stable -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [support]: changing author of a commit when rewriting history
On Fri, Dec 04, 2020 at 01:31:52AM +0100, Antonio Muci wrote: > That would be useful for the tip, thanks. > > I have to to rewrite a commit that is not the last one, like commit 1 in the > example. At least with changeset evolution enabled, you can just update to commit 1, amend it and then evolve/rebase the rest on top. Joerg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [support]: changing author of a commit when rewriting history
That would be useful for the tip, thanks. I have to to rewrite a commit that is not the last one, like commit 1 in the example. Antonio On 04/12/20 01:23, Joerg Sonnenberger wrote: On Fri, Dec 04, 2020 at 01:10:38AM +0100, Antonio Muci via Mercurial-devel wrote: I am struggling to find a way to change the author of a commit. hg amend -u ? Joerg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [support]: changing author of a commit when rewriting history
On Fri, Dec 04, 2020 at 01:10:38AM +0100, Antonio Muci via Mercurial-devel wrote: > I am struggling to find a way to change the author of a commit. hg amend -u ? Joerg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[support]: changing author of a commit when rewriting history
Hi, sorry for taking over the list, I have a lame support question. I am struggling to find a way to change the author of a commit. I do a lot of history rewriting, and "hg histedit --interactive" is invaluable in this regard. Since histedit --interactive does not support changing the author (or the timestamp) of a commit (am I right here?), for doing those sort of actions I usually go back to mq. In this case my history is "peculiar": linear DAG, but with different named branches interleaved, like this: o changeset: 3:z | branch: branch1 | user:authorY | o changeset: 2:y | branch: branch2 | user:authorX | o changeset: 1:x | branch: branch1 | user:authorToBeChanged Mq was probably not designed for this use case, and keeps messing with my named "branches". Moreover, I'd prefer not to use it. Is there a documented way of sanely doing this in modern mercurial? Many thanks Antonio ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9514: tests: update test-releasenotes-formatting.t with new exit codes
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I didn't have the fuzzywuzzy package installed before, so I didn't notice this test fail earlier (probably when I made `check_incompatible_arguments` return `InputError`). REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9514 AFFECTED FILES tests/test-releasenotes-formatting.t CHANGE DETAILS diff --git a/tests/test-releasenotes-formatting.t b/tests/test-releasenotes-formatting.t --- a/tests/test-releasenotes-formatting.t +++ b/tests/test-releasenotes-formatting.t @@ -429,11 +429,11 @@ $ cd relnotes-raise-error $ hg releasenotes -r . -l abort: cannot specify both --list and --rev - [255] + [10] $ hg releasenotes -l -c abort: cannot specify both --list and --check - [255] + [10] Display release notes for specified revs if no file is mentioned To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@46018: 10 new changesets
10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d767f71b9158 changeset: 46009:d767f71b9158 user:Martin von Zweigbergk date:Wed Dec 02 15:15:16 2020 -0800 summary: tests: show that in-memory rebase leaves state when working copy is dirty https://www.mercurial-scm.org/repo/hg/rev/61c1f29e7f4f changeset: 46010:61c1f29e7f4f user:Martin von Zweigbergk date:Wed Dec 02 15:39:01 2020 -0800 summary: rebase: clear merge state when aborting in-memory merge on dirty working copy https://www.mercurial-scm.org/repo/hg/rev/b9588ff9b66a changeset: 46011:b9588ff9b66a user:Kyle Lippincott date:Wed Dec 02 11:05:53 2020 -0800 summary: copies: avoid materializing a full directory map during copy tracing https://www.mercurial-scm.org/repo/hg/rev/d72378f93a44 changeset: 46012:d72378f93a44 user:Pierre-Yves David date:Wed Dec 02 20:02:35 2020 +0100 summary: tests: use the right python when running dummyssh for narrow https://www.mercurial-scm.org/repo/hg/rev/7a79548954b3 changeset: 46013:7a79548954b3 user:Pierre-Yves David date:Wed Dec 02 20:10:22 2020 +0100 summary: tests: explicitly skip the lock warning in some remotefilelog tests https://www.mercurial-scm.org/repo/hg/rev/b86608e97fa8 changeset: 46014:b86608e97fa8 user:Pierre-Yves David date:Wed Dec 02 23:15:11 2020 +0100 summary: pull: flush stdin after the `pull from` message https://www.mercurial-scm.org/repo/hg/rev/f44b9c72f061 changeset: 46015:f44b9c72f061 user:Pierre-Yves David date:Wed Dec 02 20:10:27 2020 +0100 summary: run-tests: allow some slack about 'waiting on lock' message https://www.mercurial-scm.org/repo/hg/rev/372409eb5cd1 changeset: 46016:372409eb5cd1 user:Pierre-Yves David date:Thu Dec 03 08:09:56 2020 +0100 summary: phab-refresh: do not error out when the stack is empty https://www.mercurial-scm.org/repo/hg/rev/068307b638f4 changeset: 46017:068307b638f4 user:Kyle Lippincott date:Wed Dec 02 15:38:05 2020 -0800 summary: statprof: fix off-by-one-line error in output https://www.mercurial-scm.org/repo/hg/rev/8b0a3ff5ed12 changeset: 46018:8b0a3ff5ed12 bookmark:@ tag: tip user:Kyle Lippincott date:Wed Dec 02 12:33:51 2020 -0800 summary: statprof: separate functions and "line", assume 4 digit line numbers -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH STABLE] ui: remove excessive strtolocal() from debuguigetpass
# HG changeset patch # User Yuya Nishihara # Date 1606988543 -32400 # Thu Dec 03 18:42:23 2020 +0900 # Branch stable # Node ID 074a20823c4be85d4b98a76c2ba961ff640cc80e # Parent 27c23c8f14da48a24a0896b588721c0139e92560 ui: remove excessive strtolocal() from debuguigetpass ui.getpass() returns Optional[bytes], and strtolocal(bytes) would crash. Follows up 07b0a687c01a "ui: ensure `getpass()` returns bytes." diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -3787,9 +3787,7 @@ def debugtemplate(ui, repo, tmpl, **opts def debuguigetpass(ui, prompt=b''): """show prompt to type password""" r = ui.getpass(prompt) -if r is not None: -r = encoding.strtolocal(r) -else: +if r is None: r = b"" ui.writenoi18n(b'response: %s\n' % r) ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
