Patchwork [5,of,6] rebase: demonstrate behavior with requiredest and pull --rebase

login
register
mail settings
Submitter Ryan McElroy
Date March 28, 2017, 9:31 p.m.
Message ID <cdf33d63e89377abd6f4.1490736674@devbig314.prn1.facebook.com>
Download mbox | patch
Permalink /patch/19802/
State Changes Requested
Headers show

Comments

Ryan McElroy - March 28, 2017, 9:31 p.m.
# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1490735116 25200
#      Tue Mar 28 14:05:16 2017 -0700
# Node ID cdf33d63e89377abd6f48ba6d4548a3b3f4af3e2
# Parent  ac6634fab80b59ba48958ca03289c4434e9483c4
rebase: demonstrate behavior with requiredest and pull --rebase
Jun Wu - March 28, 2017, 9:35 p.m.
Excerpts from Ryan McElroy's message of 2017-03-28 14:31:14 -0700:
> # HG changeset patch
> # User Ryan McElroy <rmcelroy@fb.com>
> # Date 1490735116 25200
> #      Tue Mar 28 14:05:16 2017 -0700
> # Node ID cdf33d63e89377abd6f48ba6d4548a3b3f4af3e2
> # Parent  ac6634fab80b59ba48958ca03289c4434e9483c4
> rebase: demonstrate behavior with requiredest and pull --rebase
> 
> diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
> --- a/tests/test-rebase-dest.t
> +++ b/tests/test-rebase-dest.t
> @@ -57,3 +57,28 @@ Requiring dest should not break continue
>    $ hg rebase --continue
>    rebasing 3:0537f6b50def "dc" (tip)
>    saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
> +
> +  $ cd ..
> +
> +Check rebase.requiredest interaction with pull --rebase
> +  $ hg clone repo clone
> +  updating to branch default
> +  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  $ cd repo
> +  $ echo e > e
> +  $ hg commit -qAm ee
> +  $ cd ..
> +  $ cd clone
> +  $ echo f > f
> +  $ hg commit -qAm ff
> +  $ hg pull --rebase

I think using "debugbuilddag" instead of "hg commit" could build the repo
faster. You can use "hg debugdag" to dump a repo to debugbuilddag
representation.

For more complex DAGs, dragdag.py seems a good choice.

> +  pulling from $TESTTMP/repo
> +  searching for changes
> +  adding changesets
> +  adding manifests
> +  adding file changes
> +  added 1 changesets with 2 changes to 2 files (+1 heads)
> +  abort: you must specify a destination
> +  (use: hg rebase -d REV)
> +  [255]
> +
Ryan McElroy - March 29, 2017, 10:38 a.m.
On 3/28/17 10:35 PM, Jun Wu wrote:
> Excerpts from Ryan McElroy's message of 2017-03-28 14:31:14 -0700:
>> # HG changeset patch
>> # User Ryan McElroy <rmcelroy@fb.com>
>> # Date 1490735116 25200
>> #      Tue Mar 28 14:05:16 2017 -0700
>> # Node ID cdf33d63e89377abd6f48ba6d4548a3b3f4af3e2
>> # Parent  ac6634fab80b59ba48958ca03289c4434e9483c4
>> rebase: demonstrate behavior with requiredest and pull --rebase
>>
>> diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
>> --- a/tests/test-rebase-dest.t
>> +++ b/tests/test-rebase-dest.t
>> @@ -57,3 +57,28 @@ Requiring dest should not break continue
>>     $ hg rebase --continue
>>     rebasing 3:0537f6b50def "dc" (tip)
>>     saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
>> +
>> +  $ cd ..
>> +
>> +Check rebase.requiredest interaction with pull --rebase
>> +  $ hg clone repo clone
>> +  updating to branch default
>> +  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>> +  $ cd repo
>> +  $ echo e > e
>> +  $ hg commit -qAm ee
>> +  $ cd ..
>> +  $ cd clone
>> +  $ echo f > f
>> +  $ hg commit -qAm ff
>> +  $ hg pull --rebase
> I think using "debugbuilddag" instead of "hg commit" could build the repo
> faster. You can use "hg debugdag" to dump a repo to debugbuilddag
> representation.
>
> For more complex DAGs, dragdag.py seems a good choice.

drawdag.py I think you mean?

I suppose a nice thing about drawdag is that you see the dag being 
created so its more obvious what's going on without graph logs, but is 
it worth a re-send do you think? These tests are fairly straightforward, 
and the exact contents of the files matter so they cause conflicts 
sometimes and not other times.

>
>> +  pulling from $TESTTMP/repo
>> +  searching for changes
>> +  adding changesets
>> +  adding manifests
>> +  adding file changes
>> +  added 1 changesets with 2 changes to 2 files (+1 heads)
>> +  abort: you must specify a destination
>> +  (use: hg rebase -d REV)
>> +  [255]
>> +
Jun Wu - March 29, 2017, 5:55 p.m.
Excerpts from Ryan McElroy's message of 2017-03-29 11:38:00 +0100:
> drawdag.py I think you mean?
> 
> I suppose a nice thing about drawdag is that you see the dag being 
> created so its more obvious what's going on without graph logs, but is 
> it worth a re-send do you think? These tests are fairly straightforward, 
> and the exact contents of the files matter so they cause conflicts 
> sometimes and not other times.

Probably not. I just want to advertise tools like "debugbuilddag" and
"drawdag". So new tests can use them.

I should probably just update the wiki.

> 
> >
> >> +  pulling from $TESTTMP/repo
> >> +  searching for changes
> >> +  adding changesets
> >> +  adding manifests
> >> +  adding file changes
> >> +  added 1 changesets with 2 changes to 2 files (+1 heads)
> >> +  abort: you must specify a destination
> >> +  (use: hg rebase -d REV)
> >> +  [255]
> >> +

Patch

diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t
--- a/tests/test-rebase-dest.t
+++ b/tests/test-rebase-dest.t
@@ -57,3 +57,28 @@  Requiring dest should not break continue
   $ hg rebase --continue
   rebasing 3:0537f6b50def "dc" (tip)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
+
+  $ cd ..
+
+Check rebase.requiredest interaction with pull --rebase
+  $ hg clone repo clone
+  updating to branch default
+  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd repo
+  $ echo e > e
+  $ hg commit -qAm ee
+  $ cd ..
+  $ cd clone
+  $ echo f > f
+  $ hg commit -qAm ff
+  $ hg pull --rebase
+  pulling from $TESTTMP/repo
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 2 changes to 2 files (+1 heads)
+  abort: you must specify a destination
+  (use: hg rebase -d REV)
+  [255]
+