2014-08-06 20:43:59 +04:00
|
|
|
#require killdaemons
|
2012-04-28 03:22:56 +04:00
|
|
|
|
2012-01-27 06:00:03 +04:00
|
|
|
$ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
|
2011-11-11 03:19:00 +04:00
|
|
|
|
|
|
|
$ mkcommit() {
|
|
|
|
> echo "$1" > "$1"
|
|
|
|
> hg add "$1"
|
2011-12-22 03:42:25 +04:00
|
|
|
> message="$1"
|
|
|
|
> shift
|
|
|
|
> hg ci -m "$message" $*
|
2011-11-11 03:19:00 +04:00
|
|
|
> }
|
|
|
|
|
|
|
|
$ hg init alpha
|
|
|
|
$ cd alpha
|
|
|
|
$ mkcommit a-A
|
|
|
|
$ mkcommit a-B
|
|
|
|
$ mkcommit a-C
|
|
|
|
$ mkcommit a-D
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 3 draft a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 2 draft a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
o 1 draft a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 draft a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
|
|
|
|
$ hg init ../beta
|
|
|
|
$ hg push -r 1 ../beta
|
|
|
|
pushing to ../beta
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
2011-11-11 03:21:17 +04:00
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 3 draft a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 2 draft a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:21:17 +04:00
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
$ cd ../beta
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
$ hg up -q
|
|
|
|
$ mkcommit b-A
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 2 draft b-A - f54f1bb90ff3
|
|
|
|
|
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
$ hg pull ../alpha
|
|
|
|
pulling from ../alpha
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 4 public a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 3 public a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
| @ 2 draft b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
|
2011-11-11 03:21:17 +04:00
|
|
|
pull did not updated ../alpha state.
|
2012-08-16 00:38:42 +04:00
|
|
|
push from alpha to beta should update phase even if nothing is transferred
|
2011-11-11 03:21:17 +04:00
|
|
|
|
|
|
|
$ cd ../alpha
|
|
|
|
$ hgph # not updated by remote pull
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 3 draft a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 2 draft a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2013-01-28 18:16:49 +04:00
|
|
|
$ hg push -r 2 ../beta
|
|
|
|
pushing to ../beta
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
[1]
|
|
|
|
$ hgph
|
|
|
|
@ 3 draft a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 2 public a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:21:17 +04:00
|
|
|
$ hg push ../beta
|
|
|
|
pushing to ../beta
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
2012-01-30 21:32:09 +04:00
|
|
|
[1]
|
2011-11-11 03:21:17 +04:00
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 3 public a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 2 public a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
|
2011-11-11 03:22:02 +04:00
|
|
|
update must update phase of common changeset too
|
|
|
|
|
|
|
|
$ hg pull ../beta # getting b-A
|
|
|
|
pulling from ../beta
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
|
|
|
$ cd ../beta
|
|
|
|
$ hgph # not updated by remote pull
|
2012-01-07 20:03:33 +04:00
|
|
|
o 4 public a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 3 public a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
| @ 2 draft b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:22:02 +04:00
|
|
|
$ hg pull ../alpha
|
|
|
|
pulling from ../alpha
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 4 public a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 3 public a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
| @ 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-11-11 03:22:02 +04:00
|
|
|
|
phases: add a phases.publish option
What is a "publishing repository"?
==================================
Setting a repository as "publishing" alter its behavior **when used as a
server**: all changesets are **seen** as public changesets by clients.
So, pushing to a "publishing" repository is the most common way to make
changesets public: pushed changesets are seen as public on the remote side and
marked as such on local side.
Note: the "publishing" property have no effects for local operations.
Old repository are publishing
=============================
Phase is the first step of a series of features aiming at handling mutable
history within mercurial. Old client do not support such feature and are unable
to hold phase data. The safest solution is to consider as public any changeset
going through an old client.
Moreover, most hosting solution will not support phase from the beginning.
Having old clients seen as public repositories will not change their usage:
public repositories where you push *immutable* public changesets *shared* with
others.
Why is "publishing" the default?
================================
We discussed above that any changeset from a non-phase aware repository should
be seen as public. This means that in the following scenario, X is pulled as
public::
~/A$ old-hg init
~/A$ echo 'babar' > jungle
~/A$ old-hg commit -mA 'X'
~/A$ cd ../B
~/B$ new-hg pull ../A # let's pretend A is served by old-hg
~/B$ new-hg log -r tip
summary: X
phase: public
We want to keep this behavior while creating/serving the A repository with
``new-hg``. Although committing with any ``new-hg`` creates a draft changeset.
To stay backward compatible, the pull must see the new commit as public.
Non-publishing server will advertise them as draft. Having publishing repository
the default is thus necessary to ensure this backward compatibility.
This default value can also be expressed with the following sentence: "By
default, without any configuration, everything you exchange with the outside is
immutable.". This behaviour seems sane.
Why allow draft changeset in publishing repository
=====================================================
Note: The publish option is aimed at controlling the behavior of *server*.
Changeset in any state on a publishing server will **always*** be seen as public
by other client. "Passive" repository which are only used as server for pull and
push operation are not "affected" by this section.
As in the choice for default, the main reason to allow draft changeset in
publishing server is backward compatibility. With an old client, the following
scenario is valid::
~/A$ old-hg init
~/A$ echo 'babar' > jungle
~/A$ old-hg commit -mA 'X'
~/A$ old-hg qimport -r . # or any other mutable operation on X
If the default is publishing and new commits in such repository are "public" The
following operation will be denied as X will be an **immutable** public
changeset. However as other clients see X as public, any pull//push (or event
pull//pull) will mark X as public in repo A.
Allowing enforcement of public changeset only repository through config is
probably something to do. This could be done with another "strict" option or a
third value config for phase related option (mode=public, publishing(default),
mutable)
2011-12-15 14:57:33 +04:00
|
|
|
Publish configuration option
|
|
|
|
----------------------------
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
Pull
|
|
|
|
````
|
|
|
|
|
phases: add a phases.publish option
What is a "publishing repository"?
==================================
Setting a repository as "publishing" alter its behavior **when used as a
server**: all changesets are **seen** as public changesets by clients.
So, pushing to a "publishing" repository is the most common way to make
changesets public: pushed changesets are seen as public on the remote side and
marked as such on local side.
Note: the "publishing" property have no effects for local operations.
Old repository are publishing
=============================
Phase is the first step of a series of features aiming at handling mutable
history within mercurial. Old client do not support such feature and are unable
to hold phase data. The safest solution is to consider as public any changeset
going through an old client.
Moreover, most hosting solution will not support phase from the beginning.
Having old clients seen as public repositories will not change their usage:
public repositories where you push *immutable* public changesets *shared* with
others.
Why is "publishing" the default?
================================
We discussed above that any changeset from a non-phase aware repository should
be seen as public. This means that in the following scenario, X is pulled as
public::
~/A$ old-hg init
~/A$ echo 'babar' > jungle
~/A$ old-hg commit -mA 'X'
~/A$ cd ../B
~/B$ new-hg pull ../A # let's pretend A is served by old-hg
~/B$ new-hg log -r tip
summary: X
phase: public
We want to keep this behavior while creating/serving the A repository with
``new-hg``. Although committing with any ``new-hg`` creates a draft changeset.
To stay backward compatible, the pull must see the new commit as public.
Non-publishing server will advertise them as draft. Having publishing repository
the default is thus necessary to ensure this backward compatibility.
This default value can also be expressed with the following sentence: "By
default, without any configuration, everything you exchange with the outside is
immutable.". This behaviour seems sane.
Why allow draft changeset in publishing repository
=====================================================
Note: The publish option is aimed at controlling the behavior of *server*.
Changeset in any state on a publishing server will **always*** be seen as public
by other client. "Passive" repository which are only used as server for pull and
push operation are not "affected" by this section.
As in the choice for default, the main reason to allow draft changeset in
publishing server is backward compatibility. With an old client, the following
scenario is valid::
~/A$ old-hg init
~/A$ echo 'babar' > jungle
~/A$ old-hg commit -mA 'X'
~/A$ old-hg qimport -r . # or any other mutable operation on X
If the default is publishing and new commits in such repository are "public" The
following operation will be denied as X will be an **immutable** public
changeset. However as other clients see X as public, any pull//push (or event
pull//pull) will mark X as public in repo A.
Allowing enforcement of public changeset only repository through config is
probably something to do. This could be done with another "strict" option or a
third value config for phase related option (mode=public, publishing(default),
mutable)
2011-12-15 14:57:33 +04:00
|
|
|
changegroup are added without phase movement
|
|
|
|
|
|
|
|
$ hg bundle -a ../base.bundle
|
|
|
|
5 changesets found
|
|
|
|
$ cd ..
|
|
|
|
$ hg init mu
|
|
|
|
$ cd mu
|
|
|
|
$ cat > .hg/hgrc << EOF
|
|
|
|
> [phases]
|
|
|
|
> publish=0
|
|
|
|
> EOF
|
|
|
|
$ hg unbundle ../base.bundle
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 5 changesets with 5 changes to 5 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 4 draft a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 3 draft a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
| o 2 draft b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 draft a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 draft a-A - 054250a37db4
|
|
|
|
|
2011-10-26 16:30:43 +04:00
|
|
|
$ cd ..
|
2011-11-11 03:22:02 +04:00
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
Pulling from publish=False to publish=False does not move boundary.
|
|
|
|
|
|
|
|
$ hg init nu
|
|
|
|
$ cd nu
|
|
|
|
$ cat > .hg/hgrc << EOF
|
|
|
|
> [phases]
|
|
|
|
> publish=0
|
|
|
|
> EOF
|
|
|
|
$ hg pull ../mu -r 54acac6f23ab
|
|
|
|
pulling from ../mu
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 3 changesets with 3 changes to 3 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 2 draft a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
o 1 draft a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 draft a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
|
|
|
|
Even for common
|
|
|
|
|
|
|
|
$ hg pull ../mu -r f54f1bb90ff3
|
|
|
|
pulling from ../mu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 3 draft b-A - f54f1bb90ff3
|
|
|
|
|
|
|
|
|
| o 2 draft a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 draft a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 draft a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
|
|
|
|
|
|
|
|
Pulling from Publish=True to Publish=False move boundary in common set.
|
|
|
|
we are in nu
|
|
|
|
|
|
|
|
$ hg pull ../alpha -r b555f63b6063
|
|
|
|
pulling from ../alpha
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
(run 'hg update' to get a working copy)
|
2012-01-21 00:21:13 +04:00
|
|
|
$ hgph # f54f1bb90ff3 stay draft, not ancestor of -r
|
2012-01-07 20:03:33 +04:00
|
|
|
o 4 public a-D - b555f63b6063
|
|
|
|
|
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 3 draft b-A - f54f1bb90ff3
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
|
|
|
o | 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
|
|
|
|
pulling from Publish=False to publish=False with some public
|
|
|
|
|
|
|
|
$ hg up -q f54f1bb90ff3
|
|
|
|
$ mkcommit n-A
|
|
|
|
$ mkcommit n-B
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 6 draft n-B - 145e75495359
|
|
|
|
|
|
|
|
|
o 5 draft n-A - d6bcb4f74035
|
|
|
|
|
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
o | 3 draft b-A - f54f1bb90ff3
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
$ cd ../mu
|
|
|
|
$ hg pull ../nu
|
|
|
|
pulling from ../nu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 6 draft n-B - 145e75495359
|
|
|
|
|
|
|
|
|
o 5 draft n-A - d6bcb4f74035
|
|
|
|
|
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
o | 2 draft b-A - f54f1bb90ff3
|
2012-01-07 20:03:33 +04:00
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
pulling into publish=True
|
|
|
|
|
|
|
|
$ cd alpha
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 4 public b-A - f54f1bb90ff3
|
|
|
|
|
|
|
|
|
| @ 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
$ hg pull ../mu
|
|
|
|
pulling from ../mu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 6 draft n-B - 145e75495359
|
|
|
|
|
|
|
|
|
o 5 draft n-A - d6bcb4f74035
|
|
|
|
|
|
|
|
|
o 4 public b-A - f54f1bb90ff3
|
|
|
|
|
|
|
|
|
| @ 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:28:42 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
pulling back into original repo
|
|
|
|
|
|
|
|
$ cd nu
|
|
|
|
$ hg pull ../alpha
|
|
|
|
pulling from ../alpha
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 6 public n-B - 145e75495359
|
|
|
|
|
|
|
|
|
o 5 public n-A - d6bcb4f74035
|
|
|
|
|
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
o | 3 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
|
|
|
Push
|
|
|
|
````
|
|
|
|
|
2011-12-16 02:08:09 +04:00
|
|
|
(inserted)
|
2011-12-15 14:45:01 +04:00
|
|
|
|
2011-12-16 02:08:09 +04:00
|
|
|
Test that phase are pushed even when they are nothing to pus
|
|
|
|
(this might be tested later bu are very convenient to not alter too much test)
|
|
|
|
|
|
|
|
Push back to alpha
|
|
|
|
|
|
|
|
$ hg push ../alpha # from nu
|
|
|
|
pushing to ../alpha
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
2012-01-30 21:32:09 +04:00
|
|
|
[1]
|
2011-12-16 02:08:09 +04:00
|
|
|
$ cd ..
|
2011-12-15 14:45:01 +04:00
|
|
|
$ cd alpha
|
2011-12-16 02:08:09 +04:00
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 6 public n-B - 145e75495359
|
|
|
|
|
|
|
|
|
o 5 public n-A - d6bcb4f74035
|
|
|
|
|
|
|
|
|
o 4 public b-A - f54f1bb90ff3
|
|
|
|
|
|
|
|
|
| @ 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-16 02:08:09 +04:00
|
|
|
|
|
|
|
(end insertion)
|
|
|
|
|
|
|
|
|
|
|
|
initial setup
|
|
|
|
|
2013-11-22 22:14:17 +04:00
|
|
|
$ hg log -G # of alpha
|
2011-12-15 14:45:01 +04:00
|
|
|
o changeset: 6:145e75495359
|
|
|
|
| tag: tip
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: n-B
|
|
|
|
|
|
|
|
|
o changeset: 5:d6bcb4f74035
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: n-A
|
|
|
|
|
|
|
|
|
o changeset: 4:f54f1bb90ff3
|
|
|
|
| parent: 1:548a3d25dbf0
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: b-A
|
|
|
|
|
|
|
|
|
| @ changeset: 3:b555f63b6063
|
|
|
|
| | user: test
|
|
|
|
| | date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| | summary: a-D
|
|
|
|
| |
|
|
|
|
| o changeset: 2:54acac6f23ab
|
|
|
|
|/ user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: a-C
|
|
|
|
|
|
|
|
|
o changeset: 1:548a3d25dbf0
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: a-B
|
|
|
|
|
|
|
|
|
o changeset: 0:054250a37db4
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: a-A
|
|
|
|
|
|
|
|
$ mkcommit a-E
|
|
|
|
$ mkcommit a-F
|
|
|
|
$ mkcommit a-G
|
|
|
|
$ hg up d6bcb4f74035 -q
|
|
|
|
$ mkcommit a-H
|
|
|
|
created new head
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 10 draft a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 draft a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 draft a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
2012-02-29 17:41:11 +04:00
|
|
|
Pulling from bundle does not alter phases of changeset not present in the bundle
|
|
|
|
|
|
|
|
$ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg
|
|
|
|
5 changesets found
|
|
|
|
$ hg pull ../partial-bundle.hg
|
|
|
|
pulling from ../partial-bundle.hg
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hgph
|
|
|
|
@ 10 draft a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 draft a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 draft a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
Pushing to Publish=False (unknown changeset)
|
|
|
|
|
|
|
|
$ hg push ../mu -r b740e3e5c05d # a-F
|
|
|
|
pushing to ../mu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 10 draft a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 draft a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 draft a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
|
|
|
$ cd ../mu
|
2012-01-21 00:21:13 +04:00
|
|
|
$ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
|
|
|
|
> # not ancestor of -r
|
2012-01-07 20:03:33 +04:00
|
|
|
o 8 draft a-F - b740e3e5c05d
|
|
|
|
|
|
|
|
|
o 7 draft a-E - e9f537e46dea
|
|
|
|
|
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 6 draft n-B - 145e75495359
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 5 draft n-A - d6bcb4f74035
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
|
|
|
o | 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
o | 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 2 draft b-A - f54f1bb90ff3
|
2012-01-07 20:03:33 +04:00
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
|
|
|
Pushing to Publish=True (unknown changeset)
|
|
|
|
|
|
|
|
$ hg push ../beta -r b740e3e5c05d
|
|
|
|
pushing to ../beta
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
2012-01-21 00:21:13 +04:00
|
|
|
$ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
|
|
|
|
> # not ancestor of -r
|
2012-01-07 20:03:33 +04:00
|
|
|
o 8 public a-F - b740e3e5c05d
|
|
|
|
|
|
|
|
|
o 7 public a-E - e9f537e46dea
|
|
|
|
|
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 6 draft n-B - 145e75495359
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 5 draft n-A - d6bcb4f74035
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
|
|
|
o | 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
o | 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
| o 2 draft b-A - f54f1bb90ff3
|
2012-01-07 20:03:33 +04:00
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
|
|
|
Pushing to Publish=True (common changeset)
|
|
|
|
|
|
|
|
$ cd ../beta
|
|
|
|
$ hg push ../alpha
|
|
|
|
pushing to ../alpha
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
2012-01-30 21:32:09 +04:00
|
|
|
[1]
|
2011-12-15 14:45:01 +04:00
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 6 public a-F - b740e3e5c05d
|
|
|
|
|
|
|
|
|
o 5 public a-E - e9f537e46dea
|
|
|
|
|
|
|
|
|
o 4 public a-D - b555f63b6063
|
|
|
|
|
|
|
|
|
o 3 public a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
| @ 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
$ cd ../alpha
|
2012-01-21 00:21:13 +04:00
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 10 draft a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
|
|
|
Pushing to Publish=False (common changeset that change phase + unknown one)
|
|
|
|
|
|
|
|
$ hg push ../mu -r 967b449fbc94 -f
|
|
|
|
pushing to ../mu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 10 draft a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
$ cd ../mu
|
|
|
|
$ hgph # d6bcb4f74035 should have changed phase
|
2012-01-21 00:21:13 +04:00
|
|
|
> # 145e75495359 is still draft. not ancestor of -r
|
2012-01-07 20:03:33 +04:00
|
|
|
o 9 draft a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
2012-01-21 00:21:13 +04:00
|
|
|
+---o 6 draft n-B - 145e75495359
|
2012-01-07 20:03:33 +04:00
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
|
|
|
o | 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
|
|
|
|
|
|
|
Pushing to Publish=True (common changeset from publish=False)
|
|
|
|
|
2011-12-22 03:42:25 +04:00
|
|
|
(in mu)
|
2011-12-15 14:45:01 +04:00
|
|
|
$ hg push ../alpha
|
|
|
|
pushing to ../alpha
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
2012-01-30 21:32:09 +04:00
|
|
|
[1]
|
2011-12-15 14:45:01 +04:00
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
o 9 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
|
|
|
o | 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
$ hgph -R ../alpha # a-H should have been synced to 0
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 10 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-15 14:45:01 +04:00
|
|
|
|
2011-12-22 03:42:25 +04:00
|
|
|
|
2014-01-24 02:09:53 +04:00
|
|
|
Bare push with next changeset and common changeset needing sync (issue3575)
|
|
|
|
|
2014-04-18 00:47:38 +04:00
|
|
|
(reset some stat on remote repo to avoid confusing other tests)
|
2014-01-24 02:09:53 +04:00
|
|
|
|
|
|
|
$ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg phase --force --draft b740e3e5c05d 967b449fbc94
|
|
|
|
$ hg push -fv ../alpha
|
|
|
|
pushing to ../alpha
|
|
|
|
searching for changes
|
|
|
|
1 changesets found
|
2014-08-15 21:43:32 +04:00
|
|
|
uncompressed size of bundle content:
|
2016-10-14 02:31:11 +03:00
|
|
|
178 (changelog)
|
2016-01-13 08:23:45 +03:00
|
|
|
165 (manifests)
|
|
|
|
131 a-H
|
2014-01-24 02:09:53 +04:00
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
|
|
$ hgph
|
|
|
|
o 9 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
|
|
|
o | 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
|
|
|
|
|
|
|
$ hg -R ../alpha update 967b449fbc94 #for latter test consistency
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hgph -R ../alpha
|
|
|
|
@ 10 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
|
|
|
|
2011-12-22 03:42:25 +04:00
|
|
|
Discovery locally secret changeset on a remote repository:
|
|
|
|
|
|
|
|
- should make it non-secret
|
|
|
|
|
|
|
|
$ cd ../alpha
|
|
|
|
$ mkcommit A-secret --config phases.new-commit=2
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 11 secret A-secret - 435b5d83910c
|
|
|
|
|
|
|
|
|
o 10 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-22 03:42:25 +04:00
|
|
|
$ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
|
|
|
|
1 changesets found
|
|
|
|
$ hg -R ../mu unbundle ../secret-bundle.hg
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hgph -R ../mu
|
2012-01-07 20:03:33 +04:00
|
|
|
o 10 draft A-secret - 435b5d83910c
|
|
|
|
|
|
|
|
|
o 9 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
|
|
|
o | 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-22 03:42:25 +04:00
|
|
|
$ hg pull ../mu
|
|
|
|
pulling from ../mu
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hgph
|
2012-01-07 20:03:33 +04:00
|
|
|
@ 11 draft A-secret - 435b5d83910c
|
|
|
|
|
|
|
|
|
o 10 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
2012-01-13 04:42:47 +04:00
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
|
|
|
|
2014-04-13 21:01:00 +04:00
|
|
|
pushing a locally public and draft changesets remotely secret should make them
|
2012-04-24 18:32:44 +04:00
|
|
|
appear on the remote side.
|
|
|
|
|
2012-01-13 04:42:47 +04:00
|
|
|
$ hg -R ../mu phase --secret --force 967b449fbc94
|
|
|
|
$ hg push -r 435b5d83910c ../mu
|
|
|
|
pushing to ../mu
|
|
|
|
searching for changes
|
2012-04-24 18:32:44 +04:00
|
|
|
abort: push creates new remote head 435b5d83910c!
|
2016-09-21 02:47:30 +03:00
|
|
|
(merge or see 'hg help push' for details about pushing new heads)
|
2012-04-24 18:32:44 +04:00
|
|
|
[255]
|
|
|
|
$ hg push -fr 435b5d83910c ../mu # because the push will create new visible head
|
|
|
|
pushing to ../mu
|
|
|
|
searching for changes
|
2012-01-13 04:42:47 +04:00
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 0 changesets with 0 changes to 2 files
|
|
|
|
$ hgph -R ../mu
|
|
|
|
o 10 draft A-secret - 435b5d83910c
|
|
|
|
|
|
|
|
|
o 9 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
|
|
|
o | 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
2012-01-07 20:03:33 +04:00
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2012-01-12 04:25:57 +04:00
|
|
|
|
|
|
|
pull new changeset with common draft locally
|
|
|
|
|
|
|
|
$ hg up -q 967b449fbc94 # create a new root for draft
|
|
|
|
$ mkcommit 'alpha-more'
|
|
|
|
created new head
|
|
|
|
$ hg push -fr . ../mu
|
|
|
|
pushing to ../mu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
|
|
$ cd ../mu
|
|
|
|
$ hg phase --secret --force 1c5cfd894796
|
|
|
|
$ hg up -q 435b5d83910c
|
|
|
|
$ mkcommit 'mu-more'
|
|
|
|
$ cd ../alpha
|
|
|
|
$ hg pull ../mu
|
|
|
|
pulling from ../mu
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hgph
|
|
|
|
o 13 draft mu-more - 5237fb433fc8
|
|
|
|
|
|
|
|
|
| @ 12 draft alpha-more - 1c5cfd894796
|
|
|
|
| |
|
|
|
|
o | 11 draft A-secret - 435b5d83910c
|
|
|
|
|/
|
|
|
|
o 10 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
|
|
|
|
|
|
|
Test that test are properly ignored on remote event when existing locally
|
|
|
|
|
2011-12-26 16:47:37 +04:00
|
|
|
$ cd ..
|
2012-01-12 04:25:57 +04:00
|
|
|
$ hg clone -qU -r b555f63b6063 -r f54f1bb90ff3 beta gamma
|
|
|
|
|
|
|
|
# pathological case are
|
|
|
|
#
|
|
|
|
# * secret remotely
|
|
|
|
# * known locally
|
|
|
|
# * repo have uncommon changeset
|
|
|
|
|
|
|
|
$ hg -R beta phase --secret --force f54f1bb90ff3
|
|
|
|
$ hg -R gamma phase --draft --force f54f1bb90ff3
|
|
|
|
|
|
|
|
$ cd gamma
|
|
|
|
$ hg pull ../beta
|
|
|
|
pulling from ../beta
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hg phase f54f1bb90ff3
|
|
|
|
2: draft
|
|
|
|
|
|
|
|
same over the wire
|
|
|
|
|
|
|
|
$ cd ../beta
|
|
|
|
$ hg serve -p $HGPORT -d --pid-file=../beta.pid -E ../beta-error.log
|
|
|
|
$ cat ../beta.pid >> $DAEMON_PIDS
|
|
|
|
$ cd ../gamma
|
|
|
|
|
2016-08-03 16:52:11 +03:00
|
|
|
$ hg pull http://localhost:$HGPORT/ # bundle2+
|
2015-05-27 16:35:34 +03:00
|
|
|
pulling from http://localhost:$HGPORT/
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hg phase f54f1bb90ff3
|
|
|
|
2: draft
|
|
|
|
|
|
|
|
enforce bundle1
|
|
|
|
|
2016-08-03 16:39:55 +03:00
|
|
|
$ hg pull http://localhost:$HGPORT/ --config devel.legacy.exchange=bundle1
|
2012-01-12 04:25:57 +04:00
|
|
|
pulling from http://localhost:$HGPORT/
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hg phase f54f1bb90ff3
|
|
|
|
2: draft
|
|
|
|
|
|
|
|
check that secret local on both side are not synced to public
|
|
|
|
|
|
|
|
$ hg push -r b555f63b6063 http://localhost:$HGPORT/
|
|
|
|
pushing to http://localhost:$HGPORT/
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
2012-01-30 21:32:09 +04:00
|
|
|
[1]
|
2012-01-12 04:25:57 +04:00
|
|
|
$ hg phase f54f1bb90ff3
|
|
|
|
2: draft
|
|
|
|
|
|
|
|
put the changeset in the draft state again
|
|
|
|
(first test after this one expect to be able to copy)
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
2011-12-26 16:47:37 +04:00
|
|
|
Test Clone behavior
|
|
|
|
|
|
|
|
A. Clone without secret changeset
|
|
|
|
|
|
|
|
1. cloning non-publishing repository
|
2012-01-12 04:25:57 +04:00
|
|
|
(Phase should be preserved)
|
|
|
|
|
|
|
|
# make sure there is no secret so we can use a copy clone
|
2011-12-26 16:47:37 +04:00
|
|
|
|
2012-01-12 04:25:57 +04:00
|
|
|
$ hg -R mu phase --draft 'secret()'
|
2011-12-22 03:42:25 +04:00
|
|
|
|
2011-12-26 16:47:37 +04:00
|
|
|
$ hg clone -U mu Tau
|
|
|
|
$ hgph -R Tau
|
2012-01-12 04:25:57 +04:00
|
|
|
o 12 draft mu-more - 5237fb433fc8
|
2012-01-07 20:03:33 +04:00
|
|
|
|
|
2012-01-12 04:25:57 +04:00
|
|
|
| o 11 draft alpha-more - 1c5cfd894796
|
|
|
|
| |
|
|
|
|
o | 10 draft A-secret - 435b5d83910c
|
|
|
|
|/
|
2012-01-07 20:03:33 +04:00
|
|
|
o 9 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
| o 4 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 3 public a-C - 54acac6f23ab
|
|
|
|
| |
|
|
|
|
o | 2 public b-A - f54f1bb90ff3
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2011-12-22 03:42:25 +04:00
|
|
|
|
2011-12-26 16:48:31 +04:00
|
|
|
2. cloning publishing repository
|
|
|
|
|
|
|
|
(everything should be public)
|
|
|
|
|
|
|
|
$ hg clone -U alpha Upsilon
|
|
|
|
$ hgph -R Upsilon
|
2012-01-12 04:25:57 +04:00
|
|
|
o 13 public mu-more - 5237fb433fc8
|
2012-01-07 20:03:33 +04:00
|
|
|
|
|
2012-01-12 04:25:57 +04:00
|
|
|
| o 12 public alpha-more - 1c5cfd894796
|
|
|
|
| |
|
|
|
|
o | 11 public A-secret - 435b5d83910c
|
|
|
|
|/
|
2012-01-07 20:03:33 +04:00
|
|
|
o 10 public a-H - 967b449fbc94
|
|
|
|
|
|
|
|
|
| o 9 public a-G - 3e27b6f1eee1
|
|
|
|
| |
|
|
|
|
| o 8 public a-F - b740e3e5c05d
|
|
|
|
| |
|
|
|
|
| o 7 public a-E - e9f537e46dea
|
|
|
|
| |
|
|
|
|
+---o 6 public n-B - 145e75495359
|
|
|
|
| |
|
|
|
|
o | 5 public n-A - d6bcb4f74035
|
|
|
|
| |
|
|
|
|
o | 4 public b-A - f54f1bb90ff3
|
|
|
|
| |
|
|
|
|
| o 3 public a-D - b555f63b6063
|
|
|
|
| |
|
|
|
|
| o 2 public a-C - 54acac6f23ab
|
|
|
|
|/
|
|
|
|
o 1 public a-B - 548a3d25dbf0
|
|
|
|
|
|
|
|
|
o 0 public a-A - 054250a37db4
|
|
|
|
|
2013-11-15 04:07:43 +04:00
|
|
|
#if unix-permissions no-root
|
2013-04-30 23:19:56 +04:00
|
|
|
|
|
|
|
Pushing From an unlockable repo
|
|
|
|
--------------------------------
|
|
|
|
(issue3684)
|
|
|
|
|
|
|
|
Unability to lock the source repo should not prevent the push. It will prevent
|
|
|
|
the retrieval of remote phase during push. For example, pushing to a publishing
|
|
|
|
server won't turn changeset public.
|
|
|
|
|
|
|
|
1. Test that push is not prevented
|
|
|
|
|
|
|
|
$ hg init Phi
|
|
|
|
$ cd Upsilon
|
|
|
|
$ chmod -R -w .hg
|
|
|
|
$ hg push ../Phi
|
|
|
|
pushing to ../Phi
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 14 changesets with 14 changes to 14 files (+3 heads)
|
|
|
|
$ chmod -R +w .hg
|
|
|
|
|
|
|
|
2. Test that failed phases movement are reported
|
|
|
|
|
|
|
|
$ hg phase --force --draft 3
|
|
|
|
$ chmod -R -w .hg
|
|
|
|
$ hg push ../Phi
|
|
|
|
pushing to ../Phi
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
cannot lock source repo, skipping local public phase update
|
|
|
|
[1]
|
|
|
|
$ chmod -R +w .hg
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2013-05-02 22:17:18 +04:00
|
|
|
#endif
|
2016-08-21 02:12:00 +03:00
|
|
|
|
|
|
|
Test that clone behaves like pull and doesn't
|
|
|
|
publish changesets as plain push does
|
|
|
|
|
|
|
|
$ hg -R Upsilon phase -q --force --draft 2
|
|
|
|
$ hg clone -q Upsilon Pi -r 7
|
|
|
|
$ hgph Upsilon -r 'min(draft())'
|
|
|
|
o 2 draft a-C - 54acac6f23ab
|
|
|
|
|
|
|
|
|
~
|
|
|
|
|
|
|
|
$ hg -R Upsilon push Pi -r 7
|
|
|
|
pushing to Pi
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
[1]
|
|
|
|
$ hgph Upsilon -r 'min(draft())'
|
|
|
|
o 8 draft a-F - b740e3e5c05d
|
|
|
|
|
|
|
|
|
~
|
|
|
|
|
|
|
|
$ hg -R Upsilon push Pi -r 8
|
|
|
|
pushing to Pi
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
|
|
|
|
$ hgph Upsilon -r 'min(draft())'
|
|
|
|
o 9 draft a-G - 3e27b6f1eee1
|
|
|
|
|
|
|
|
|
~
|