Angel Ezquerra <angel.ezquerra@gmail.com> [Thu, 29 Sep 2011 17:20:04 +0200] rev 15708
push: propagate --new-branch and --ssh options when pushing subrepos
Up until now the all the push command options were ignored when pushing
subrepos. In particular, the fact that the --new-branch command was not passed
down to subrepos made it not possible to push a repo when any of its
subrepos had a new branch, even if you used the --new-branch option of the push
command.
In addition the error message was confusing since it showed the following hint:
"--new-branch hint: use 'hg push --new-branch' to create new remote branches".
However using the --new_branch flag did not fix the problem, as it was ignored
when pushing subrepos.
This patch passes the --new-branch and --ssh flags to every subrepo that is
pushed.
Issues/Limitations:
- All subrepo types get these flags, but only the mercurial subrepos use them.
- It is no longer possible to _not_ pass down these flags to subrepos when
pushing:
* An alternative would be to introduce a --subrepos flag that should be
used to pass down these flags to the subrepos.
* If we did this, it could make sense to make the --force flag respect this
new --subrepos flag as well for consistency's sake.
- Matt suggested that the ssh related flags could also be passed down to
subrepos during pull and clone. However it seems that it would be the "update"
command that would need to get those, since subrepos are only pulled on update.
In any case I'd prefer to leave that for a later patch.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Dec 2011 23:56:15 +0100] rev 15707
phases: implement ``phase()`` and ``hidden()`` method for workingctx
Working ctx don't have revision number and need a dedicated implementation.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 20 Dec 2011 01:31:25 +0100] rev 15706
Add a phases.new-commit option to control minimal phase of new commit
this option is both intended for human and internal code usage.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 20 Dec 2011 01:34:12 +0100] rev 15705
phases: update doc to mention secret phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Dec 2011 23:47:18 +0100] rev 15704
phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Dec 2011 23:31:38 +0100] rev 15703
phases: add a mutable boolean property on context
Laurens Holst <laurens.hg@grauw.nl> [Tue, 20 Dec 2011 20:36:40 +0100] rev 15702
ignore: add files present in the hackable-hg windows distribution
Kevin Bullock <kbullock@ringworld.org> [Tue, 20 Dec 2011 14:11:14 -0600] rev 15701
graft: use consistent language in help
Removes the word 'aborted' from the 3rd paragraph in favor of
'interrupted', the same word used in the description of the
-c/--continue switch. The word 'interrupted' is also consistent with
the help for rebase.
Matt Mackall <mpm@selenic.com> [Wed, 21 Dec 2011 14:36:08 -0600] rev 15700
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 20 Dec 2011 11:43:38 -0600] rev 15699
largefiles: copy files in binary mode (issue3164)
Alistair Bell <alistair.bell@netronome.com> [Thu, 15 Dec 2011 16:41:03 -0500] rev 15698
diff: when diffing a revision with a deleted subrepo, maintain the node context (issue3153)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 11:37:44 +0100] rev 15697
phases: add a function to compute visible heads
This function will be used to hide secret changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 18 Dec 2011 23:16:46 +0100] rev 15696
phases: Add a third phase for secret changeset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 11:29:39 +0100] rev 15695
phases: fix advanceboundary behavior when targetphase !=0
Changeset was properly removed from upper phase but was not explicitly added to
target phase. If advanced changesets had not pwasnt in target phase they was
considered public (0-phase).
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 18 Dec 2011 23:15:12 +0100] rev 15694
phases: add a bit more test for local phase movement.
Matt Mackall <mpm@selenic.com> [Mon, 19 Dec 2011 14:04:33 -0600] rev 15693
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 19 Dec 2011 14:04:26 -0600] rev 15692
merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 19 Dec 2011 14:04:09 -0600] rev 15691
merge with i18n
Martin Schröder <martinschroeder@vcp-sh.de> [Mon, 19 Dec 2011 13:02:30 +0100] rev 15690
i18n-de: several new translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 16 Dec 2011 10:47:17 -0200] rev 15689
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 16 Dec 2011 10:43:18 -0200] rev 15688
i18n-pt_BR: synchronized with dc5d1394ecd1
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 16 Dec 2011 10:44:08 -0200] rev 15687
merge with i18n
Alexander Sauta <demosito@gmail.com> [Fri, 16 Dec 2011 10:13:46 +0300] rev 15686
i18n-ru: translated purge, progress, rebase
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 02:27:55 +0700] rev 15685
i18n-ru: editing for 'push' and 'pull'
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 01:56:57 +0700] rev 15684
i18n-ru: editing for 'commit'
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 00:48:54 +0700] rev 15683
i18n-ru: editing for 'directory'
Andrei Polushin <polushin@gmail.com> [Wed, 14 Dec 2011 00:43:31 +0700] rev 15682
i18n-ru: editing for 'remote'
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 22:55:43 +0700] rev 15681
i18n-ru: editing for 'repository'
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 01:51:08 +0700] rev 15680
i18n-ru: editing for 'store' (largefiles concept)
Andrei Polushin <polushin@gmail.com> [Tue, 13 Dec 2011 01:40:30 +0700] rev 15679
i18n-ru: editing for 'branch'