Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 12 Dec 2011 15:16:58 +0100] rev 15652
wireproto: handle other server output in pushkey
Remote side may add useful information alongside failure return code. For
example "ssl is required". This patch mirror what is done for the unbundle
command.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:45:01 +0100] rev 15651
phases: exchange phase boundaries on push
For now phase sync is tried even if push fails with some know pathological
case. The exact behavior is to be discussed and implemented later.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:28:42 +0100] rev 15650
phases: exchange phase boundaries on pull
Add an extra argument to addchangegroup to all phase code to execute before the
lock is released.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 15 Dec 2011 02:18:24 +0100] rev 15649
phases: add a function to compute heads from root
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:24:26 +0100] rev 15648
phases: add basic pushkey support
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 26 Oct 2011 14:30:43 +0200] rev 15647
phases: update exchange test to include node hash.
This will be easier for exchange test.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Dec 2011 11:57:33 +0100] rev 15646
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)
Augie Fackler <durin42@gmail.com> [Mon, 12 Dec 2011 11:54:22 -0600] rev 15645
zsh completion: add support for qfinish
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 14:24:38 -0600] rev 15644
merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 14:24:29 -0600] rev 15643
merge with i18n
Fabian Kreutz <fabian.kreutz@qvantel.com> [Sat, 10 Dec 2011 20:48:33 +0200] rev 15642
i18n-de: Error reported by Mathias Goldau and commit msg shortened
Fabian Kreutz <fabian.kreutz@qvantel.com> [Sat, 10 Dec 2011 20:22:33 +0200] rev 15641
i18n-de: mostly update fuzzies
More helptexts have been changed into on id per paragraph. New keywords
added. hg example calls changed to :hg:`..` syntax (where changed in EN).
Alexander Sauta <demosito@gmail.com> [Thu, 08 Dec 2011 00:05:24 +0300] rev 15640
i18n-ru: eol, fetch, color, LargeFiles, gpg, keywords translated
Alexander Sauta <demosito@gmail.com> [Fri, 18 Nov 2011 21:19:05 +0300] rev 15639
i18n-ru: glossary added, acl translation fixed
Andrey Somov <py4fun@gmail.com> [Thu, 10 Nov 2011 22:05:02 +0100] rev 15638
i18n-ru: update translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 12 Dec 2011 17:10:19 +0900] rev 15637
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 16:26:33 +0100] rev 15636
merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 16:18:10 +0100] rev 15635
test-subrepo: test for Issue3153
Renato Cunha <renato@renatocunha.com> [Wed, 14 Dec 2011 12:28:00 -0200] rev 15634
diff: don't crash when diffing a revision with a deleted subrepo (issue3153)
When a user requested a diff between a revision (r1) that contained a subrepo
and another (r2) that did not, mercurial would crash if r1 was specified before
r2 but would execute the diff otherwise. This fixes this behavior by skipping
the missing subrepo in the diff.
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 11:13:38 +0100] rev 15633
status: add missing ":" to help text
Martin Geisler <mg@lazybytes.net> [Sat, 10 Dec 2011 18:40:05 +0100] rev 15632
dispatch: remove extra newline
The return statement belongs to the lines above.
Ion Savin <comp_@gmx.net> [Fri, 09 Dec 2011 14:14:30 +0200] rev 15631
annotate: show full changeset hash when invoked with --debug and -c
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:58:12 +0100] rev 15630
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:58 +0100] rev 15629
largefiles: fix 'hg status' abort after merge
If a largefile is introduced on the branch that is merged into the
working copy, then 'hg status' would abort with an error like:
$ hg status
abort: .hglf/foo@33fdd332ec64: not found in manifest!
The problem was that the largefiles status code only looked in the
first parent for the largefile. Largefiles are now always reported as
modified if they don't exist in the first parent -- this matches the
behavior of localrepo.status for normal files.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:57 +0100] rev 15628
largefiles: use lfutil functions
Using regular expressions to cut off a (fixed) string prefix is overly
complicated and wasteful.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:56 +0100] rev 15627
largefiles: fix indentation
Martin Geisler <mg@aragost.com> [Wed, 07 Dec 2011 16:25:51 +0100] rev 15626
largefiles: remove pre-1.7 compatibility code
Mercurial 1.7 added the --subrepos flag to status and archive and the
largefiles code was still compatible with the old method signatures.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:53 +0100] rev 15625
merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.