Matt Mackall
1c8e8627b0
push: don't treat bookmark as a found change
...
Treating bookmarks as a found change results in confusing
documentation or output and is less useful for scripting.
2012-01-30 15:56:35 -06:00
Matt Mackall
41ed50006e
glossary: add phase terms
2012-01-30 14:44:01 -06:00
Matt Mackall
840a51ffab
merge with i18n
2012-01-30 14:14:18 -06:00
Pierre-Yves David
ad2799644a
phases: allow phase name in phases.new-commit settings
...
Before this commit only phase index where accepted
2012-01-30 17:46:15 +01:00
Jens Bäckman
91264f0e38
i18n-sv: snchronized with 9d8bf728dbfc
2012-01-30 16:28:27 +01:00
Pierre-Yves David
13fe947391
qfinish: do not set secret changeset to draft if mq.secret=false
...
If mq.secret=false, mq should not touch phase
2012-01-30 15:17:08 +01:00
Pierre-Yves David
24ebf577e2
mq: take mq.secret configuration into account when picking the default phase
2012-01-30 17:39:05 +01:00
Pierre-Yves David
7728bdc44c
qimport: when mq.secret=True set qimported revision as secret
2012-01-30 17:37:45 +01:00
Pierre-Yves David
d05f57b256
qrefresh: keep changeset phase during refresh
2012-01-30 17:36:30 +01:00
Pierre-Yves David
06ca6deaf4
phases: write default phase data as soon as possible.
...
Marks phase data as dirty when computing default phase. Actual writing is done
when the lock is released. So, read only operation don't write phase data
because they don't lock the repo.
2012-01-30 17:33:09 +01:00
Pierre-Yves David
605e1c8bba
phase: accept old style revision specification
2012-01-30 18:06:57 +01:00
Matt Mackall
2157179ce3
push: return 1 if no changes found (issue3228)
...
Currently we have the following return codes if nothing is found:
commit incoming outgoing pull push
intended 1 1 1 1 1
documented 1 1 1 0 1
actual 1 1 1 0 0
This fixes the lower-right entry.
2012-01-30 11:32:09 -06:00
Matt Mackall
79aca17050
push: more precise failure check on subrepo push
...
This will let us distinguish between nothing to push and push failed
2012-01-30 11:26:20 -06:00
Matt Mackall
8c3fad2adc
push: return 0 when updating bookmarks
2012-01-30 11:23:17 -06:00
Matt Mackall
bf7a89f81c
push: fix coding errors in unused branch
...
This branch will get re-enabled in a subsequent fix
2012-01-30 11:15:34 -06:00
Alexander Sauta
fd1b9dc01f
i18n-ru: phases help translated
2012-01-30 13:04:13 +04:00
Alexander Sauta
fb6525a673
i18n-ru: minor corrections on unclear strings
2012-01-30 11:52:38 +04:00
Pierre-Yves David
2e7e0826c5
mq: rename secretcommit to newcommit
...
This function create secret changeset only when mq.secret is true
2012-01-30 00:05:28 +01:00
Matt Mackall
305a9d65ae
merge with stable
2012-02-01 16:28:35 -06:00
Matt Mackall
b7fe2d0ec5
bookmarks: move current bookmark on update -u and bare pull -u (issue3222)
...
Currently, this won't update when a #branch spec is in the URL
2012-01-29 14:07:45 -06:00
Andrei Polushin
17c68b67c6
i18n-ru: synchronized with 8147593fb88a
2012-01-30 02:48:03 +07:00
Matt Mackall
684f6eea71
phases: fix verify with secret csets
...
Verify uses repo.cancopy() to detect whether a repo is a plain old
local repo, so it was giving a confusing error message when secret
changesets were present.
2012-01-29 13:36:10 -06:00
Andrei Polushin
fa39f052c9
i18n-ru: verifying uncertain translations.
2012-01-30 02:07:04 +07:00
Matt Mackall
f549014354
mq: add secret setting
2012-01-29 12:59:21 -06:00
Matt Mackall
27321db359
merge with i18n
2012-01-29 12:59:11 -06:00
Wagner Bruna
9ce1290495
i18n-pt_BR: synchronized with 4206d1b224b3
2012-01-28 09:05:08 -02:00
Matt Mackall
875e0dda31
help: add examples to phases topic
2012-01-27 18:43:41 -06:00
Kevin Bullock
d1f8c5d7da
update: note updated bookmark
...
This brings update in line with pull: we notify the user when an action
indirectly updates a bookmark.
2012-01-27 13:12:56 -06:00
Augie Fackler
4a3654d428
resolve: mention merge-tools topic in help
2012-01-27 14:19:32 -06:00
FUJIWARA Katsunori
96875b39e1
revset: add tests for 'remote()' predicate
2012-01-27 22:29:58 +09:00
FUJIWARA Katsunori
8e9263abed
revset: fix documentation for 'remote()' predicate
...
current documentation for 'remote()' predicate is wrong about
specification of parameters.
there are 3 patterns:
# of
param: id: remote:
- 0 current branch "defult" remote
- 1 specified "defult" remote
- 2 specified specified
2012-01-27 22:29:58 +09:00
FUJIWARA Katsunori
fa22f7f531
revset: fix 'remote()' failure when remote repo has more revs than local
...
current 'remote()' implementation uses 'r' variable, even if it is not
initialized when 'if n in repo' is not true.
this causes unexpected exception.
2012-01-27 22:29:58 +09:00
Wagner Bruna
26bcf69404
help/config: fix help command markup
2012-01-27 12:52:13 -02:00
Matt Mackall
0ccc545127
merge with i18n
2012-01-27 18:43:31 -06:00
Alexander Sauta
256c482168
i18n-ru: synchronized with a4bf2a4ea406; fuzzies removed
2012-01-27 12:25:02 +04:00
Matt Mackall
630fa7d8fc
merge: defer symlink flag merging to filemerge (issue3200)
...
Previously, we could change a normal file into a corrupt symlink when
trying to merge a symlink flag. Now, we leave the flag alone and let
filemerge deal with it (usually by a prompt).
We also drop a redundant flag setting after filemerge (now dealt with
by ms.resolve) that would cause similar corruption.
2012-01-26 20:34:57 -06:00
Mads Kiilerich
bec2d3c22e
tests: don't rely on 'false' exit code in test-run-tests.t
...
On Solaris:
$ sh -c 'false ; echo $?'
255
2012-01-27 03:00:32 +01:00
Mads Kiilerich
e347788597
tests: don't use alias
...
alias doesn't work in Solaris sh.
2012-01-27 03:00:03 +01:00
Mads Kiilerich
a917bedcf5
tests: don't include plain 'diff -U0' content in test-diff-unified.t
...
The only purpose of 'diff -U0' was to show that 'hg diff -U0' did almost the same.
Unfortunately 'diff -U0' on Solaris gives incorrect line numbers. Masking it
with globs wouldn't it make sense, so removing it is the best solution.
2012-01-27 02:59:59 +01:00
Matt Mackall
d26a97cacb
help: fix publish option spelling in phases topic
2012-01-26 17:54:52 -06:00
Matt Mackall
101ede8d22
help: add missing phase config items to config topic
2012-01-26 17:54:22 -06:00
Wagner Bruna
9e310d7986
help/phases: remove trailing whitespace
2012-01-26 17:23:43 -02:00
Matt Mackall
5a379a202e
sslutil: more helpful fingerprint mismatch message
...
This will aid debugging for users of sites that renew certs.
2012-01-26 11:23:15 -06:00
Matt Mackall
578253989c
help: add phases topic
2012-01-26 11:23:14 -06:00
Wagner Bruna
e2490e5e92
i18n-pt_BR: synchronized with 0d7867b7393b
2012-01-26 12:09:14 -02:00
Nikolaj Sjujskij
60d1336a64
i18n-ru: fix typos in resolve
help
...
* help entry is called 'merge-tools', not 'merge-tool';
* envvar is called HGMERGE, not HGEMERGT.
2012-01-26 16:56:11 +04:00
Matt Mackall
11ed3204e8
copies: remove stray print
2012-01-25 17:14:10 -06:00
Matt Mackall
e4d11ad28c
scmutil: unify some 'no changes found' messages
...
This keeps the wording more consistent for secret csets
2012-01-25 17:14:08 -06:00
Alain Leufroy
9a455ccd0e
outgoing: display info about secret changets while no sharable changeset found
2012-01-25 19:41:34 +01:00
Alain Leufroy
b62e38b78d
bundle: display info about secret changets while no sharable changeset found
2012-01-25 19:05:16 +01:00