Patchwork [10,of,11] py3: prove that a second commit in a given repository works

login
register
mail settings
Submitter Augie Fackler
Date March 26, 2017, 10:36 p.m.
Message ID <c5ecedb198527765f465.1490567804@imladris.local>
Download mbox | patch
Permalink /patch/19709/
State Accepted
Headers show

Comments

Augie Fackler - March 26, 2017, 10:36 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1490567422 14400
#      Sun Mar 26 18:30:22 2017 -0400
# Node ID c5ecedb198527765f465da499c37cc53fc38ea53
# Parent  386820bf1ae17e2fd7425164c091065a39d21193
py3: prove that a second commit in a given repository works
Pulkit Goyal - March 27, 2017, 6:22 a.m.
There is a same patch in Yuya' series also
https://patchwork.mercurial-scm.org/patch/19684/

On Mon, Mar 27, 2017 at 4:06 AM, Augie Fackler <raf@durin42.com> wrote:

> # HG changeset patch
> # User Augie Fackler <raf@durin42.com>
> # Date 1490567422 14400
> #      Sun Mar 26 18:30:22 2017 -0400
> # Node ID c5ecedb198527765f465da499c37cc53fc38ea53
> # Parent  386820bf1ae17e2fd7425164c091065a39d21193
> py3: prove that a second commit in a given repository works
>
> diff --git a/tests/test-check-py3-commands.t b/tests/test-check-py3-
> commands.t
> --- a/tests/test-check-py3-commands.t
> +++ b/tests/test-check-py3-commands.t
> @@ -132,21 +132,13 @@ Test bytes-ness of policy.policy with HG
>    A iota
>    $ $PYTHON3 $HGBIN commit --message 'commit performed in Python 3'
>    $ $PYTHON3 $HGBIN status
> -
> -TODO: bdiff is broken on Python 3 so we can't do a second commit yet,
> -when that works remove this rollback command.
> -  $ hg rollback
> -  repository tip rolled back to revision -1 (undo commit)
> -  working directory now based on revision -1
> -
>    $ mkdir A
>    $ echo "This is the file 'mu'." > A/mu
>    $ $PYTHON3 $HGBIN addremove
>    adding A/mu
>    $ $PYTHON3 $HGBIN status
>    A A/mu
> -  A iota
> -  $ HGEDITOR='echo message > ' $PYTHON3 $HGBIN commit
> +  $ HGEDITOR='echo second commit > ' $PYTHON3 $HGBIN commit
>    $ $PYTHON3 $HGBIN status
>
>  Prove the repo is valid using the Python 2 `hg`:
> @@ -155,11 +147,16 @@ Prove the repo is valid using the Python
>    checking manifests
>    crosschecking files in changesets and manifests
>    checking files
> -  2 files, 1 changesets, 2 total revisions
> +  2 files, 2 changesets, 2 total revisions
>    $ hg log
> -  changeset:   0:e825505ba339
> +  changeset:   1:f8e239757efb
>    tag:         tip
>    user:        test
>    date:        Thu Jan 01 00:00:00 1970 +0000
> -  summary:     message
> +  summary:     second commit
>
> +  changeset:   0:71c96e924262
> +  user:        test
> +  date:        Thu Jan 01 00:00:00 1970 +0000
> +  summary:     commit performed in Python 3
> +
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-check-py3-commands.t b/tests/test-check-py3-commands.t
--- a/tests/test-check-py3-commands.t
+++ b/tests/test-check-py3-commands.t
@@ -132,21 +132,13 @@  Test bytes-ness of policy.policy with HG
   A iota
   $ $PYTHON3 $HGBIN commit --message 'commit performed in Python 3'
   $ $PYTHON3 $HGBIN status
-
-TODO: bdiff is broken on Python 3 so we can't do a second commit yet,
-when that works remove this rollback command.
-  $ hg rollback
-  repository tip rolled back to revision -1 (undo commit)
-  working directory now based on revision -1
-
   $ mkdir A
   $ echo "This is the file 'mu'." > A/mu
   $ $PYTHON3 $HGBIN addremove
   adding A/mu
   $ $PYTHON3 $HGBIN status
   A A/mu
-  A iota
-  $ HGEDITOR='echo message > ' $PYTHON3 $HGBIN commit
+  $ HGEDITOR='echo second commit > ' $PYTHON3 $HGBIN commit
   $ $PYTHON3 $HGBIN status
 
 Prove the repo is valid using the Python 2 `hg`:
@@ -155,11 +147,16 @@  Prove the repo is valid using the Python
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  2 files, 1 changesets, 2 total revisions
+  2 files, 2 changesets, 2 total revisions
   $ hg log
-  changeset:   0:e825505ba339
+  changeset:   1:f8e239757efb
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     message
+  summary:     second commit
   
+  changeset:   0:71c96e924262
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     commit performed in Python 3
+